diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-05-24 08:57:03 +0000 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-05-31 11:24:13 +0000 |
| commit | f6a6b79a7bf6825b76081785f7869851ae802c40 (patch) | |
| tree | c2a769f8595e5684ba999bf2c8e8882d2a1d08e1 | |
| parent | e2582bee26c20838e6fe173b9113a43373837bd4 (diff) | |
packagegroups: include gcc-sanitizers only when supported
gcc-sanitizers are not always supported, we must not include them
either into the image or the SDK otherwise.
Change-Id: I8eccee355d426501a31d9c44fcf9725935a1959a
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
3 files changed, 17 insertions, 4 deletions
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/gcc-sanitizers.inc b/meta-boot2qt-distro/recipes-core/packagegroups/gcc-sanitizers.inc new file mode 100644 index 00000000..13d32ddc --- /dev/null +++ b/meta-boot2qt-distro/recipes-core/packagegroups/gcc-sanitizers.inc @@ -0,0 +1,9 @@ +GCC-SANITIZERS = "gcc-sanitizers" +GCC-SANITIZERS:arc = "" +GCC-SANITIZERS:microblaze = "" +GCC-SANITIZERS:mipsarch = "" +GCC-SANITIZERS:nios2 = "" +GCC-SANITIZERS:riscv64 = "" +GCC-SANITIZERS:riscv32 = "" +GCC-SANITIZERS:libc-musl = "" + diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb index a0e967eb..d76f7e30 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bb @@ -31,15 +31,15 @@ DESCRIPTION = "Target packages for B2Qt embedded SDK" LICENSE = "The-Qt-Company-Commercial" PR = "r0" +PACKAGE_ARCH = "${MACHINE_ARCH}" + inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" MACHINE_EXTRA_INSTALL_SDK ?= "" -GCC-SANITIZERS ?= "gcc-sanitizers" -GCC-SANITIZERS:mipsarch = "" -GCC-SANITIZERS:libc-musl = "" +require gcc-sanitizers.inc RDEPENDS:${PN} += " \ packagegroup-core-standalone-sdk-target \ diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb index 9c29850f..63f8885f 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb @@ -31,14 +31,18 @@ DESCRIPTION = "Additional tools packagegroup for B2Qt embedded Linux image" LICENSE = "The-Qt-Company-Commercial" PR = "r0" +PACKAGE_ARCH = "${MACHINE_ARCH}" + inherit packagegroup +require gcc-sanitizers.inc + RDEPENDS:${PN} = "\ alsa-utils-amixer \ binutils \ binutils-symlinks \ connman-client \ - gcc-sanitizers \ + ${GCC-SANITIZERS} \ e2fsprogs-resize2fs \ htop \ i2c-tools \ |