All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH] klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion
@ 2021-08-04 14:27 Martin Jansa
  2021-08-04 16:14 ` [oe] " Khem Raj
  0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2021-08-04 14:27 UTC (permalink / raw)
  To: openembedded-devel; +Cc: 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 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(-)

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 \
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [oe] [meta-oe][PATCH] klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion
  2021-08-04 14:27 [meta-oe][PATCH] klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion Martin Jansa
@ 2021-08-04 16:14 ` Khem Raj
  2021-08-04 16:32   ` Martin Jansa
  0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-08-04 16:14 UTC (permalink / raw)
  To: Martin Jansa, openembedded-devel



On 8/4/21 7:27 AM, Martin Jansa wrote:
> * 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 ?

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   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(-)
> 
> 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 \
> 
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [oe] [meta-oe][PATCH] klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion
  2021-08-04 16:14 ` [oe] " Khem Raj
@ 2021-08-04 16:32   ` Martin Jansa
  0 siblings, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2021-08-04 16:32 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 4235 bytes --]

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

On Wed, Aug 4, 2021 at 6:14 PM Khem Raj <raj.khem@gmail.com> wrote:

>
>
> On 8/4/21 7:27 AM, Martin Jansa wrote:
> > * 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 ?
>
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >   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(-)
> >
> > 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 \
> >
> >
> >
> > 
> >
>

[-- Attachment #2: Type: text/html, Size: 6128 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-04 16:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-04 14:27 [meta-oe][PATCH] klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion Martin Jansa
2021-08-04 16:14 ` [oe] " Khem Raj
2021-08-04 16:32   ` Martin Jansa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.