Skip to contentSkip to conversation

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

PATCH In review Martin Jansa 2 participants 3 messages Aug 4, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 meta-initramfs/classes/klibc.bbclass               |  2 +-
 meta-oe/classes/image_types_sparse.bbclass         |  2 +-
 .../packagegroups/packagegroup-meta-oe.bb          | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)
meta-initramfs/classes/klibc.bbclass +1 -1
index 83112c06fa..202d132d94 100644
@@ -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 ''}"
 
meta-oe/classes/image_types_sparse.bbclass +1 -1
index 1459f800a5..af3879372b 100644
@@ -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
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +7 -7
index 5cd605ff49..47ee3099aa 100644
@@ -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 \
Signature · 1 line
2.30.2
#1 lore raw
Quoted 5 lines · Martin Jansa

* 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

can you do this on top of master-next and send a v2 please ?

Quoted 70 lines
---
  meta-initramfs/classes/klibc.bbclass               |  2 +-
  meta-oe/classes/image_types_sparse.bbclass         |  2 +-
  .../packagegroups/packagegroup-meta-oe.bb          | 14 +++++++-------
  3 files changed, 9 insertions(+), 9 deletions(-)
meta-initramfs/classes/klibc.bbclass +1 -1
index 83112c06fa..202d132d94 100644
@@ -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 ''}"
 
meta-oe/classes/image_types_sparse.bbclass +1 -1
index 1459f800a5..af3879372b 100644
@@ -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
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +7 -7
index 5cd605ff49..47ee3099aa 100644
@@ -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 \
#2 lore raw

Looks the same when done on top of master-next, but I've resent it now.

Quoted 92 lines · Khem Raj
Quoted 1 line · Martin Jansa

* re-run the latest version of the script which converts CONVERSION_CMD

as well since

Quoted 1 line

https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=d9e81d66db2bc2aa56d177cef78c814c29679a4a

Quoted 2 lines

* skip many incorrect s/_linux/:linux/g changes which were introduced by:

https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=9ea1041f8eab26ee871a9176e9691e5d3e6745bd

Quoted 1 line

can you do this on top of master-next and send a v2 please ?

Review

Quoted 8 lines
---
  meta-initramfs/classes/klibc.bbclass               |  2 +-
  meta-oe/classes/image_types_sparse.bbclass         |  2 +-
  .../packagegroups/packagegroup-meta-oe.bb          | 14 +++++++-------
  3 files changed, 9 insertions(+), 9 deletions(-)
(quoted diff) +0 -0

b/meta-initramfs/classes/klibc.bbclass

meta-initramfs/classes/klibc.bbclass DEPENDS =+ "klcc-cross" · line 7

Quoted 8 lines

index 83112c06fa..202d132d94 100644

meta-initramfs/classes/klibc.bbclass +0 -1
@@ -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"

meta-initramfs/classes/klibc.bbclass DEPENDS =+ "klcc-cross" · line 7

Quoted 1 line
meta-initramfs/classes/klibc.bbclass +1 -0
+CC:forcevariable:armv4:linux-gnueabi = "${TARGET_PREFIX}klcc

${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork"

meta-initramfs/classes/klibc.bbclass DEPENDS =+ "klcc-cross" · line 8

Quoted 1 line
meta-initramfs/classes/klibc.bbclass +0 -0
  CC:append:armv7ve = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if

(d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}"

meta-initramfs/classes/klibc.bbclass DEPENDS =+ "klcc-cross" · line 9

Quoted 1 line
meta-initramfs/classes/klibc.bbclass +0 -0
  CC:append:armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if

(d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}"

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta-oe/classes/image_types_sparse.bbclass

Review

Quoted 13 lines

index 1459f800a5..af3879372b 100644

meta-oe/classes/image_types_sparse.bbclass +1 -1
@@ -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
(quoted diff) +0 -0

b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb

Quoted 36 lines

index 5cd605ff49..47ee3099aa 100644

meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +7 -7
@@ -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 \