meta: convert nested overrides leftovers to new syntax
PATCH 1/2 meta: convert nested overrides leftovers to new syntax
Those were missed in previous rounds of automated and manual conversion.
--- 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(-)
meta/classes/manpages.bbclass +2 -2
@@ -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
meta/recipes-devtools/gcc/gcc-configure-common.inc +1 -1
@@ -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"
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +4 -4
@@ -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}"
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -1
@@ -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
meta/recipes-devtools/gdb/gdb-common.inc +4 -4
@@ -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 "
meta/recipes-kernel/perf/perf.bb +1 -1
@@ -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 \
Signature · 1 line
2.7.4
PATCH 2/2 convert-overrides.py: handle few more cases of overrides
Add task-configure and few more supported values of TARGET_OS override.
--- scripts/contrib/convert-overrides.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/contrib/convert-overrides.py +3 -2
@@ -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])
Signature · 1 line
2.7.4
Re: [OE-core] [PATCH 2/2] convert-overrides.py: handle few more cases of overrides
Quoted 17 lines · Denys Dmytriyenko
Add task-configure and few more supported values of
TARGET_OSoverride.Signed-off-by Denys Dmytriyenko <[email protected]>---
scripts/contrib/convert-overrides.py | 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)scripts/contrib/convert-overrides.py +0
-0@@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mipvars = 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"]scripts/contrib/convert-overrides.py +1
-1-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"]
Quoted 3 lines
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
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.
Quoted 48 lines · Richard Purdie
Review
Quoted 8 lines · Denys Dmytriyenko
Add task-configure and few more supported values of
TARGET_OSoverride.Signed-off-by Denys Dmytriyenko <[email protected]>--- scripts/contrib/convert-overrides.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/scripts/contrib/convert-overrides.pyscripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e",
Quoted 4 lines
index 6505b18..23f63a2 100755
scripts/contrib/convert-overrides.py +0
-0@@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e","microblaze", "e5500-64b", "mip
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 36
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["class-native", "class-target", "class-cross-canadian","class-cross", "class-devupstream"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 38
Quoted 2 lines
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["tune-", "pn-", "forcevariable"] vars = vars + ["libc-musl", "libc-glibc","libc-newlib","libc-baremetal"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 39
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-1-vars = vars + ["task-compile", "task-install", "task-clean","task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 39
Quoted 1 line
scripts/contrib/convert-overrides.py +1
-0+vars = vars + ["task-configure", "task-compile", "task-install","task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 40
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32","overrideone", "overridetwo"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 41
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32","mingw32", "poky", "darwin", "linuxstdbase"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mip · line 42
Quoted 1 line
scripts/contrib/convert-overrides.py +1
-0+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
Quoted 48 lines · Martin Jansa
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.
Quoted 39 lines · Richard Purdie
Review
Quoted 8 lines · Denys Dmytriyenko
Add task-configure and few more supported values of
TARGET_OSoverride.Signed-off-by Denys Dmytriyenko <[email protected]>--- scripts/contrib/convert-overrides.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/scripts/contrib/convert-overrides.pyscripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e",
Quoted 4 lines
index 6505b18..23f63a2 100755
scripts/contrib/convert-overrides.py +0
-0@@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e","microblaze", "e5500-64b", "mip
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 36
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["class-native", "class-target", "class-cross-canadian","class-cross", "class-devupstream"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 38
Quoted 2 lines
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["tune-", "pn-", "forcevariable"] vars = vars + ["libc-musl", "libc-glibc","libc-newlib","libc-baremetal"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 39
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-1-vars = vars + ["task-compile", "task-install", "task-clean","task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 39
Quoted 1 line
scripts/contrib/convert-overrides.py +1
-0+vars = vars + ["task-configure", "task-compile", "task-install","task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 40
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32","overrideone", "overridetwo"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 41
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32","mingw32", "poky", "darwin", "linuxstdbase"]
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", "microblaze", "e5500-64b", "mip · line 42
Quoted 1 line
scripts/contrib/convert-overrides.py +1
-0+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?
Signature · 1 line
Denys
Re: [OE-core] [PATCH 2/2] convert-overrides.py: handle few more cases of overrides
Quoted 47 lines · Denys Dmytriyenko
Quoted 46 lines · Martin Jansa
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.
Quoted 37 lines · Richard Purdie
Review
Quoted 8 lines · Denys Dmytriyenko
Add task-configure and few more supported values of
TARGET_OSoverride.Signed-off-by Denys Dmytriyenko <[email protected]>---
scripts/contrib/convert-overrides.py | 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/scripts/contrib/convert-overrides.pyscripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e",
Quoted 4 lines
index 6505b18..23f63a2 100755
scripts/contrib/convert-overrides.py +0
-0@@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e","microblaze", "e5500-64b", "mip
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 36
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["class-native", "class-target", "class-cross-canadian","class-cross", "class-devupstream"]
Quoted 2 lines
vars = vars + ["tune-", "pn-", "forcevariable"]
vars = vars + ["libc-musl", "libc-glibc","libc-newlib","libc-baremetal"]
Quoted 1 line
-vars = vars + ["task-compile", "task-install", "task-clean",
"task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
Quoted 1 line
+vars = vars + ["task-configure", "task-compile", "task-install",
"task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
Quoted 1 line
vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32",
"overrideone", "overridetwo"]
Quoted 1 line
vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32",
"mingw32", "poky", "darwin", "linuxstdbase"]
Quoted 1 line
+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.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
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
Quoted 48 lines · Richard Purdie
Quoted 47 lines · Denys Dmytriyenko
Quoted 46 lines · Martin Jansa
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.
Quoted 37 lines · Richard Purdie
Review
Quoted 8 lines · Denys Dmytriyenko
Add task-configure and few more supported values of
TARGET_OSoverride.Signed-off-by Denys Dmytriyenko <[email protected]>---
scripts/contrib/convert-overrides.py | 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/scripts/contrib/convert-overrides.pyscripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e",
Quoted 4 lines
index 6505b18..23f63a2 100755
scripts/contrib/convert-overrides.py +0
-0@@ -36,9 +36,10 @@ vars = vars + ["mipsarch", "x86-x32", "mips16e","microblaze", "e5500-64b", "mip
scripts/contrib/convert-overrides.py vars = vars + ["mipsarch", "x86-x32", "mips16e", · line 36
Quoted 1 line
scripts/contrib/convert-overrides.py +0
-0vars = vars + ["class-native", "class-target", "class-cross-canadian","class-cross", "class-devupstream"]
Quoted 2 lines
vars = vars + ["tune-", "pn-", "forcevariable"]
vars = vars + ["libc-musl", "libc-glibc","libc-newlib","libc-baremetal"]
Quoted 1 line
-vars = vars + ["task-compile", "task-install", "task-clean",
"task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
Quoted 1 line
+vars = vars + ["task-configure", "task-compile", "task-install",
"task-clean", "task-image-qa", "task-rm_work", "task-image-complete", "task-populate-sdk"]
Quoted 1 line
vars = vars + ["toolchain-clang", "mydistro", "nios2", "sdkmingw32",
"overrideone", "overridetwo"]
Quoted 1 line
vars = vars + ["linux-gnux32", "linux-muslx32", "linux-gnun32",
"mingw32", "poky", "darwin", "linuxstdbase"]
Quoted 1 line
+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.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
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.
Signature · 1 line
Denys