mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion

Browse Source 
* re-run the latest version of the script which converts CONVERSION_CMD as well since
  https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=d9e81d66db2bc2aa56d177cef78c814c29679a4a
* skip many incorrect s/_linux/:linux/g changes which were introduced by:
  https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=9ea1041f8eab26ee871a9176e9691e5d3e6745bd

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa
2021-08-04 18:31:48 +02:00
committed by Khem Raj
parent af81aad996
commit 2871edc40c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-initramfs/classes/klibc.bbclass
+1 -1
View File
@@ -4,7 +4,7 @@ DEPENDS =+ "klcc-cross"
# Default for klcc is to build static binaries. # Default for klcc is to build static binaries.
# Set CC = "${TARGET_PREFIX}klcc -shared" to build the dynamic version. # Set CC = "${TARGET_PREFIX}klcc -shared" to build the dynamic version.
CC:forcevariable = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}" 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: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 ''}" CC:append:armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}"
meta-oe/classes/image_types_sparse.bbclass
+1 -1
View File
@@ -1,7 +1,7 @@
inherit image_types inherit image_types
CONVERSIONTYPES += "sparse" CONVERSIONTYPES += "sparse"
CONVERSION_CMD_sparse() { CONVERSION_CMD:sparse() {
in="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" in="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
out="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse" out="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse"
case "${type}" in case "${type}" in
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+7 -7
View File
@@ -205,7 +205,7 @@ RDEPENDS:packagegroup-meta-oe-crypto ="\
libsodium \ libsodium \
pkcs11-helper \ pkcs11-helper \
" "
RDEPENDS_packagegroup-meta-oe-crypto:remove:riscv32 = "botan" RDEPENDS:packagegroup-meta-oe-crypto:remove:riscv32 = "botan"
RDEPENDS:packagegroup-meta-oe-dbs ="\ RDEPENDS:packagegroup-meta-oe-dbs ="\
influxdb \ influxdb \
@@ -948,12 +948,12 @@ RDEPENDS:packagegroup-meta-oe-test ="\
pm-qa \ pm-qa \
testfloat \ testfloat \
" "
RDEPENDS_packagegroup-meta-oe-test:remove:libc-musl = "pm-qa" RDEPENDS:packagegroup-meta-oe-test:remove:libc-musl = "pm-qa"
RDEPENDS_packagegroup-meta-oe-test:remove:arm = "fwts" RDEPENDS:packagegroup-meta-oe-test:remove:arm = "fwts"
RDEPENDS_packagegroup-meta-oe-test:remove:mipsarch = "fwts" RDEPENDS:packagegroup-meta-oe-test:remove:mipsarch = "fwts"
RDEPENDS_packagegroup-meta-oe-test:remove:powerpc = "fwts" RDEPENDS:packagegroup-meta-oe-test:remove:powerpc = "fwts"
RDEPENDS_packagegroup-meta-oe-test:remove:riscv64 = "fwts" RDEPENDS:packagegroup-meta-oe-test:remove:riscv64 = "fwts"
RDEPENDS_packagegroup-meta-oe-test:remove:riscv32 = "fwts" RDEPENDS:packagegroup-meta-oe-test:remove:riscv32 = "fwts"
RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ RDEPENDS:packagegroup-meta-oe-ptest-packages = "\
zeromq-ptest \ zeromq-ptest \