Re: [OE-core] [PATCH 1/2] populate_sdk_base: only depend on nativesdk-glibc-locale when SDK_OS is not mingw32
Hi, I have seen the two commits from meta-mingw layer upstream: f49ac31f64a1adffaeb9706eb552dab66b4baff2 a07fe304228b7f41b5558de7d8f39fd5e8a430d2 , and I haven't updated the git repo for this layer in my local machine. These two patches fixed the issue, so the patches from me are not needed any more. Thanks. On 2018年08月18日 05:30, Richard Purdie wrote: On Fri, 2018-08-17 at 01:54 -0700, Zhixiong Chi wrote: When we add the nativesdk-glibc-locale dependence for libc-glibc, if the SDK_OS is mingw32, it will broken the building with the following error: NOTE: Resolving any missing task queue dependencies ERROR: Nothing RPROVIDES 'nativesdk-glibc' (but virtual:nativesdk:layers/oe-core/meta/recipes-core/glibc/glibc- locale_2.24.bb RDEPENDS on or otherwise requires it) ERROR: nativesdk-glibc was skipped: PREFERRED_PROVIDER_virtual/nativesdk-libc set to nativesdk-mingw- w64-runtime, not nativesdk-glibc NOTE: Runtime target 'nativesdk-glibc' is unbuildable, removing... Missing or unbuildable dependency chain was: ['nativesdk-glibc'] ERROR: Required build target 'meta-toolchain' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-toolchain', 'nativesdk-glibc-locale', 'nativesdk-glibc'] mingw32 SDK_OS doesn't need to depend on nativesdk-glibc-locale. Signed-off-by: Zhixiong Chi --- meta/classes/populate_sdk_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index c456c52866..65c27b0077 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -48,7 +48,7 @@ TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" SDK_DEPENDS = "virtual/fakeroot-native xz-native cross-localedef-native nativesdk-qemuwrapper-cross ${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross" PATH_prepend = "${STAGING_DIR_HOST}${SDKPATHNATIVE}${bindir}/crossscripts:${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" -SDK_DEPENDS_append_libc-glibc = " nativesdk-glibc-locale" +SDK_DEPENDS_append_libc-glibc = " ${@bb.utils.contains('SDK_OS', 'mingw32', '', 'nativesdk-glibc-locale', d)}" # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it # could be set to the MACHINE_ARCH I appreciate this fixes a specific problem but this code is wrong anyway, libc-glibc is a target override and we're talking about the sdk here. To illustrate, if a target image was musl based but the sdk glibc based, this code wouldn't work. Could we therefore correct this to correctly determine which libc is being used in the SDK? If we're going to fix it, lets fix it properly... Cheers, Richard -- - Thanks, Zhixiong Chi Tel: +86-10-8477-7036 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: Add a dependency on virtual/crypt
busybox needs crypt() if CONFIG_USE_BB_CRYPT is not defined. Signed-off-by: Peter Kjellerstedt --- meta/recipes-core/busybox/busybox.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 8c6dbbaf9b..a8ba10d21c 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -3,7 +3,8 @@ DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into HOMEPAGE = "http://www.busybox.net"; BUGTRACKER = "https://bugs.busybox.net/"; -DEPENDS += "kern-tools-native" +# Depend on virtual/crypt in case CONFIG_USE_BB_CRYPT is not defined +DEPENDS += "kern-tools-native virtual/crypt" # bzip2 applet in busybox is based on lightly-modified bzip2 source # the GPL is version 2 only -- 2.12.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] classes/package: Clean up getstatusoutput
Replaces usage of the deprecated oe.utils.getstatusoutput() with Python subprocess calls. Signed-off-by: Joshua Watt --- meta/classes/package.bbclass | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 4ce9de2f573..b05d2858281 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -380,6 +380,7 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, # sourcefile is also generated containing a list of debugsources import stat +import subprocess src = file[len(dvar):] dest = debuglibdir + os.path.dirname(src) + debugdir + "/" + os.path.basename(src) + debugappend @@ -409,16 +410,18 @@ def splitdebuginfo(file, dvar, debugdir, debuglibdir, debugappend, debugsrcdir, bb.utils.mkdirhier(os.path.dirname(debugfile)) -cmd = "'%s' --only-keep-debug '%s' '%s'" % (objcopy, file, debugfile) -(retval, output) = oe.utils.getstatusoutput(cmd) -if retval: -bb.fatal("objcopy failed with exit code %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else "")) +cmd = (objcopy, '--only-keep-debug', file, debugfile) +try: +subprocess.check_output(cmd) +except subprocess.CalledProcessError as e: +bb.fatal("objcopy failed with exit code %s (cmd was %s)%s" % (e.returncode, ' '.join(cmd), ":\n%s" % output.decode('utf-8') if e.output else "")) # Set the debuglink to have the view of the file path on the target -cmd = "'%s' --add-gnu-debuglink='%s' '%s'" % (objcopy, debugfile, file) -(retval, output) = oe.utils.getstatusoutput(cmd) -if retval: -bb.fatal("objcopy failed with exit code %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else "")) +cmd = (objcopy, '--add-gnu-debuglink', debugfile, file) +try: +subprocess.check_output(cmd) +except subprocess.CalledProcessError as e: +bb.fatal("objcopy failed with exit code %s (cmd was %s)%s" % (e.returncode, ' '.join(cmd), ":\n%s" % output.decode('utf-8') if e.output else "")) if newmode: os.chmod(file, origmode) -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 8/9] gdb: Upgrade to 8.1.1
On Sun, Aug 19, 2018 at 7:19 PM ChenQi wrote: > > There's a build failure on autobuilder. > > https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/700/steps/BuildImages/logs/stdio > I pushed a patch to pull branch which should fix it http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/master&id=a05cc1ee8eb1cb05064164a9ae62db6dc78d022b > | x86_64-poky-linux-musl-g++ -m64 -march=core2 -mtune=core2 -msse3 > -mfpmath=sse > --sysroot=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot > -shared -fPIC -Wl,--soname=libinproctrace.so -Wl,--no-undefined -O2 -pipe > -g -feliminate-unused-debug-types > -fdebug-prefix-map=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0=/usr/src/debug/gdb/8.1.1-r0 > > -fdebug-prefix-map=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot= > > -fdebug-prefix-map=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot-native= > -fvisibility-inlines-hidden-I. -I../../../gdb-8.1.1/gdb/gdbserver > -I../../../gdb-8.1.1/gdb/gdbserver/../common -I../../../gdb-8.1.1/gdb/gdbs erver/../regformats -I../../../gdb-8.1.1/gdb/gdbserver/.. -I../../../gdb-8.1.1/gdb/gdbserver/../../include -I../../../gdb-8.1.1/gdb/gdbserver/../gnulib/import -Ibuild-gnulib-gdbserver/import -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wno-error=maybe-uninitialized -DGDBSERVER \ > | -static-libstdc++ -static-libgcc -Wl,-O1 -Wl,--hash-style=gnu > -Wl,--as-needed > -Wl,--dynamic-list=../../../gdb-8.1.1/gdb/gdbserver/proc-service.list -o > libinproctrace.so ax-ipa.o common-utils-ipa.o errors-ipa.o format-ipa.o > print-utils-ipa.o regcache-ipa.o remote-utils-ipa.o rsp-low-ipa.o tdesc-ipa.o > tracepoint-ipa.o utils-ipa.o vec-ipaERROR: Task > (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/meta/recipes-devtools/gdb/gdb_8.1.1.bb:do_compile) > failed with exit code '1' > .o linux-amd64-ipa.o linux-x86-tdesc-ipa.o arch/amd64-ipa.o -ldl -pthread > | > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/8.2.0/ld: > common-utils-ipa.o: in function `is_regular_file(char const*, int*)': > | > /usr/src/debug/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb/gdbserver/../../../gdb-8.1.1/gdb/gdbserver/../common/common-utils.c:419: > undefined reference to `rpl_stat' > | collect2: error: ld returned 1 exit status > | make[4]: *** [Makefile:414: libinproctrace.so] Error 1 > | make[4]: *** Waiting for unfinished jobs > | make[4]: Leaving directory > '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb/gdbserver' > | make[3]: *** [Makefile:2027: subdir_do] Error 1 > | make[3]: Leaving directory > '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb' > | make[2]: *** [Makefile:1621: all] Error 2 > | make[2]: Leaving directory > '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb' > | make[1]: *** [Makefile:8793: all-gdb] Error 2 > | make[1]: Leaving directory > '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl' > | make: *** [Makefile:850: all] Error 2 > | ERROR: oe_runmake failed > > > Best Regards, > Chen Qi > > On 08/20/2018 01:23 AM, Khem Raj wrote: > > Signed-off-by: Khem Raj > --- > meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} | 4 ++-- > ...{gdb-cross-canadian_8.1.bb => gdb-cross-canadian_8.1.1.bb} | 0 > .../gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} | 0 > meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb}| 0 > 4 files changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} (89%) > rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.1.bb => > gdb-cross-canadian_8.1.1.bb} (100%) > rename meta/recipes-devtools/gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} > (100%) > rename meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb} (100%) > > diff --git a/meta/recipes-devtools/gdb/gdb-8.1.inc > b/meta/recipes-devtools/gdb/gdb-8.1.1.inc > similar
[OE-core] [PATCH V3] sstate: Avoid indirect autoconf-archive-native dependencies
From: Changqing Li remove the indirect dependcy of autoconf-archive-native via SSTATE_EXCLUDEDEPS_SYSROOT to avoid not needed .m4 installed into sysroot, which may cause compile problem. Signed-off-by: Changqing Li --- meta/conf/layer.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index cc77d07..63346ae 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -90,6 +90,8 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\ .*->.*-initial.* \ .*(base-passwd|shadow-sysroot)->.* \ " - +# Avoid adding autoconf-archive-native to sysroot without a specific +# dependency in the recipe. +SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" # We need to keep bitbake tools in PATH PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 8/9] gdb: Upgrade to 8.1.1
There's a build failure on autobuilder. https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/700/steps/BuildImages/logs/stdio | x86_64-poky-linux-musl-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot -shared -fPIC -Wl,--soname=libinproctrace.so -Wl,--no-undefined -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0=/usr/src/debug/gdb/8.1.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -I. -I../../../gdb-8.1.1/gdb/gdbserver -I../../../gdb-8.1.1/gdb/gdbserver/../common -I../../../gdb-8.1.1/gdb/gdbserver/../regformats -I../../../gdb-8.1.1/gdb/gdbserver/.. -I../../../gdb-8.1.1/gdb/gdbserver/../../include -I../../../gdb-8.1.1/gdb/gdbserver/../gnulib/import -Ibuild-gnulib-gdbserver/import -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wno-error=maybe-uninitialized -DGDBSERVER \ | -static-libstdc++ -static-libgcc -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,--dynamic-list=../../../gdb-8.1.1/gdb/gdbserver/proc-service.list -o libinproctrace.so ax-ipa.o common-utils-ipa.o errors-ipa.o format-ipa.o print-utils-ipa.o regcache-ipa.o remote-utils-ipa.o rsp-low-ipa.o tdesc-ipa.o tracepoint-ipa.o utils-ipa.o vec-ipaERROR: Task (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/meta/recipes-devtools/gdb/gdb_8.1.1.bb:do_compile) failed with exit code '1' .o linux-amd64-ipa.o linux-x86-tdesc-ipa.o arch/amd64-ipa.o -ldl -pthread | /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/8.2.0/ld: common-utils-ipa.o: in function `is_regular_file(char const*, int*)': | /usr/src/debug/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb/gdbserver/../../../gdb-8.1.1/gdb/gdbserver/../common/common-utils.c:419: undefined reference to `rpl_stat' | collect2: error: ld returned 1 exit status | make[4]: *** [Makefile:414: libinproctrace.so] Error 1 | make[4]: *** Waiting for unfinished jobs | make[4]: Leaving directory '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb/gdbserver' | make[3]: *** [Makefile:2027: subdir_do] Error 1 | make[3]: Leaving directory '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb' | make[2]: *** [Makefile:1621: all] Error 2 | make[2]: Leaving directory '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl/gdb' | make[1]: *** [Makefile:8793: all-gdb] Error 2 | make[1]: Leaving directory '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-musl-x86-64/build/build/tmp/work/core2-64-poky-linux-musl/gdb/8.1.1-r0/build-x86_64-poky-linux-musl' | make: *** [Makefile:850: all] Error 2 | ERROR: oe_runmake failed Best Regards, Chen Qi On 08/20/2018 01:23 AM, Khem Raj wrote: Signed-off-by: Khem Raj --- meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} | 4 ++-- ...{gdb-cross-canadian_8.1.bb => gdb-cross-canadian_8.1.1.bb} | 0 .../gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} | 0 meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb}| 0 4 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} (89%) rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.1.bb => gdb-cross-canadian_8.1.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb} (100%) diff --git a/meta/recipes-devtools/gdb/gdb-8.1.inc b/meta/recipes-devtools/gdb/gdb-8.1.1.inc similarity index 89% rename from meta/recipes-devtools/gdb/gdb-8.1.inc rename to meta/recipes-devtools/gdb/gdb-8.1.1.inc index 4d9faa2d4b..ad80dd3e4d 100644 --- a/meta/recipes-devtools/gdb/gdb-8.1.inc +++ b/meta/recipes-devtools/gdb/gdb-8.1.1.inc @@ -18,6 +18,6 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \ file://package_deve
Re: [OE-core] [oe-core][rocko][sumo][master][PATCH 1/2] bitbake.conf: add PERSISTENT_LOG_DIR variable
The requirement is to put logs into directories other than /var/log. Could it be achieved by modifying the syslog daemon configuration file (e.g. /etc/syslog.conf) to replace /var/log with the specified directory. Maybe the corresponding logrotate configuration file also needs to be modified. Best Regards, Chen Qi On 08/18/2018 08:59 AM, Ankur Tyagi wrote: This variable is only respected when VOLATILE_LOG_DIR is "no". The default value is "" which results in the /var/log being log directory. The user could override this value to a path e.g "/home/root/log" which results /var/log being a link pointing to /home/root/log directory on persistent storage. Signed-off-by: Ankur Tyagi --- meta/conf/bitbake.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e5dc1ac..9db22c8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -88,6 +88,8 @@ ROOT_HOME ??= "/home/root" # If set to boolean true ('yes', 'y', 'true', 't', '1'), /var/log links to /var/volatile/log. # If set to boolean false ('no', 'n', 'false', 'f', '0'), /var/log is on persistent storage. VOLATILE_LOG_DIR ?= "yes" +# If VOLATILE_LOG_DIR is false and PERSISTENT_LOG_DIR is set, /var/log links to PERSISTENT_LOG_DIR +PERSISTENT_LOG_DIR ??= "" ## # Architecture-dependent build variables. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for sstate: Avoid indirect autoconf-archive-native dependencies (via SSTATE_EXCLUDEDEPS_SYSROOT)
== Series Details == Series: sstate: Avoid indirect autoconf-archive-native dependencies (via SSTATE_EXCLUDEDEPS_SYSROOT) Revision: 1 URL : https://patchwork.openembedded.org/series/13601/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch[V2] sstate: Avoid indirect autoconf-archive-native dependencies (via SSTATE_EXCLUDEDEPS_SYSROOT) Issue Commit shortlog is too long [test_shortlog_length] Suggested fixEdit shortlog so that it is 90 characters or less (currently 92 characters) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] nasm: fix CVE-2018-8883 & CVE-2018-8882 & CVE-2018-10016 & CVE-2018-10316
Signed-off-by: Hongxu Jia --- ...t-we-are-not-reading-past-end-of-a-buffer.patch | 65 ++ ...001-asm-eval.c-Avoid-possible-divide-by-0.patch | 40 + .../0001-assemble-Check-global-line-limit.patch| 50 + .../nasm/nasm/0001-fix-CVE-2018-8882.patch | 30 ++ meta/recipes-devtools/nasm/nasm_2.13.03.bb | 4 ++ 5 files changed, 189 insertions(+) create mode 100644 meta/recipes-devtools/nasm/nasm/0001-Verify-that-we-are-not-reading-past-end-of-a-buffer.patch create mode 100644 meta/recipes-devtools/nasm/nasm/0001-asm-eval.c-Avoid-possible-divide-by-0.patch create mode 100644 meta/recipes-devtools/nasm/nasm/0001-assemble-Check-global-line-limit.patch create mode 100644 meta/recipes-devtools/nasm/nasm/0001-fix-CVE-2018-8882.patch diff --git a/meta/recipes-devtools/nasm/nasm/0001-Verify-that-we-are-not-reading-past-end-of-a-buffer.patch b/meta/recipes-devtools/nasm/nasm/0001-Verify-that-we-are-not-reading-past-end-of-a-buffer.patch new file mode 100644 index 000..a56a08b --- /dev/null +++ b/meta/recipes-devtools/nasm/nasm/0001-Verify-that-we-are-not-reading-past-end-of-a-buffer.patch @@ -0,0 +1,65 @@ +From c5785fdf1d660eaefb9711284414262d0cfe8843 Mon Sep 17 00:00:00 2001 +From: Adam Majer +Date: Fri, 17 Aug 2018 14:48:17 +0800 +Subject: [PATCH] Verify that we are not reading past end of a buffer + +Simple reproducer is just, + +ret &d:ep + +which triggers a buffer overread due to parsing of an invalid +segment override. + +Signed-off-by: Adam Majer + +Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392447] +CVE: CVE-2018-8883 +Signed-off-by: Hongxu Jia +--- + include/opflags.h | 2 +- + include/tables.h | 1 + + x86/regs.pl | 3 ++- + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/opflags.h b/include/opflags.h +index ef2838c1..8d4b6b1e 100644 +--- a/include/opflags.h b/include/opflags.h +@@ -166,7 +166,7 @@ + #define REG_CLASS_BND GEN_REG_CLASS(9) + + #define is_class(class, op) (!((opflags_t)(class) & ~(opflags_t)(op))) +-#define is_reg_class(class, reg)is_class((class), nasm_reg_flags[(reg)]) ++#define is_reg_class(class, reg)is_class((class), ((reg) < nasm_reg_flags_size ? nasm_reg_flags[(reg)] : 0)) + + #define IS_SREG(reg)is_reg_class(REG_SREG, (reg)) + #define IS_FSGS(reg)is_reg_class(REG_FSGS, (reg)) +diff --git a/include/tables.h b/include/tables.h +index 24a665e2..458752ce 100644 +--- a/include/tables.h b/include/tables.h +@@ -64,6 +64,7 @@ extern const char * const nasm_reg_names[]; + typedef uint64_t opflags_t; + typedef uint16_t decoflags_t; + extern const opflags_t nasm_reg_flags[]; ++extern const size_t nasm_reg_flags_size; + /* regvals.c */ + extern const int nasm_regvals[]; + +diff --git a/x86/regs.pl b/x86/regs.pl +index 3a1b56f5..cb5cea68 100755 +--- a/x86/regs.pl b/x86/regs.pl +@@ -158,7 +158,8 @@ if ( $fmt eq 'h' ) { + printf "%-15s /* %-5s */\n", + $regs{$reg}.',', $reg; + } +-print "};\n"; ++print "};\n\n"; ++print "const size_t nasm_reg_flags_size = sizeof(nasm_reg_flags) / sizeof(opflags_t);\n"; + } elsif ( $fmt eq 'vc' ) { + # Output regvals.c + print "/* automatically generated from $file - do not edit */\n\n"; +-- +2.17.1 + diff --git a/meta/recipes-devtools/nasm/nasm/0001-asm-eval.c-Avoid-possible-divide-by-0.patch b/meta/recipes-devtools/nasm/nasm/0001-asm-eval.c-Avoid-possible-divide-by-0.patch new file mode 100644 index 000..6ceeca0 --- /dev/null +++ b/meta/recipes-devtools/nasm/nasm/0001-asm-eval.c-Avoid-possible-divide-by-0.patch @@ -0,0 +1,40 @@ +From 8ad049cf9ccda2a5133a97506011862bcfc4a0c0 Mon Sep 17 00:00:00 2001 +From: Adam Majer +Date: Fri, 17 Aug 2018 14:15:35 +0800 +Subject: [PATCH] asm/eval.c: Avoid possible divide by 0 + +During a divide operation, we already tested that the +divisor has is_simple, but then when testing it for 0, +we again verify that it does not contain any unknown parts. +This extra check prevents detection of cases when +reloc_value returns 0. + +Use reloc_value instead in detection of 0 divisor. + +https://bugzilla.nasm.us/show_bug.cgi?id=3392473 + +Signed-off-by: Adam Majer + +Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392473] +CVE: CVE-2018-10016 +Signed-off-by: Hongxu Jia +--- + asm/eval.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/asm/eval.c b/asm/eval.c +index 816983b9..57c598c5 100644 +--- a/asm/eval.c b/asm/eval.c +@@ -585,7 +585,7 @@ static expr *expr5(int critical) + " scalar values"); + return NULL; + } +-if (j != '*' && !is_unknown(f) && reloc_value(f) == 0) { ++if (j != '*' && reloc_value(f) == 0) { + nasm_error(ERR_NONFATAL, "division by zero"); + return NULL; + } +-- +2.17.1 + diff --git a/meta/recipes-devt
[OE-core] [PATCH V2] sstate: Avoid indirect autoconf-archive-native dependencies (via SSTATE_EXCLUDEDEPS_SYSROOT)
From: Changqing Li remove the indirect dependcy of autoconf-archive-native to avoid not needed .m4 installed into sysroot, which may cause compile problem. Signed-off-by: Changqing Li --- meta/conf/layer.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index cc77d07..63346ae 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -90,6 +90,8 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\ .*->.*-initial.* \ .*(base-passwd|shadow-sysroot)->.* \ " - +# Avoid adding autoconf-archive-native to sysroot without a specific +# dependency in the recipe. +SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" # We need to keep bitbake tools in PATH PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for deployed artifacts naming improvements
== Series Details == Series: deployed artifacts naming improvements Revision: 1 URL : https://patchwork.openembedded.org/series/13599/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch[1/6] bitbake.conf, kernel-artifact-names.bbclass: introduce IMAGE_VERSION_SUFFIX instead of using DATETIME directly Issue Commit shortlog is too long [test_shortlog_length] Suggested fixEdit shortlog so that it is 90 characters or less (currently 110 characters) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] kernel.bbclass: rename type variable to imageType
* to avoid confusion with "type" command in shell Signed-off-by: Martin Jansa --- meta/classes/kernel.bbclass | 58 ++--- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3c8aa5911f..6b734be2b6 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -235,31 +235,31 @@ do_bundle_initramfs () { copy_initramfs # Backing up kernel image relies on its type(regular file or symbolic link) tmp_path="" - for type in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do - if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then - linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$type` - realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$type` + for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do + if [ -h ${KERNEL_OUTPUT_DIR}/$imageType ] ; then + linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$imageType` + realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$imageType` mv -f $realpath $realpath.bak - tmp_path=$tmp_path" "$type"#"$linkpath"#"$realpath - elif [ -f ${KERNEL_OUTPUT_DIR}/$type ]; then - mv -f ${KERNEL_OUTPUT_DIR}/$type ${KERNEL_OUTPUT_DIR}/$type.bak - tmp_path=$tmp_path" "$type"##" + tmp_path=$tmp_path" "$imageType"#"$linkpath"#"$realpath + elif [ -f ${KERNEL_OUTPUT_DIR}/$imageType ]; then + mv -f ${KERNEL_OUTPUT_DIR}/$imageType ${KERNEL_OUTPUT_DIR}/$imageType.bak + tmp_path=$tmp_path" "$imageType"##" fi done use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio kernel_do_compile # Restoring kernel image for tp in $tmp_path ; do - type=`echo $tp|cut -d "#" -f 1` + imageType=`echo $tp|cut -d "#" -f 1` linkpath=`echo $tp|cut -d "#" -f 2` realpath=`echo $tp|cut -d "#" -f 3` if [ -n "$realpath" ]; then mv -f $realpath $realpath.initramfs mv -f $realpath.bak $realpath - ln -sf $linkpath.initramfs ${B}/${KERNEL_OUTPUT_DIR}/$type.initramfs + ln -sf $linkpath.initramfs ${B}/${KERNEL_OUTPUT_DIR}/$imageType.initramfs else - mv -f ${KERNEL_OUTPUT_DIR}/$type ${KERNEL_OUTPUT_DIR}/$type.initramfs - mv -f ${KERNEL_OUTPUT_DIR}/$type.bak ${KERNEL_OUTPUT_DIR}/$type + mv -f ${KERNEL_OUTPUT_DIR}/$imageType ${KERNEL_OUTPUT_DIR}/$imageType.initramfs + mv -f ${KERNEL_OUTPUT_DIR}/$imageType.bak ${KERNEL_OUTPUT_DIR}/$imageType fi done fi @@ -365,10 +365,10 @@ kernel_do_install() { # install -d ${D}/${KERNEL_IMAGEDEST} install -d ${D}/boot - for type in ${KERNEL_IMAGETYPES} ; do - install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} ${D}/${KERNEL_IMAGEDEST}/${type}-${KERNEL_VERSION} + for imageType in ${KERNEL_IMAGETYPES} ; do + install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then - ln -sf ${type}-${KERNEL_VERSION} ${D}/${KERNEL_IMAGEDEST}/${type} + ln -sf ${imageType}-${KERNEL_VERSION} ${D}/${KERNEL_IMAGEDEST}/${imageType} fi done install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} @@ -640,10 +640,10 @@ do_sizecheck() { die "Invalid KERNEL_IMAGE_MAXSIZE: ${KERNEL_IMAGE_MAXSIZE}, should be an integer (The unit is Kbytes)" fi at_least_one_fits= - for type in ${KERNEL_IMAGETYPES} ; do - size=`du -ks ${B}/${KERNEL_OUTPUT_DIR}/$type | awk '{print $1}'` + for imageType in ${KERNEL_IMAGETYPES} ; do + size=`du -ks ${B}/${KERNEL_OUTPUT_DIR}/$imageType | awk '{print $1}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then - bbwarn "This kernel $type (size=$size(K) > ${KERNEL_IMAGE_MAXSIZE}(K)) is too big for your device." + bbwarn "This kernel $imageType (size=$size(K) > ${KERNEL_IMAGE_MAXSIZE}(K)) is too big for your device."
[OE-core] [PATCH 2/6] kernel-artifact-names, kernel-fitimage: add KERNEL_FIT_BASE_NAME, KERNEL_FIT_SYMLINK_NAME variables
* use the same naming scheme for fitImage files like all other deployed artifacts * remove unnecessary cd to DEPLOYDIR * remove unnecessary cd to B Signed-off-by: Martin Jansa --- meta/classes/kernel-artifact-names.bbclass | 3 ++ meta/classes/kernel-fitimage.bbclass | 34 -- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass index 70b1cb804d..d235bc1096 100644 --- a/meta/classes/kernel-artifact-names.bbclass +++ b/meta/classes/kernel-artifact-names.bbclass @@ -4,6 +4,9 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" +KERNEL_FIT_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +KERNEL_FIT_SYMLINK_NAME ?= "${MACHINE}" + MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index a1d0dda55d..a99c9d8054 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -1,4 +1,4 @@ -inherit kernel-uboot uboot-sign +inherit kernel-uboot kernel-artifact-names uboot-sign python __anonymous () { kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" @@ -488,32 +488,22 @@ kernel_do_deploy[vardepsexclude] = "DATETIME" kernel_do_deploy_append() { # Update deploy directory if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then - cd ${B} echo "Copying fit-image.its source file..." - its_base_name="fitImage-its-${PV}-${PR}-${MACHINE}-${DATETIME}" - its_symlink_name=fitImage-its-${MACHINE} - install -m 0644 fit-image.its ${DEPLOYDIR}/${its_base_name}.its - linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}" - linux_bin_symlink_name=fitImage-linux.bin-${MACHINE} - install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_name}.bin + install -m 0644 ${B}/fit-image.its ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_BASE_NAME}.its + ln -snf fitImage-its-${KERNEL_FIT_BASE_NAME} ${DEPLOYDIR}/fitImage-its-${KERNEL_FIT_SYMLINK_NAME} + + echo "Copying linux.bin file..." + install -m 0644 ${B}/linux.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_BASE_NAME}.bin + ln -snf fitImage-linux.bin-${KERNEL_FIT_BASE_NAME}.bin ${DEPLOYDIR}/fitImage-linux.bin-${KERNEL_FIT_SYMLINK_NAME} if [ -n "${INITRAMFS_IMAGE}" ]; then echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." - its_initramfs_base_name="fitImage-its-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}" - its_initramfs_symlink_name=fitImage-its-${INITRAMFS_IMAGE_NAME} - install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its - fit_initramfs_base_name="fitImage-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}" - fit_initramfs_symlink_name=fitImage-${INITRAMFS_IMAGE_NAME} - install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin - fi + install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.its + ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.its ${DEPLOYDIR}/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_SYMLINK_NAME} - cd ${DEPLOYDIR} - ln -sf ${its_base_name}.its ${its_symlink_name}.its - ln -sf ${linux_bin_base_name}.bin ${linux_bin_symlink_name}.bin - - if [ -n "${INITRAMFS_IMAGE}" ]; then - ln -sf ${its_initramfs_base_name}.its ${its_initramfs_symlink_name}.its - ln -sf ${fit_initramfs_base_name}.bin ${fit_initramfs_symlink_name}.bin + echo "Copying fitImage-${INITRAMFS_IMAGE} file..." + install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.bin + ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_BASE_NAME}.bin ${DEPLOYDIR}/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_SYMLINK_NAME} fi fi } -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] bitbake.conf, kernel-artifact-names.bbclass: introduce IMAGE_VERSION_SUFFIX instead of using DATETIME directly
* this makes it easier to use different version string than DATETIME, e.g. set from jenkins job while keeping the suffix consistent across all artifacts stored in DEPLOYDIR Signed-off-by: Martin Jansa --- meta/classes/kernel-artifact-names.bbclass | 13 - meta/conf/bitbake.conf | 5 +++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass index d696888322..70b1cb804d 100644 --- a/meta/classes/kernel-artifact-names.bbclass +++ b/meta/classes/kernel-artifact-names.bbclass @@ -1,19 +1,14 @@ -KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -# Don't include the DATETIME variable in the sstate package signatures -KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" -KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -KERNEL_DTB_BASE_NAME[vardepsexclude] = "DATETIME" +KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" -MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" MODULE_TARBALL_DEPLOY ?= "1" -INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" +INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f68954c511..1941633a54 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -445,8 +445,9 @@ STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifac IMAGE_ROOTFS = "${WORKDIR}/rootfs" IMAGE_BASENAME = "${PN}" -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" -IMAGE_NAME[vardepsexclude] += "DATETIME" +IMAGE_VERSION_SUFFIX = "-${DATETIME}" +IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME" +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}" IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" # This option allows for a percentage overage of the actual image size rather than a -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for "libxml2: fix CVE-2018-9251 and..." and 1 more
On Fri, 2018-08-17 at 15:37 +0800, Hongxu Jia wrote: > On 2018年08月17日 15:32, Patchwork wrote: > > == Series Details == > > > > Series: "libxml2: fix CVE-2018-9251 and..." and 1 more > > Revision: 1 > > URL : https://patchwork.openembedded.org/series/13574/ > > State : failure > > > > == Summary == > > > > > > Thank you for submitting this patch series to OpenEmbedded Core. > > This is > > an automated response. Several tests have been executed on the > > proposed > > series by patchtest resulting in the following failures: > > > > > > > > * Issue Upstream-Status is in incorrect format > > [test_upstream_status_presence_format] > >Suggested fixFix Upstream-Status format in 0001-Verify-that- > > we-are-not-reading-past-end-of-a-buffer.patch > >Current Upstream-Status: Cherry pick from upstream > > bugzilla [https://bugzilla.nasm.us/show_bug.cgi?id=3392447] > >Standard format Upstream-Status: > >Valid status Pending, Accepted, Backport, Denied, > > Inappropriate [reason], Submitted [where] > > I am not sure which one to choose, the patch is not from > upstream, but its bugzilla, so `Backport' is not accurate That would be Submitted since upstream are aware of the patch. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] kernel-artifact-names.bbclass, kernel.bbclass: remove prefix and extension from MODULE_TARBALL_* variables
* for consistency with other artifacts variables, include only the version string, not the actual name or extension * changing .tgz to something else in the MODULE_TARBALL_NAME variable only wouldn't make much sense because then kernel.bbclass still calls "tar -cvzf" to create it Signed-off-by: Martin Jansa --- meta/classes/kernel-artifact-names.bbclass | 6 ++ meta/classes/kernel.bbclass| 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass index 56352d73b3..d21450c914 100644 --- a/meta/classes/kernel-artifact-names.bbclass +++ b/meta/classes/kernel-artifact-names.bbclass @@ -7,10 +7,8 @@ KERNEL_DTB_LINK_NAME ?= "${MACHINE}" KERNEL_FIT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" KERNEL_FIT_LINK_NAME ?= "${MACHINE}" -MODULE_IMAGE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" - -MODULE_TARBALL_NAME ?= "${MODULE_IMAGE_NAME}.tgz" -MODULE_TARBALL_LINK_NAME ?= "modules-${MACHINE}.tgz" +MODULE_TARBALL_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +MODULE_TARBALL_LINK_NAME ?= "${MACHINE}" MODULE_TARBALL_DEPLOY ?= "1" INITRAMFS_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index e47c063f5a..3c8aa5911f 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -672,8 +672,8 @@ kernel_do_deploy() { done if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then mkdir -p ${D}/lib - tar -cvzf $deployDir/${MODULE_TARBALL_NAME} -C ${D} lib - ln -sf ${MODULE_TARBALL_NAME} $deployDir/${MODULE_TARBALL_LINK_NAME} + tar -cvzf $deployDir/modules-${MODULE_TARBALL_NAME}.tgz -C ${D} lib + ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz fi for type in ${KERNEL_IMAGETYPES} ; do -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] deployed artifacts naming improvements
This is just the preparation for last bigger change to have consistent naming across all deployed artifacts. These 6 preparation commits shouldn't change any names yet, verified with core-image-base for qemux86 and raspberrypi3. Using more variables allows to simplify appending some release information to the images, corresponding kernels and other artifacts as shown in: https://github.com/webOS-ports/meta-webos-ports/commit/6fd0af4dbd3da396d41e330f9dd932e859c5f7f0 The recipes and classes which generate or use new artifacts might need to inherit kernel-artifact-names and update the variables as shown in example here: https://github.com/shr-distribution/meta-smartphone/commit/5e70b3779e0d6c90fbfbafeca2c9e4c4943d1196 The final change which allows to re-use do_deploy from sstate, while still producing the consistent naming scheme (e.g. image as well as kernel will have the same DATETIME stamp or for release the same build number even when the kernel.do_deploy was used for multiple builds will look like this: http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&id=91e5b30f10f24210c31d3f5ec137de22f89967d7 The following changes since commit 176e50fb177dc40e439700d5f3f838dd7eaaa427: runtime selftest: limit kernel hw bp arches (2018-08-16 22:40:06 +0100) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/kernel http://cgit.openembedded.org/openembedded-core-contrib/log/?h=jansa/kernel Martin Jansa (6): bitbake.conf, kernel-artifact-names.bbclass: introduce IMAGE_VERSION_SUFFIX instead of using DATETIME directly kernel-artifact-names, kernel-fitimage: add KERNEL_FIT_BASE_NAME, KERNEL_FIT_SYMLINK_NAME variables kernel*.bbclass: rename *_SYMLINK_NAME variables to *_LINK_NAME and *_BASE_NAME to *_NAME kernel-artifact-names.bbclass, kernel.bbclass: remove prefix and extension from MODULE_TARBALL_* variables kernel-artifact-names.bbclass: Add 2 more variables to make it easier to change all names with one variable kernel.bbclass: rename type variable to imageType meta/classes/kernel-artifact-names.bbclass | 27 +- meta/classes/kernel-devicetree.bbclass | 22 meta/classes/kernel-fitimage.bbclass | 34 +--- meta/classes/kernel.bbclass| 62 +++--- meta/conf/bitbake.conf | 5 +- 5 files changed, 70 insertions(+), 80 deletions(-) -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] kernel*.bbclass: rename *_SYMLINK_NAME variables to *_LINK_NAME and *_BASE_NAME to *_NAME
* for consistency with IMAGE_NAME and IMAGE_LINK_NAME and to avoid confusion with IMAGE_BASENAME (which is the actual name of the artifact, e.g. PN while KERNEL_IMAGE_BASE_NAME was only the version suffix) Signed-off-by: Martin Jansa --- meta/classes/kernel-artifact-names.bbclass | 22 +++--- meta/classes/kernel-devicetree.bbclass | 22 +++--- meta/classes/kernel-fitimage.bbclass | 16 meta/classes/kernel.bbclass| 14 +++--- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass index d235bc1096..56352d73b3 100644 --- a/meta/classes/kernel-artifact-names.bbclass +++ b/meta/classes/kernel-artifact-names.bbclass @@ -1,17 +1,17 @@ -KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" +KERNEL_IMAGE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +KERNEL_IMAGE_LINK_NAME ?= "${MACHINE}" -KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" +KERNEL_DTB_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +KERNEL_DTB_LINK_NAME ?= "${MACHINE}" -KERNEL_FIT_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -KERNEL_FIT_SYMLINK_NAME ?= "${MACHINE}" +KERNEL_FIT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +KERNEL_FIT_LINK_NAME ?= "${MACHINE}" -MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +MODULE_IMAGE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" -MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" +MODULE_TARBALL_NAME ?= "${MODULE_IMAGE_NAME}.tgz" +MODULE_TARBALL_LINK_NAME ?= "modules-${MACHINE}.tgz" MODULE_TARBALL_DEPLOY ?= "1" -INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" +INITRAMFS_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +INITRAMFS_LINK_NAME ?= "initramfs-${MACHINE}" diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index 9c5e125981..867b776aa7 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass @@ -72,22 +72,22 @@ do_deploy_append() { dtb_ext=${dtb##*.} dtb_base_name=`basename $dtb .$dtb_ext` install -d ${DEPLOYDIR} - install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext - ln -sf $dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name.$dtb_ext - ln -sf $dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_SYMLINK_NAME}.$dtb_ext + install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext + ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name.$dtb_ext + ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then cat ${D}/${KERNEL_IMAGEDEST}/$type \ - ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext \ - > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext.bin - ln -sf $type-$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext.bin \ - ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_SYMLINK_NAME}.$dtb_ext.bin + ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ + > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin + ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ + ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \ - ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext - > ${DEPLOYDIR}/${type}-${INITRAMFS_BASE_NAME}-$dtb_base_name-${KERNEL_DTB_BASE_NAME}.$dtb_ext.bin -
[OE-core] [PATCH 5/6] kernel-artifact-names.bbclass: Add 2 more variables to make it easier to change all names with one variable
* some people don't like the ${MACHINE} in the symlink, because now the DEPLOYDIR already contains ${MACHINE} subdirectory, add KERNEL_ARTIFACT_LINK_NAME variable to change it in one place without the need to list all variables for various artifacts Signed-off-by: Martin Jansa --- meta/classes/kernel-artifact-names.bbclass | 23 -- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass index d21450c914..bbeecba7bd 100644 --- a/meta/classes/kernel-artifact-names.bbclass +++ b/meta/classes/kernel-artifact-names.bbclass @@ -1,15 +1,18 @@ -KERNEL_IMAGE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -KERNEL_IMAGE_LINK_NAME ?= "${MACHINE}" +KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +KERNEL_ARTIFACT_LINK_NAME ?= "${MACHINE}" -KERNEL_DTB_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -KERNEL_DTB_LINK_NAME ?= "${MACHINE}" +KERNEL_IMAGE_NAME ?= "${KERNEL_ARTIFACT_NAME}" +KERNEL_IMAGE_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}" -KERNEL_FIT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -KERNEL_FIT_LINK_NAME ?= "${MACHINE}" +KERNEL_DTB_NAME ?= "${KERNEL_ARTIFACT_NAME}" +KERNEL_DTB_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}" -MODULE_TARBALL_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -MODULE_TARBALL_LINK_NAME ?= "${MACHINE}" +KERNEL_FIT_NAME ?= "${KERNEL_ARTIFACT_NAME}" +KERNEL_FIT_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}" + +MODULE_TARBALL_NAME ?= "${KERNEL_ARTIFACT_NAME}" +MODULE_TARBALL_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}" MODULE_TARBALL_DEPLOY ?= "1" -INITRAMFS_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" -INITRAMFS_LINK_NAME ?= "initramfs-${MACHINE}" +INITRAMFS_NAME ?= "initramfs-${KERNEL_ARTIFACT_NAME}" +INITRAMFS_LINK_NAME ?= "initramfs-${KERNEL_ARTIFACT_LINK_NAME}" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH 1/3] testimage: Refactoring and fixing.
On Sat, 2018-08-18 at 18:40 +0200, Paulo Neves wrote: > Ping. > > Does anybody have any comments? Also I noticed that my commit once > was in the master-next but it was removed. Without it being in master > I cannot submit my changes to poky mailing list with the fixes for > the remaining targets. I tried adding it to master-next, it broke things, I did reply about it, I dropped it from -next due to the problems. My reply is here: http://lists.openembedded.org/pipermail/openembedded-core/2018-August/154037.html Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] mesa: Enable gallium-llvm on x86 and x86_64
Signed-off-by: Khem Raj --- meta/recipes-graphics/cairo/cairo.inc | 3 ++- meta/recipes-graphics/mesa/mesa.inc | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 20e0d2c92a..7347f223ff 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -22,7 +22,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}" + ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}" PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 6aedeee9dc..2671d4de4d 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -47,6 +47,9 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " +PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600" +PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600" + # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/9] mesa: Define YOCTO_ALTERNATE_MULTILIB_NAME to consider multilib names
Signed-off-by: Khem Raj --- meta/recipes-graphics/mesa/mesa.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 2671d4de4d..dd626d9f00 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -34,6 +34,7 @@ PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}" export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" +export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" EXTRA_OECONF = "--enable-shared-glapi \ --disable-opencl \ --enable-glx-read-only-text \ -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] gdb: Upgrade to 8.1.1
Signed-off-by: Khem Raj --- meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} | 4 ++-- ...{gdb-cross-canadian_8.1.bb => gdb-cross-canadian_8.1.1.bb} | 0 .../gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} | 0 meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb}| 0 4 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} (89%) rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.1.bb => gdb-cross-canadian_8.1.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb} (100%) diff --git a/meta/recipes-devtools/gdb/gdb-8.1.inc b/meta/recipes-devtools/gdb/gdb-8.1.1.inc similarity index 89% rename from meta/recipes-devtools/gdb/gdb-8.1.inc rename to meta/recipes-devtools/gdb/gdb-8.1.1.inc index 4d9faa2d4b..ad80dd3e4d 100644 --- a/meta/recipes-devtools/gdb/gdb-8.1.inc +++ b/meta/recipes-devtools/gdb/gdb-8.1.1.inc @@ -18,6 +18,6 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \ file://package_devel_gdb_patches_120-sigprocmask-invalid-call.patch \ file://gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch \ " -SRC_URI[md5sum] = "f46487561f9a16916a8102316f7fd105" -SRC_URI[sha256sum] = "af61a0263858e69c5dce51eab26662ff3d2ad9aa68da9583e8143b5426be4b34" +SRC_URI[md5sum] = "372fa63a53adeee1bfbfd581d8da9e34" +SRC_URI[sha256sum] = "97dcc3169bd430270fc29adb65145846a58c1b55cdbb73382a4a89307bdad03c" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.1.bb b/meta/recipes-devtools/gdb/gdb-cross_8.1.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_8.1.bb rename to meta/recipes-devtools/gdb/gdb-cross_8.1.1.bb diff --git a/meta/recipes-devtools/gdb/gdb_8.1.bb b/meta/recipes-devtools/gdb/gdb_8.1.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_8.1.bb rename to meta/recipes-devtools/gdb/gdb_8.1.1.bb -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/9] dos2unix.bbclass: Move to oe-core
- Import from meta-oe layer - This is useful for many packages where CR-LF needs to be adjusted, many recipes depend on it e.g. meta-multimedia libebml and so on. Signed-off-by: Khem Raj --- meta/classes/dos2unix.bbclass | 14 ++ 1 file changed, 14 insertions(+) create mode 100644 meta/classes/dos2unix.bbclass diff --git a/meta/classes/dos2unix.bbclass b/meta/classes/dos2unix.bbclass new file mode 100644 index 00..3fc17e2196 --- /dev/null +++ b/meta/classes/dos2unix.bbclass @@ -0,0 +1,14 @@ +# Class for use to convert all CRLF line terminators to LF +# provided that some projects are being developed/maintained +# on Windows so they have different line terminators(CRLF) vs +# on Linux(LF), which can cause annoying patching errors during +# git push/checkout processes. + +do_convert_crlf_to_lf[depends] += "dos2unix-native:do_populate_sysroot" + +# Convert CRLF line terminators to LF +do_convert_crlf_to_lf () { + find ${S} -type f -exec dos2unix {} \; +} + +addtask convert_crlf_to_lf after do_unpack before do_patch -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] llvm: Point llvm-config to one built with llvm-native
If not defined, llvm build system tries to build one which then confuses the OE QA system since its building native tool and target packages in same package build moreover it is not required since we already have it via llvm-native Fixes ERROR: llvm-6.0-r0 do_package_qa: QA Issue: llvm: The compile log indicates that host include and/or library paths were used. Signed-off-by: Khem Raj --- meta/recipes-devtools/llvm/llvm_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index bb83012231..d853d4151d 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -64,17 +64,19 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_ENABLE_FFI=ON \ -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ -DLLVM_OPTIMIZED_TABLEGEN=ON \ - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS}" \ + -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ -G Ninja" EXTRA_OECMAKE_append_class-target = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ + -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ " EXTRA_OECMAKE_append_class-nativesdk = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ + -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ " do_configure_prepend() { -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/9] llvm: Use YOCTO_ALTERNATE_MULTILIB_NAME environment variable in llvm-config
llvm-config is a tool on similar veins as pkg-config but provides a lot more information and packages which use llvm e.g. mesa use this tool to poke for llvm related informaiton e.g. version, libpath, includepaths to name a few, this has few challanges in cross build environments where llvm-config is supposed to be build for buildhost but provide information about target llvm which is addressed by building native llvm-config along with target llvm build, but this is frowned upon by OE build system since it detects that host paths are being used so we have to build it as part of llvm-native but then it means install paths for llvm and llvm-native are different and wrong paths get reported when llvm-config is used. This is solved by providing YOCTO_ALTERNATE_EXE_PATH variable to let llvm-config use that path instead of self-relative path to report back Second problem is when building multi-lib packages base_libdir is different for target packages but native llvm-config does not know about it so it reports non-multilibbed paths as libdir and packages can not find llvm in sysroot. This is fixed by adding another environment variable YOCTO_ALTERNATE_MULTILIB_NAME which can be set from recipes to set proper multilib path Signed-off-by: Khem Raj --- ...-llvm-allow-env-override-of-exe-path.patch | 47 --- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch index 21d2f81b58..6a9283323c 100644 --- a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch +++ b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch @@ -1,4 +1,4 @@ -From 2f8ea767afdaa440c6368040630e1b3ea6a0977a Mon Sep 17 00:00:00 2001 +From aeccf16eaccdd80e4d5ecaa51673ce4b2bac1130 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 19 May 2017 00:22:57 -0700 Subject: [PATCH 2/2] llvm: allow env override of exe path @@ -8,16 +8,19 @@ return the libraries, include directories, etc. from inside the sysroot rather than from the native sysroot. Thus provide an env override for calling llvm-config from a target sysroot. +To let it work in multilib environment, we need to provide a knob to supply +multilib dirname as well + +Upstream-Status: Inappropriate [OE-Specific] + Signed-off-by: Martin Kelly Signed-off-by: Khem Raj --- -Upstream-Status: Pending - - tools/llvm-config/llvm-config.cpp | 7 +++ - 1 file changed, 7 insertions(+) + tools/llvm-config/llvm-config.cpp | 17 - + 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 08b096afb05..d8d7742744e 100644 +index 08b096afb05..360cc5abf4e 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp @@ -225,6 +225,13 @@ Typical components:\n\ @@ -34,6 +37,36 @@ index 08b096afb05..d8d7742744e 100644 // This just needs to be some symbol in the binary; C++ doesn't // allow taking the address of ::main however. void *P = (void *)(intptr_t)GetExecutablePath; +@@ -306,12 +313,20 @@ int main(int argc, char **argv) { + std::string ActivePrefix, ActiveBinDir, ActiveIncludeDir, ActiveLibDir, + ActiveCMakeDir; + std::string ActiveIncludeOption; ++ // Hack for Yocto: we need to override the multilib path when we are using ++ // llvm-config from within a target sysroot. ++ std::string Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME"); ++ if (Multilibdir.empty()) { ++Multilibdir = "/lib" LLVM_LIBDIR_SUFFIX; ++ } ++ + if (IsInDevelopmentTree) { + ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include"; + ActivePrefix = CurrentExecPrefix; + + // CMake organizes the products differently than a normal prefix style + // layout. ++ + switch (DevelopmentTreeLayout) { + case CMakeStyle: + ActiveBinDir = ActiveObjRoot + "/bin"; +@@ -336,7 +351,7 @@ int main(int argc, char **argv) { + SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); + sys::fs::make_absolute(ActivePrefix, path); + ActiveBinDir = path.str(); +-ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ActiveLibDir = ActivePrefix + Multilibdir; + ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } -- -2.16.1 +2.18.0 -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] powerpc: Remove pie flags from compiler cmdline
Original approach to add -no- flags cause link time behavior changes where packages start to lose the -fPIC -DPIC in compiler cmdline and this list keeps growing as we build more and more packages, Instead lets just remove the options we dont need from SECURITY_CFLAGS this makes it more robust and less intrusive This also means we do not need to re-add pic options as we started to do for affected packages Signed-off-by: Khem Raj --- meta/conf/distro/include/security_flags.inc | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 52e1e4ebc5..4e20a4d0f8 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -28,13 +28,10 @@ SECURITY_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro,-z,now" SECURITY_X_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro" # powerpc does not get on with pie for reasons not looked into as yet -SECURITY_CFLAGS_powerpc = "-fstack-protector-strong ${lcl_maybe_fortify} ${SECURITY_NOPIE_CFLAGS}" -SECURITY_CFLAGS_pn-libgcc_powerpc = "" -SECURITY_CFLAGS_append_powerpc_pn-libdrm = " -fPIC -DPIC" -SECURITY_CFLAGS_append_powerpc_pn-libinput = " -fPIC -DPIC" -SECURITY_CFLAGS_append_powerpc_pn-at-spi2-core = " -fPIC -DPIC" GCCPIE_powerpc = "" GLIBCPIE_powerpc = "" +SECURITY_CFLAGS_remove_powerpc = "${SECURITY_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-libgcc_powerpc = "" SECURITY_CFLAGS_pn-glibc = "" SECURITY_CFLAGS_pn-glibc-initial = "" -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 9/9] libidn2: Fix libunistring detection
libunistring is one such library which many autotooled packages mistake to use from build system if its installed on it. This is specifically toxic when build host arch is same as target arch since we only see the problem during runtime but thankfully OE has build time QA which warns about it. QA Issue: libidn2: The compile log indicates that host include and/or library paths were used. Using --with-libunistring-prefix nudges the autoconf system for the component to first look into target sysroot before going on to search on the build host Signed-off-by: Khem Raj --- meta/recipes-extended/libidn/libidn2_2.0.5.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb b/meta/recipes-extended/libidn/libidn2_2.0.5.bb index 0d7bddbc7f..0daf7a6877 100644 --- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb +++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb @@ -19,6 +19,10 @@ DEPENDS = "virtual/libiconv libunistring" inherit pkgconfig autotools gettext texinfo gtk-doc lib_package +EXTRA_OECONF += "--disable-rpath \ + --with-libunistring-prefix=${STAGING_EXECPREFIXDIR} \ + " + LICENSE_${PN} = "(GPLv2+ | LGPLv3)" LICENSE_${PN}-bin = "GPLv3+" -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/9] binutils: Update past 2.31.1 release
list of changes in this rev bump * a69de9c7cf ld-x86-64/pr23486b.d: Swap pr23486a.s and pr23486a.s * 28a27bdbb9 x86: Properly add X86_ISA_1_NEEDED property * d692290444 x86: Replace evex-no-scale.s with evex-no-scale-[32|64].s * d55c3e3609 x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED * 381c1eb6ec x86: Update assembler tests for non-ELF targets * 9b075c7167 x32: Align the .note.gnu.property section to 4 bytes * 4aa5eb02fd __tls_get_addr_opt stubs and tocsave optimization * 95fbde6791 Re: PowerPC64 __tls_get_addr_opt stub .eh_frame fix * 079a6882b5 PowerPC64 __tls_get_addr_opt stub .eh_frame fix * 1d8f56a971 Updated Bulgarian translation for the ld/ directory * b7991db94c Add --warn-drop-version option; by default, do not warn when discarding version info. * dbf924a63a Fix type checking errors. * 60b3b24ca1 Fix spurious check-ld failures on aarch64-elf * feaed90494 [PATCH, LD, AArch64] Fix ifunc testisms * 2069ccaf8d x86: don't mistakenly scale non-8-bit displacements * 254ade2586 Fix unwind offset for call_info->start_symbol. * 29153520a8 S/390: Set the htm flag on PPA * 6737a6b34f x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed * 01683b308a x86: Split vcvtps2{,u}qq and vcvttps2{,u}qq * be8a252e18 Set the development flag back to true. * 0860693812 (tag: binutils-2_31_1) Regenerate files and add changelog entries for 2.31.1 release * 4afd6a72e3 Fix typo in src-release.sh script. Update French translation for gold and Spanish translation for ld. Signed-off-by: Khem Raj --- meta/recipes-devtools/binutils/binutils-2.31.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils-2.31.inc b/meta/recipes-devtools/binutils/binutils-2.31.inc index 6603873ba2..bc951d73e4 100644 --- a/meta/recipes-devtools/binutils/binutils-2.31.inc +++ b/meta/recipes-devtools/binutils/binutils-2.31.inc @@ -18,7 +18,7 @@ BINUPV = "${@binutils_branch_version(d)}" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV ?= "f8b4d71490df766ca9c474f7ab9c82b3a8029a5a" +SRCREV ?= "4568e49ff799192fea4f66063fe13e2b871ec75a" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \ -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/9] Use llvmpile for mesa on x86/x86-64
This series fixes llvm build to support multilib configurations Adds dos2unix bbclass to core from meta-oe Fixes ppc security flags world builds v2: Upgrade binutils and gdb Fix libidb2 cross build issue when build host == target host The following changes since commit 007ef1f468110b2698a27ea9a6d43fed5a0a9fc2: kernel-devsrc: restructure for out of tree (and on target) module builds (2018-08-19 16:33:41 +0100) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib kraj/master http://cgit.openembedded.org/openembedded-core-contrib/log/?h=kraj/master Khem Raj (9): mesa: Enable gallium-llvm on x86 and x86_64 powerpc: Remove pie flags from compiler cmdline llvm: Point llvm-config to one built with llvm-native dos2unix.bbclass: Move to oe-core llvm: Use YOCTO_ALTERNATE_MULTILIB_NAME environment variable in llvm-config mesa: Define YOCTO_ALTERNATE_MULTILIB_NAME to consider multilib names binutils: Update past 2.31.1 release gdb: Upgrade to 8.1.1 libidn2: Fix libunistring detection meta/classes/dos2unix.bbclass | 14 ++ meta/conf/distro/include/security_flags.inc | 7 +-- .../binutils/binutils-2.31.inc| 2 +- .../gdb/{gdb-8.1.inc => gdb-8.1.1.inc}| 4 +- ...ian_8.1.bb => gdb-cross-canadian_8.1.1.bb} | 0 .../{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} | 0 .../gdb/{gdb_8.1.bb => gdb_8.1.1.bb} | 0 ...-llvm-allow-env-override-of-exe-path.patch | 47 --- meta/recipes-devtools/llvm/llvm_git.bb| 4 +- meta/recipes-extended/libidn/libidn2_2.0.5.bb | 4 ++ meta/recipes-graphics/cairo/cairo.inc | 3 +- meta/recipes-graphics/mesa/mesa.inc | 4 ++ 12 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 meta/classes/dos2unix.bbclass rename meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} (89%) rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.1.bb => gdb-cross-canadian_8.1.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb} (100%) -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Specifying incorrect license in recipe
2018-08-19 13:54 GMT+02:00 Isaac Nickaein : > How such issues is prevented in openembedded (e.g. throughout review > of new recipes)? Basically yes. Note that we regularly find deficiencies in old recipes as well. It's not the end of the world. > Who is responsible in the cases that license is violated? Obviously the one who shipped the product to the consumer, which is not the Yocto Project :-) It's up to the OEMs or their contractors to thoroughly review what goes into images and under which licenses. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v5] kernel-devsrc: restructure for out of tree (and on target) module builds
On Sat, 2018-08-18 at 22:50 -0400, Bruce Ashfield wrote: > [...] > > v5: > - added failure catch for x86 purgatory files which changed in 4.18 > and hence are not universal across versions > - added explicity bison and flex rdepends for mips64 prepare phase > - added mips64 files required for scripts/prepare phase > - added files required for missing syscall support Tests passed so I've merged it, thanks for persevering, we finally got there! :) Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Specifying incorrect license in recipe
I was in middle of writing a recipe for a library which I wasn't sure about its licensing. I wondered what if somebody get the licensing incorrect and submit the recipe to open-embedded upstream. Since Yocto doesn't enforce the presence of license text inside the source code (which would be crippling as not all source codes contains their license), a careless submitter can specify an incorrect license inside the recipe and just set LIC_FILES_CHKSUM to a README file. How such issues is prevented in openembedded (e.g. throughout review of new recipes)? Who is responsible in the cases that license is violated? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core