diff options
| -rw-r--r-- | meta-initramfs/classes/klibc.bbclass | 2 | ||||
| -rw-r--r-- | meta-oe/classes/image_types_sparse.bbclass | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta-initramfs/classes/klibc.bbclass b/meta-initramfs/classes/klibc.bbclass index 83112c06fa..202d132d94 100644 --- a/meta-initramfs/classes/klibc.bbclass +++ b/meta-initramfs/classes/klibc.bbclass @@ -4,7 +4,7 @@ DEPENDS =+ "klcc-cross" # Default for klcc is to build static binaries. # Set CC = "${TARGET_PREFIX}klcc -shared" to build the dynamic version. CC:forcevariable = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}" -CC:forcevariable:armv4_linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork" +CC:forcevariable:armv4:linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork" CC:append:armv7ve = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" CC:append:armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" diff --git a/meta-oe/classes/image_types_sparse.bbclass b/meta-oe/classes/image_types_sparse.bbclass index 1459f800a5..af3879372b 100644 --- a/meta-oe/classes/image_types_sparse.bbclass +++ b/meta-oe/classes/image_types_sparse.bbclass @@ -1,7 +1,7 @@ inherit image_types CONVERSIONTYPES += "sparse" -CONVERSION_CMD_sparse() { +CONVERSION_CMD:sparse() { in="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" out="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse" case "${type}" in diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 5cd605ff49..47ee3099aa 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -205,7 +205,7 @@ RDEPENDS:packagegroup-meta-oe-crypto ="\ libsodium \ pkcs11-helper \ " -RDEPENDS_packagegroup-meta-oe-crypto:remove:riscv32 = "botan" +RDEPENDS:packagegroup-meta-oe-crypto:remove:riscv32 = "botan" RDEPENDS:packagegroup-meta-oe-dbs ="\ influxdb \ @@ -948,12 +948,12 @@ RDEPENDS:packagegroup-meta-oe-test ="\ pm-qa \ testfloat \ " -RDEPENDS_packagegroup-meta-oe-test:remove:libc-musl = "pm-qa" -RDEPENDS_packagegroup-meta-oe-test:remove:arm = "fwts" -RDEPENDS_packagegroup-meta-oe-test:remove:mipsarch = "fwts" -RDEPENDS_packagegroup-meta-oe-test:remove:powerpc = "fwts" -RDEPENDS_packagegroup-meta-oe-test:remove:riscv64 = "fwts" -RDEPENDS_packagegroup-meta-oe-test:remove:riscv32 = "fwts" +RDEPENDS:packagegroup-meta-oe-test:remove:libc-musl = "pm-qa" +RDEPENDS:packagegroup-meta-oe-test:remove:arm = "fwts" +RDEPENDS:packagegroup-meta-oe-test:remove:mipsarch = "fwts" +RDEPENDS:packagegroup-meta-oe-test:remove:powerpc = "fwts" +RDEPENDS:packagegroup-meta-oe-test:remove:riscv64 = "fwts" +RDEPENDS:packagegroup-meta-oe-test:remove:riscv32 = "fwts" RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ zeromq-ptest \ |