[PATCH 1/2] meta: convert nested overrides leftovers to new syntax

[PATCH 1/2] meta: convert nested overrides leftovers to new syntax

[Denys Dmytriyenko]

Those were missed in previous rounds of automated and manual conversion.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
 meta/classes/manpages.bbclass                      | 4 ++--
 meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +-
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc   | 8 ++++----
 meta/recipes-devtools/gcc/gcc-runtime.inc          | 2 +-
 meta/recipes-devtools/gdb/gdb-common.inc           | 8 ++++----
 meta/recipes-kernel/perf/perf.bb                   | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/classes/manpages.bbclass b/meta/classes/manpages.bbclass
index 3a96659..64b7d8c 100644
--- a/meta/classes/manpages.bbclass
+++ b/meta/classes/manpages.bbclass
@@ -12,7 +12,7 @@ MAN_PKG ?= "${PN}-doc"
 # only add man-db to RDEPENDS when manual files are built and installed
 RDEPENDS:${MAN_PKG} += "${@bb.utils.contains('PACKAGECONFIG', 'manpages', 'man-db', '', d)}"
 
-pkg_postinst:append_${MAN_PKG} () {
+pkg_postinst:append:${MAN_PKG} () {
 	# only update manual page index caches when manual files are built and installed
 	if ${@bb.utils.contains('PACKAGECONFIG', 'manpages', 'true', 'false', d)}; then
 		if test -n "$D"; then
@@ -36,7 +36,7 @@ pkg_postinst:append_${MAN_PKG} () {
 	fi
 }
 
-pkg_postrm:append_${MAN_PKG} () {
+pkg_postrm:append:${MAN_PKG} () {
 	# only update manual page index caches when manual files are built and installed
 	if ${@bb.utils.contains('PACKAGECONFIG', 'manpages', 'true', 'false', d)}; then
 		mandb -q
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index e9bc8e4..e4cdb73 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -56,7 +56,7 @@ export gcc_cv_collect2_libs = 'none required'
 # in the config.log files (which might not get generated until do_compile
 # hence being missed by the insane do_configure check).
 
-EXTRA_OECONF:append_linux = " --enable-__cxa_atexit"
+EXTRA_OECONF:append:linux = " --enable-__cxa_atexit"
 
 EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
 EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 92fb1f3..495dd90 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -180,9 +180,9 @@ SYSTEMLIBS = "${target_base_libdir}/"
 SYSTEMLIBS1 = "${target_libdir}/"
 
 EXTRA_OECONF += "--enable-poison-system-directories"
-EXTRA_OECONF:remove_elf = "--with-sysroot=/not/exist"
-EXTRA_OECONF:remove_eabi = "--with-sysroot=/not/exist"
-EXTRA_OECONF:append_elf = " --without-headers --with-newlib"
-EXTRA_OECONF:append_eabi = " --without-headers --with-newlib"
+EXTRA_OECONF:remove:elf = "--with-sysroot=/not/exist"
+EXTRA_OECONF:remove:eabi = "--with-sysroot=/not/exist"
+EXTRA_OECONF:append:elf = " --without-headers --with-newlib"
+EXTRA_OECONF:append:eabi = " --without-headers --with-newlib"
 # gcc 4.7 needs -isystem
 export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 9e39d49..4839a66 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -281,7 +281,7 @@ SUMMARY:libitm-staticdev = "GNU transactional memory support library - static de
 
 require gcc-testsuite.inc
 
-EXTRA_OEMAKE:prepend_task-check = "${PARALLEL_MAKE} "
+EXTRA_OEMAKE:prepend:task-check = "${PARALLEL_MAKE} "
 
 MAKE_CHECK_TARGETS ??= "check-gcc ${@" ".join("check-target-" + i for i in d.getVar("RUNTIMETARGET").split())}"
 # prettyprinters and xmethods require gdb tooling
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 01cca12..0fe7b4e 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -59,7 +59,7 @@ do_install:append() {
 	rm -f ${D}${infodir}/bfd.info
 }
 
-RRECOMMENDS:gdb:append_linux = " glibc-thread-db "
-RRECOMMENDS:gdb:append_linux-gnueabi = " glibc-thread-db "
-RRECOMMENDS:gdbserver:append_linux = " glibc-thread-db "
-RRECOMMENDS:gdbserver:append_linux-gnueabi = " glibc-thread-db "
+RRECOMMENDS:gdb:append:linux = " glibc-thread-db "
+RRECOMMENDS:gdb:append:linux-gnueabi = " glibc-thread-db "
+RRECOMMENDS:gdbserver:append:linux = " glibc-thread-db "
+RRECOMMENDS:gdbserver:append:linux-gnueabi = " glibc-thread-db "
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 8ebd7d7..f473272 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -110,7 +110,7 @@ EXTRA_OEMAKE += "\
 # that it has to be done this way rather than by passing -j1, since
 # perf's build system by default ignores any -j argument, but does
 # honour a JOBS variable.
-EXTRA_OEMAKE:append_task-configure = " JOBS=1"
+EXTRA_OEMAKE:append:task-configure = " JOBS=1"
 
 PERF_SRC ?= "Makefile \
              tools/arch \
-- 
2.7.4

[PATCH 2/2] convert-overrides.py: handle few more cases of overrides

[Denys Dmytriyenko]

Add task-configure and few more supported values of TARGET_OS override.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
 scripts/contrib/convert-overrides.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py
index 6505b18..23f63a2 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mip
 vars = vars + ["class-native", "class-target", "class-cross-canadian", "class-cross", "class-devupstream"]
 vars = vars + ["tune-",  "pn-", "forcevariable"]
 vars = vars + ["libc-musl", "libc-glibc", "libc-newlib","libc-baremetal"]
-vars = vars + ["task-compile", "task-install", "task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
+vars = vars + ["task-configure", "task-compile", "task-install", "task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
 vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32", "overrideone", "overridetwo"]
 vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32", "mingw32", "poky", "darwin", "linuxstdbase"]
+vars = vars + ["linux", "linux-gnueabi", "elf", "eabi"]
 vars = vars + ["virtclass-multilib", "virtclass-mcextend"]
 
 # List of strings to treat as overrides but only with whitespace following or another override (more restricted matching).
@@ -121,7 +122,7 @@ def processfile(fn):
         pass
 
 ourname = os.path.basename(sys.argv[0])
-ourversion = "0.9.1"
+ourversion = "0.9.2"
 
 if os.path.isfile(sys.argv[1]):
     processfile(sys.argv[1])
-- 
2.7.4

Re: [OE-core] [PATCH 2/2] convert-overrides.py: handle few more cases of overrides

[Richard Purdie]

On Tue, 2021-08-03 at 21:28 -0400, Denys Dmytriyenko wrote:
> Add task-configure and few more supported values of TARGET_OS override.
> 
> Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> ---
>  scripts/contrib/convert-overrides.py | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py
> index 6505b18..23f63a2 100755
> --- a/scripts/contrib/convert-overrides.py
> +++ b/scripts/contrib/convert-overrides.py
> @@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mip
>  vars = vars + ["class-native", "class-target", "class-cross-canadian", "class-cross", "class-devupstream"]
>  vars = vars + ["tune-",  "pn-", "forcevariable"]
>  vars = vars + ["libc-musl", "libc-glibc", "libc-newlib","libc-baremetal"]
> -vars = vars + ["task-compile", "task-install", "task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
> +vars = vars + ["task-configure", "task-compile", "task-install", "task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
>  vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32", "overrideone", "overridetwo"]
>  vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32", "mingw32", "poky", "darwin", "linuxstdbase"]
> +vars = vars + ["linux", "linux-gnueabi", "elf", "eabi"]

I have reservations about linux and elf being here since this does lead to 
a lot of false translations for OE-Core. Since OE-Core is now translated I
guess that isn't the driving factor so I'll probably take this but it is worth
being aware of.

I did just have to retest a translation of core so I now need to filter all
these out the diff...

Cheers,

Richard

Re: [OE-core] [PATCH 2/2] convert-overrides.py: handle few more cases of overrides

[Martin Jansa]

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

Yes, I see the same in meta-oe and meta-webosose.

It's easy to spot false translations in incremental conversion where the
diff is relatively small, but doing initial conversion on big layer with
this change already included might be more painful.

On Wed, Aug 4, 2021 at 12:31 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Tue, 2021-08-03 at 21:28 -0400, Denys Dmytriyenko wrote:
> > Add task-configure and few more supported values of TARGET_OS override.
> >
> > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > ---
> >  scripts/contrib/convert-overrides.py | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/scripts/contrib/convert-overrides.py
> b/scripts/contrib/convert-overrides.py
> > index 6505b18..23f63a2 100755
> > --- a/scripts/contrib/convert-overrides.py
> > +++ b/scripts/contrib/convert-overrides.py
> > @@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e",
> "microblaze", "e5500-64b", "mip
> >  vars = vars + ["class-native", "class-target", "class-cross-canadian",
> "class-cross", "class-devupstream"]
> >  vars = vars + ["tune-",  "pn-", "forcevariable"]
> >  vars = vars + ["libc-musl", "libc-glibc",
> "libc-newlib","libc-baremetal"]
> > -vars = vars + ["task-compile", "task-install", "task-clean",
> "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
> > +vars = vars + ["task-configure", "task-compile", "task-install",
> "task-clean", "task-image-qa", "task-rm_work", "task-image-complete",
> "task-populate-sdk"]
> >  vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32",
> "overrideone", "overridetwo"]
> >  vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32",
> "mingw32", "poky", "darwin", "linuxstdbase"]
> > +vars = vars + ["linux", "linux-gnueabi", "elf", "eabi"]
>
> I have reservations about linux and elf being here since this does lead to
> a lot of false translations for OE-Core. Since OE-Core is now translated I
> guess that isn't the driving factor so I'll probably take this but it is
> worth
> being aware of.
>
> I did just have to retest a translation of core so I now need to filter all
> these out the diff...
>
> Cheers,
>
> Richard
>
>
> 
>
>

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

Re: [OE-core] [PATCH 2/2] convert-overrides.py: handle few more cases of overrides

[Denys Dmytriyenko]

On Wed, Aug 04, 2021 at 04:29:45PM +0200, Martin Jansa wrote:
> Yes, I see the same in meta-oe and meta-webosose.
> 
> It's easy to spot false translations in incremental conversion where the
> diff is relatively small, but doing initial conversion on big layer with
> this change already included might be more painful.
> 
> On Wed, Aug 4, 2021 at 12:31 PM Richard Purdie <
> richard.purdie@linuxfoundation.org> wrote:
> 
> > On Tue, 2021-08-03 at 21:28 -0400, Denys Dmytriyenko wrote:
> > > Add task-configure and few more supported values of TARGET_OS override.
> > >
> > > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > > ---
> > >  scripts/contrib/convert-overrides.py | 5 +++--
> > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/scripts/contrib/convert-overrides.py
> > b/scripts/contrib/convert-overrides.py
> > > index 6505b18..23f63a2 100755
> > > --- a/scripts/contrib/convert-overrides.py
> > > +++ b/scripts/contrib/convert-overrides.py
> > > @@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e",
> > "microblaze", "e5500-64b", "mip
> > >  vars = vars + ["class-native", "class-target", "class-cross-canadian",
> > "class-cross", "class-devupstream"]
> > >  vars = vars + ["tune-",  "pn-", "forcevariable"]
> > >  vars = vars + ["libc-musl", "libc-glibc",
> > "libc-newlib","libc-baremetal"]
> > > -vars = vars + ["task-compile", "task-install", "task-clean",
> > "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
> > > +vars = vars + ["task-configure", "task-compile", "task-install",
> > "task-clean", "task-image-qa", "task-rm_work", "task-image-complete",
> > "task-populate-sdk"]
> > >  vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32",
> > "overrideone", "overridetwo"]
> > >  vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32",
> > "mingw32", "poky", "darwin", "linuxstdbase"]
> > > +vars = vars + ["linux", "linux-gnueabi", "elf", "eabi"]
> >
> > I have reservations about linux and elf being here since this does lead to
> > a lot of false translations for OE-Core. Since OE-Core is now translated I
> > guess that isn't the driving factor so I'll probably take this but it is
> > worth
> > being aware of.
> >
> > I did just have to retest a translation of core so I now need to filter all
> > these out the diff...

Should I re-submit with 'linux' and 'elf' removed?

-- 
Denys

Re: [OE-core] [PATCH 2/2] convert-overrides.py: handle few more cases of overrides

[Richard Purdie]

On Wed, 2021-08-04 at 12:07 -0400, Denys Dmytriyenko wrote:
> On Wed, Aug 04, 2021 at 04:29:45PM +0200, Martin Jansa wrote:
> > Yes, I see the same in meta-oe and meta-webosose.
> > 
> > It's easy to spot false translations in incremental conversion where the
> > diff is relatively small, but doing initial conversion on big layer with
> > this change already included might be more painful.
> > 
> > On Wed, Aug 4, 2021 at 12:31 PM Richard Purdie <
> > richard.purdie@linuxfoundation.org> wrote:
> > 
> > > On Tue, 2021-08-03 at 21:28 -0400, Denys Dmytriyenko wrote:
> > > > Add task-configure and few more supported values of TARGET_OS override.
> > > > 
> > > > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > > > ---
> > > >  scripts/contrib/convert-overrides.py | 5 +++--
> > > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/scripts/contrib/convert-overrides.py
> > > b/scripts/contrib/convert-overrides.py
> > > > index 6505b18..23f63a2 100755
> > > > --- a/scripts/contrib/convert-overrides.py
> > > > +++ b/scripts/contrib/convert-overrides.py
> > > > @@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e",
> > > "microblaze", "e5500-64b", "mip
> > > >  vars = vars + ["class-native", "class-target", "class-cross-canadian",
> > > "class-cross", "class-devupstream"]
> > > >  vars = vars + ["tune-",  "pn-", "forcevariable"]
> > > >  vars = vars + ["libc-musl", "libc-glibc",
> > > "libc-newlib","libc-baremetal"]
> > > > -vars = vars + ["task-compile", "task-install", "task-clean",
> > > "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
> > > > +vars = vars + ["task-configure", "task-compile", "task-install",
> > > "task-clean", "task-image-qa", "task-rm_work", "task-image-complete",
> > > "task-populate-sdk"]
> > > >  vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32",
> > > "overrideone", "overridetwo"]
> > > >  vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32",
> > > "mingw32", "poky", "darwin", "linuxstdbase"]
> > > > +vars = vars + ["linux", "linux-gnueabi", "elf", "eabi"]
> > > 
> > > I have reservations about linux and elf being here since this does lead to
> > > a lot of false translations for OE-Core. Since OE-Core is now translated I
> > > guess that isn't the driving factor so I'll probably take this but it is
> > > worth
> > > being aware of.
> > > 
> > > I did just have to retest a translation of core so I now need to filter all
> > > these out the diff...
> 
> Should I re-submit with 'linux' and 'elf' removed?

I think given OE-Core isn't alone with the issue, that may be wise. I can tweak 
the patch if you want?

Cheers,

Richard

Re: [OE-core] [PATCH 2/2] convert-overrides.py: handle few more cases of overrides

[Denys Dmytriyenko]

On Wed, Aug 04, 2021 at 06:04:27PM +0100, Richard Purdie wrote:
> On Wed, 2021-08-04 at 12:07 -0400, Denys Dmytriyenko wrote:
> > On Wed, Aug 04, 2021 at 04:29:45PM +0200, Martin Jansa wrote:
> > > Yes, I see the same in meta-oe and meta-webosose.
> > > 
> > > It's easy to spot false translations in incremental conversion where the
> > > diff is relatively small, but doing initial conversion on big layer with
> > > this change already included might be more painful.
> > > 
> > > On Wed, Aug 4, 2021 at 12:31 PM Richard Purdie <
> > > richard.purdie@linuxfoundation.org> wrote:
> > > 
> > > > On Tue, 2021-08-03 at 21:28 -0400, Denys Dmytriyenko wrote:
> > > > > Add task-configure and few more supported values of TARGET_OS override.
> > > > > 
> > > > > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > > > > ---
> > > > >  scripts/contrib/convert-overrides.py | 5 +++--
> > > > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > > > > 
> > > > > diff --git a/scripts/contrib/convert-overrides.py
> > > > b/scripts/contrib/convert-overrides.py
> > > > > index 6505b18..23f63a2 100755
> > > > > --- a/scripts/contrib/convert-overrides.py
> > > > > +++ b/scripts/contrib/convert-overrides.py
> > > > > @@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e",
> > > > "microblaze", "e5500-64b", "mip
> > > > >  vars = vars + ["class-native", "class-target", "class-cross-canadian",
> > > > "class-cross", "class-devupstream"]
> > > > >  vars = vars + ["tune-",  "pn-", "forcevariable"]
> > > > >  vars = vars + ["libc-musl", "libc-glibc",
> > > > "libc-newlib","libc-baremetal"]
> > > > > -vars = vars + ["task-compile", "task-install", "task-clean",
> > > > "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
> > > > > +vars = vars + ["task-configure", "task-compile", "task-install",
> > > > "task-clean", "task-image-qa", "task-rm_work", "task-image-complete",
> > > > "task-populate-sdk"]
> > > > >  vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32",
> > > > "overrideone", "overridetwo"]
> > > > >  vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32",
> > > > "mingw32", "poky", "darwin", "linuxstdbase"]
> > > > > +vars = vars + ["linux", "linux-gnueabi", "elf", "eabi"]
> > > > 
> > > > I have reservations about linux and elf being here since this does lead to
> > > > a lot of false translations for OE-Core. Since OE-Core is now translated I
> > > > guess that isn't the driving factor so I'll probably take this but it is
> > > > worth
> > > > being aware of.
> > > > 
> > > > I did just have to retest a translation of core so I now need to filter all
> > > > these out the diff...
> > 
> > Should I re-submit with 'linux' and 'elf' removed?
> 
> I think given OE-Core isn't alone with the issue, that may be wise. I can tweak 
> the patch if you want?

Richard,

Whichever is easier for you.

-- 
Denys