diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-08-04 18:31:48 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-06 20:38:40 -0700 |
commit | 2871edc40c8649e67fddc103101a8b64c5227b26 (patch) | |
tree | 5aced19ca2af418c0a5ae729f03d4ed1e695e1a2 /meta-oe | |
parent | af81aad996d9f0c9e5231987e76d808585c2165d (diff) | |
download | meta-openembedded-2871edc40c8649e67fddc103101a8b64c5227b26.tar.gz |
klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion
* 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>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/classes/image_types_sparse.bbclass | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meta-oe/classes/image_types_sparse.bbclass b/meta-oe/classes/image_types_sparse.bbclass index 1459f800a..af3879372 100644 --- a/meta-oe/classes/image_types_sparse.bbclass +++ b/meta-oe/classes/image_types_sparse.bbclass | |||
@@ -1,7 +1,7 @@ | |||
1 | inherit image_types | 1 | inherit image_types |
2 | 2 | ||
3 | CONVERSIONTYPES += "sparse" | 3 | CONVERSIONTYPES += "sparse" |
4 | CONVERSION_CMD_sparse() { | 4 | CONVERSION_CMD:sparse() { |
5 | in="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" | 5 | in="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" |
6 | out="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse" | 6 | out="${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse" |
7 | case "${type}" in | 7 | 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 5cd605ff4..47ee3099a 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 ="\ | |||
205 | libsodium \ | 205 | libsodium \ |
206 | pkcs11-helper \ | 206 | pkcs11-helper \ |
207 | " | 207 | " |
208 | RDEPENDS_packagegroup-meta-oe-crypto:remove:riscv32 = "botan" | 208 | RDEPENDS:packagegroup-meta-oe-crypto:remove:riscv32 = "botan" |
209 | 209 | ||
210 | RDEPENDS:packagegroup-meta-oe-dbs ="\ | 210 | RDEPENDS:packagegroup-meta-oe-dbs ="\ |
211 | influxdb \ | 211 | influxdb \ |
@@ -948,12 +948,12 @@ RDEPENDS:packagegroup-meta-oe-test ="\ | |||
948 | pm-qa \ | 948 | pm-qa \ |
949 | testfloat \ | 949 | testfloat \ |
950 | " | 950 | " |
951 | RDEPENDS_packagegroup-meta-oe-test:remove:libc-musl = "pm-qa" | 951 | RDEPENDS:packagegroup-meta-oe-test:remove:libc-musl = "pm-qa" |
952 | RDEPENDS_packagegroup-meta-oe-test:remove:arm = "fwts" | 952 | RDEPENDS:packagegroup-meta-oe-test:remove:arm = "fwts" |
953 | RDEPENDS_packagegroup-meta-oe-test:remove:mipsarch = "fwts" | 953 | RDEPENDS:packagegroup-meta-oe-test:remove:mipsarch = "fwts" |
954 | RDEPENDS_packagegroup-meta-oe-test:remove:powerpc = "fwts" | 954 | RDEPENDS:packagegroup-meta-oe-test:remove:powerpc = "fwts" |
955 | RDEPENDS_packagegroup-meta-oe-test:remove:riscv64 = "fwts" | 955 | RDEPENDS:packagegroup-meta-oe-test:remove:riscv64 = "fwts" |
956 | RDEPENDS_packagegroup-meta-oe-test:remove:riscv32 = "fwts" | 956 | RDEPENDS:packagegroup-meta-oe-test:remove:riscv32 = "fwts" |
957 | 957 | ||
958 | RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ | 958 | RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ |
959 | zeromq-ptest \ | 959 | zeromq-ptest \ |