Re: [OE-core] [PATCH] sstate.bbclass: fix issue while handling long sstate filenames
On 06/02/2020 01.57, Jaewon Lee wrote: When moving to python3, divison using '/' now returns float instead of an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 sstate filenames longer than the limit are changed to just include necessary info + 3 fields just for information. The space left over after the necessary info is divided into 3 for each of the fields. Casting the outcome of that division to int to solve the following error message: avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 >components[2] = components[2][:avail] components[3] = components[3][:avail] TypeError: slice indices must be integers or None or have an __index__ method Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index faa6470..53a6d06 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): components = spec.split(":") # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information # 7 is for the separators -avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 +avail = int((254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3) Python has a nifty // operator that resembles integer division from C: >>> 3 / 2 1.5 >>> 3 // 2 1 // Martin components[2] = components[2][:avail] components[3] = components[3][:avail] components[4] = components[4][:avail] -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gstreamer1.0-plugins-good: change EXTRA_OECONF -> EXTRA_OEMESON
Use the correct variable so options actually get used. qt5 support is currently automagically detected with meson and having an explicit disabled doesn't do anything. Remove it so it can be handled in qt layer with appropriate DEPENDS added. Signed-off-by: Anuj Mittal --- .../gstreamer/gstreamer1.0-plugins-good_1.16.1.bb | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb index a6eb9986dd..e78162172a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb @@ -50,12 +50,12 @@ PACKAGECONFIG[vpx]= "-Dvpx=enabled,-Dvpx=disabled,libvpx" PACKAGECONFIG[wavpack]= "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" PACKAGECONFIG[x11]= "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" -# qt5 support is disabled, because it is not present in OE core, and requires more work than -# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). +# qt5 support is disabled by default unless dependencies are present. Enabling it requires +# more work than just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). # This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig # in a gstreamer1.0-plugins-good bbappend). -EXTRA_OECONF += " \ +EXTRA_OEMESON += " \ -Daalib=disabled \ -Ddirectsound=disabled \ -Ddv=disabled \ @@ -64,7 +64,6 @@ EXTRA_OECONF += " \ -Doss4=disabled \ -Dosxaudio=disabled \ -Dosxvideo=disabled \ --Dqt=disabled \ -Dshout2=disabled \ -Dtwolame=disabled \ -Dwaveform=disabled \ -- 2.24.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dhcp: upgrade 4.4.1 -> 4.4.2
0001-Fix-a-NSUPDATE-compiling-issue.patch 0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch Removed since they are included in 4.4.2. refresh the following patch: 0004-Fix-out-of-tree-builds.patch Signed-off-by: Wang Mingyu --- .../0001-Fix-a-NSUPDATE-compiling-issue.patch | 68 ...ludes-of-new-BIND9-compatibility-hea.patch | 79 --- .../dhcp/0004-Fix-out-of-tree-builds.patch| 6 +- .../dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} | 6 +- 4 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch rename meta/recipes-connectivity/dhcp/{dhcp_4.4.1.bb => dhcp_4.4.2.bb} (74%) diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch deleted file mode 100644 index f12a112fcf..00 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001 -From: Ming Liu -Date: Tue, 14 May 2019 11:07:15 +0200 -Subject: [PATCH] Fix a NSUPDATE compiling issue - -Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16] - -A following error was observed when NSUPDATE is not defined: -| omapip/isclib.c: In function 'dns_client_init': -| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -| if (dhcp_gbl_ctx.dnsclient == NULL) { -| ^ -| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient' -|_gbl_ctx.dnsclient, -| ^ -| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4' -|(dhcp_gbl_ctx.use_local4 ? -| ^ -| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr' -| _gbl_ctx.local4_sockaddr -| ^ -| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6' -|(dhcp_gbl_ctx.use_local6 ? -| ^ -| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr' -| _gbl_ctx.local6_sockaddr - -Fix it by adding NSUPDATE conditional checking. - -Signed-off-by: Ming Liu - includes/omapip/isclib.h | 2 ++ - omapip/isclib.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 538b927..6c20584 100644 a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -141,6 +141,8 @@ void isclib_cleanup(void); - void dhcp_signal_handler(int signal); - extern int shutdown_signal; - -+#if defined (NSUPDATE) - isc_result_t dns_client_init(); -+#endif - - #endif /* ISCLIB_H */ -diff --git a/omapip/isclib.c b/omapip/isclib.c -index db3b895..ce4b4a1 100644 a/omapip/isclib.c -+++ b/omapip/isclib.c -@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) { - } - } - -+#if defined (NSUPDATE) - isc_result_t dns_client_init() { - isc_result_t result; - if (dhcp_gbl_ctx.dnsclient == NULL) { -@@ -387,3 +388,4 @@ isc_result_t dns_client_init() { - - return ISC_R_SUCCESS; - } -+#endif --- -2.7.4 - diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch deleted file mode 100644 index 1bc1422475..00 --- a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 14 Sep 2018 13:41:41 -0400 -Subject: [master] Added includes of new BIND9 compatibility headers - -Merges in rt48072. - -Upstream-Status: Backport -Signed-off-by: Adrian Bunk - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644
[OE-core] [PATCH] lighttpd: upgrade 1.4.54 -> 1.4.55
Signed-off-by: Wang Mingyu --- .../lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/lighttpd/{lighttpd_1.4.54.bb => lighttpd_1.4.55.bb} (96%) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb similarity index 96% rename from meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb rename to meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb index 20ce698729..7a255ce2f2 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.54.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb @@ -19,8 +19,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "7abc776243c811e9872f73ab38b7f8b5" -SRC_URI[sha256sum] = "cf14cce2254a96d8fcb6d3181e1a3c29a8f832531c3e86ff6f2524ecda9a8721" +SRC_URI[md5sum] = "be4bda2c28bcbdac6eb941528f6edf03" +SRC_URI[sha256sum] = "6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Support UBI u-boot
Hi, Sorry for cross-posting, I have been asking for helping solving the issue many days ago, but could not get those work. (1) UBI support I added NAND and UBIFS support to my Yocto layer machine config file: UBOOT_CONFIG = "nand" UBOOT_CONFIG[nand] += "mx6ull_14x14_evk_config" UBOOT_CONFIG[nand] += "mx6ull_14x14_evk_nand_config" UBOOT_CONFIG[nand] += "ubi" UBOOT_CONFIG[nand] += "ubifs" But my u-boot.imx-nand still could not support ubi: => ubi part rootfs Unknown command 'ubi' - try 'help' What I could be missing here? (2) Patch u-boot parameters I am not clear how you do to change u-boot parameters, it seems to me I have to create my own u-boot-imx_2017.03.bbappend and patch files to mx6ullevk.h, to change u-boot parameters of mtdparts, NAND_ROOT_UBI, bootcmd, etc based on my configuration. But Yocto won't allow the patch running unless that the patch is committed to the git repository in https://source.codeaurora.org/external/imx/uboot-imx.git. Ideally, I thought all u-boot parameters can be changed in a bbappend file, could you advise if it is possible to do that way or not? If so, how to do it? If not, what is the policy for making parches and commit to the git repository https://source.codeaurora.org/external/imx/uboot-imx.git? Thank you. Kind regards, - jh -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-9.2: fix bug #91102 'aarch64 ICE on Linux kernel with -Os'
On Wed, 2020-02-05 at 01:25 +, Taras Kondratiuk (takondra) via Openembedded-core wrote: > The patch applies to zeus branch as is without conflicts. > Should still resend it separately for Zeus? I have picked this up along with some other patches for zeus-next. Thanks, Anuj -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sstate.bbclass: fix issue while handling long sstate filenames
When moving to python3, divison using '/' now returns float instead of an integer. In upstream commit b8025e972081b70960ffcbcbe43a7118041556a1 sstate filenames longer than the limit are changed to just include necessary info + 3 fields just for information. The space left over after the necessary info is divided into 3 for each of the fields. Casting the outcome of that division to int to solve the following error message: avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 >components[2] = components[2][:avail] components[3] = components[3][:avail] TypeError: slice indices must be integers or None or have an __index__ method Signed-off-by: Jaewon Lee Signed-off-by: Mark Hatle --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index faa6470..53a6d06 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -20,7 +20,7 @@ def generate_sstatefn(spec, hash, taskname, siginfo, d): components = spec.split(":") # Fields 0,5,6 are mandatory, 1 is most useful, 2,3,4 are just for information # 7 is for the separators -avail = (254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3 +avail = int((254 - len(hash + "_" + taskname + extension) - len(components[0]) - len(components[1]) - len(components[5]) - len(components[6]) - 7) / 3) components[2] = components[2][:avail] components[3] = components[3][:avail] components[4] = components[4][:avail] -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [zeus][PATCH] Revert "bzip2: Fix CVE-2019-12900"
This reverts commit 175e6cb75ce328d51a9d4ad18c7e09d9fb92c2e1. This change is already in bzip2 1.0.7. The change fixing a regression caused by this change is in 1.0.8 which is the current version in zeus. This isn't resulting in failures because the patch file isn't included in SRC_URI. Signed-off-by: Anuj Mittal --- .../bzip2/bzip2-1.0.6/CVE-2019-12900.patch| 36 --- 1 file changed, 36 deletions(-) delete mode 100644 meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch deleted file mode 100644 index 9859d9d1a2..00 --- a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 28 May 2019 19:35:18 +0200 -Subject: [PATCH] Make sure nSelectors is not out of range - -nSelectors is used in a loop from 0 to nSelectors to access selectorMtf -which is -UCharselectorMtf[BZ_MAX_SELECTORS]; -so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory -access -Fixes out of bounds access discovered while fuzzying karchive - -Link: https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc.patch - -Upstream-Status: Backport -CVE: CVE-2019-12900.patch -Signed-off-by: Saloni Jain - decompress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/decompress.c b/decompress.c -index ab6a624..f3db91d 100644 a/decompress.c -+++ b/decompress.c -@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s ) - GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); -- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { --- -2.22.0 -- 2.24.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Reproducible Builds Issue Status
On 2/5/20 2:02 PM, Richard Purdie wrote: On Wed, 2020-02-05 at 14:27 +, Richard Purdie wrote: Good news is we're down to a set of specific issues and those issues seem "stable". The ones we haven't fixed yet with master-next are: /srv/autobuilder/autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl: (https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb (needs a bug) Ross has a patch for the gtk3 issue (thanks!). /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) I've sent a patch for libidn2. /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb (needs a bug) Still needs a bug, not looked at. Minimal bug report created: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13781 Richard claimed that the rest are in hand there are no other defects to file. ../Randy /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) 13772 is looking to be partially a dash vs bash issue. 13774 is partially a sorting issue from perl-cross, I've something locally I'm experimenting with. There are multiple perl issues intertwined and I suspect several more issues to find. /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb (needs a bug) This one is fixed, patch out for review. Also: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 (didn't show on this set of builds) I looked at and commented on this but don't know how to reproduce. Cheers, Richard -- # Randy MacLeod # Wind River Linux -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for kernel-yocto: consolidated pull request
== Series Details == Series: kernel-yocto: consolidated pull request Revision: 1 URL : https://patchwork.openembedded.org/series/22442/ 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[8/9] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created Issue Commit shortlog is too long [test_shortlog_length] Suggested fixEdit shortlog so that it is 90 characters or less (currently 122 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 7/9] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh
From: Martin Jansa * when ld-is-gold is used, merge_config.sh silently fails and doesn't generate anything useful in .config (and also include directory isn't created): tmp-glibc-bfd-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 164K drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:27 .. -rw-rw-r-- 1 martin martin 133K Feb 5 02:28 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:27 .gitignore drwxr-xr-x 4 martin martin 4.0K Feb 5 02:27 include -rw-rw-r-- 1 martin martin 201 Feb 5 02:27 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:27 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:27 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build: total 28K drwxr-xr-x 3 martin martin 4.0K Feb 5 02:26 . drwxrwxr-x 7 martin martin 4.0K Feb 5 02:26 .. -rw-rw-r-- 1 martin martin 74 Feb 5 02:26 .config -rw-rw-r-- 1 martin martin 39 Feb 5 02:26 .gitignore -rw-rw-r-- 1 martin martin 201 Feb 5 02:26 Makefile drwxrwxr-x 4 martin martin 4.0K Feb 5 02:26 scripts lrwxrwxrwx 1 martin martin 61 Feb 5 02:26 source -> /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source $ cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/.config CONFIG_LOCALVERSION="-yocto-standard" * and because the failure is silent, it will happily start building kernel with default defconfig, which even builds OK for qemux86-64 but on qemux86 I've noticed this issue, because incorrectly configured kernel build fails with: $ tail -n 20 tmp-glibc-gold-qemux86/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_compile LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd-in.o AR /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/libsubcmd.a HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CC scripts/mod/empty.o cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:99: scripts/mod/devicetable-offsets.s] Error 1 make[2]: *** Waiting for unfinished jobs cc1: error: code model 'kernel' not supported in the 32 bit mode cc1: sorry, unimplemented: 64-bit mode not compiled in make[2]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/scripts/Makefile.build:266: scripts/mod/empty.o] Error 1 make[1]: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs LD /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool-in.o /OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/tools/objtool LINK /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/linux-qemux86-standard-build/tools/objtool/objtool make: *** [/OE/build/oe-core/tmp-glibc/work-shared/qemux86/kernel-source/Makefile:179: sub-make] Error 2 WARNING: exit code 1 from a shell command. * the issue happens in log.do_kernel_configme, but the log is completely useless: cat tmp-glibc-gold-qemux86-do_kernel_configme/work/qemux86-oe-linux/linux-yocto/5.4.15-r0/temp/log.do_kernel_configme DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/bison/bison_3.5.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/binutils/binutils-cross_2.33.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.66.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot'] NOTE: Installed into sysroot: ['bison-native', 'bc-native', 'binutils-cross-i686', 'gcc-cross-i686', 'autoconf-native', 'xz-native', 'flex-native', 'gnu-config-native', 'automake-native', 'libtool-native', 'texinfo-dummy-native', 'gettext-minimal-native', 'readline-native', 'zlib-native', 'gmp-native', 'libmpc-native', 'mpfr-native', 'linux-libc-headers', 'm4-native', 'ncurses-native', 'pkgconfig-native'] NOTE: Skipping as already exists in sysroot:
[OE-core] [PATCH 9/9] kernel-yocto: fix defconfig detection in find_sccs()
From: Gavin Li The current code would cause a file like "config.bin" to added to the config sources list. I am sure the intention was to add any files with defconfig in its name and not the other way around. Signed-off-by: Gavin Li Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d961901b74..918d101d3d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -47,7 +47,7 @@ def find_sccs(d): base, ext = os.path.splitext(os.path.basename(s)) if ext and ext in [".scc", ".cfg"]: sources_list.append(s) -elif base and base in 'defconfig': +elif base and 'defconfig' in base: sources_list.append(s) return sources_list -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/9] kernel-yocto: Drop setting of unused variables in do_kernel_metadata
From: Paul Barker The machine_branch and machine_srcrev variables were set but not used in do_kernel_metadata. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 7 --- 1 file changed, 7 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a0362f6acb..9a4d2864eb 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -99,13 +99,6 @@ do_kernel_metadata() { fi fi - machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" - machine_srcrev="${SRCREV_machine}" - if [ -z "${machine_srcrev}" ]; then - # fallback to SRCREV if a non machine_meta tree is being built - machine_srcrev="${SRCREV}" - fi - # In a similar manner to the kernel itself: # # defconfig: $(obj)/conf -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/9] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set
From: Paul Barker CONFIG_LOCALVERSION may already be set in a defconfig or config fragment and this should not be unconditionally overridden. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9a4d2864eb..e8a9b1f18e 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -359,8 +359,10 @@ do_kernel_configme() { bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi - echo "# Global settings from linux recipe" >> ${B}/.config - echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then + echo "# Global settings from linux recipe" >> ${B}/.config + echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config + fi } addtask kernel_configme before do_configure after do_patch -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created
From: Martin Jansa * for whatever reason, instead of silently continuing to build default kernel config Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f71aa7d0a6..d961901b74 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { - set +e - # translate the kconfig_mode into something that merge_config.sh # understands case ${KCONFIG_MODE} in @@ -354,8 +352,9 @@ do_kernel_configme() { bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" fi - CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1 - if [ $? -ne 0 ]; then + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} + + if [ $? -ne 0 -o ! -f ${B}/.config ]; then bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/9] kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass
From: Paul Barker This allows the kernel-yocto bbclass to be inherited in a recipe without needing to include linux-yocto.inc. The bbclass should stand on its own and linux-yocto.inc does a few things which may not be desired in other kernel recipes (such as modifying KERNEL_FEATURES). The LINUX_VERSION_EXTENSION default is not moved as other kernel recipes may not want this setting in place. Signed-off-by: Paul Barker Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 21 + meta/recipes-kernel/linux/linux-yocto.inc | 21 - 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 141eeafeb9..a0362f6acb 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" +# The distro or local.conf should set this, but if nobody cares... +LINUX_KERNEL_TYPE ??= "standard" + +# KMETA ?= "" +KBRANCH ?= "master" +KMACHINE ?= "${MACHINE}" +SRCREV_FORMAT ?= "meta_machine" + +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" + # returns local (absolute) path names for all valid patches in the # src_uri def find_patches(d,subdir): @@ -475,3 +491,8 @@ python () { if 'do_diffconfig' in d: bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) } + +# extra tasks +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask validate_branches before do_patch after do_kernel_checkout +addtask kernel_configcheck after do_configure before do_compile diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index f191946f2a..91df9c1cd5 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea # and it can be specific to the machine or shared # KMACHINE = "UNDEFINED" -# The distro or local.conf should set this, but if nobody cares... -LINUX_KERNEL_TYPE ??= "standard" - -# KMETA ?= "" -KBRANCH ?= "master" -KMACHINE ?= "${MACHINE}" -SRCREV_FORMAT ?= "meta_machine" - -# LEVELS: -# 0: no reporting -# 1: report options that are specified, but not in the final config -# 2: report options that are not hardware related, but set by a BSP -KCONF_AUDIT_LEVEL ?= "1" -KCONF_BSP_AUDIT_LEVEL ?= "0" -KMETA_AUDIT ?= "yes" - LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions @@ -69,10 +53,5 @@ do_install_append(){ fi } -# extra tasks -addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask validate_branches before do_patch after do_kernel_checkout -addtask kernel_configcheck after do_configure before do_compile - # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] kern-tools-native: use more common S value and oe_runmake
From: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- .../kern-tools/kern-tools-native_git.bb | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 3f9cfe7fe5..f263421234 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" +LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" DEPENDS = "git-native" @@ -11,14 +11,17 @@ PV = "0.2+git${SRCPV}" inherit native SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" -S = "${WORKDIR}" +S = "${WORKDIR}/git" UPSTREAM_CHECK_COMMITS = "1" +do_configure() { + : +} + do_compile() { : } do_install() { - cd ${S}/git - make DESTDIR=${D}${bindir} install + oe_runmake DESTDIR=${D}${bindir} install } -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/9] kernel-yocto: consolidated pull request
From: Bruce Ashfield Hi all, I've kept the v5.4 content changes, as well as the kernel version default changes out of this series and instead focused it on the collection of kernel-yocto and kern-tools tweaks that I've gethered over the past few weeks. I have Martin's gold linker fixes included, as well as the re-org'ing of the linux-yocto tasks that Paul Barker did to make it usable as a single inherit of the bbclass. I also have a defconfig detection fix included that was sent to the list. I was able to confirm that my configuration was the same with this series enabled, and I was able to boot. That being said, I'll keep my eye out for any AB fallout and will continue some more build locally .. but I wanted to get this out today as promised. Cheers, Bruce The following changes since commit 3c6978c8db59f152693f9fae65dbab13ecfcaad4: kernel-yocto.bbclass: export LD in the environment used by kconf_check (2020-02-04 15:56:29 +) are available in the Git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (2): kern-tools: tweak symbol_why to be python safe kern-tools: integrate merge_config fix for gold linker Gavin Li (1): kernel-yocto: fix defconfig detection in find_sccs() Martin Jansa (3): kern-tools-native: use more common S value and oe_runmake kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created Paul Barker (3): kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass kernel-yocto: Drop setting of unused variables in do_kernel_metadata kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set meta/classes/kernel-yocto.bbclass | 43 +-- .../kern-tools/kern-tools-native_git.bb | 13 +++--- meta/recipes-kernel/linux/linux-yocto.inc | 21 - 3 files changed, 37 insertions(+), 40 deletions(-) -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] kern-tools: tweak symbol_why to be python safe
From: Bruce Ashfield Updating the SRCREV to pickup tweaks to symbol_why.py to be python3 safe: - we explicitly call /usr/bin/env python3 - we full specifiy our symbols - do not assume that 'None' can be converted to a string Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index a4c0b6fb8a..57ec1abc6d 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] kern-tools: integrate merge_config fix for gold linker
From: Bruce Ashfield Bumping the SRCREV to pickup the following fix: Author: Martin Jansa Date: Wed Feb 5 03:26:57 2020 +0100 merge_config.sh: pass LD variable from shell environment to make * since 5.4 kernel Kconfig will fail immediately when it detects that LD points to gold linker: scripts/Kconfig.include:39: gold linker 'i686-oe-linux-ld' not supported * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh but we need to pass it also into the make call here Signed-off-by: Martin Jansa Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 57ec1abc6d..3f9cfe7fe5 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 DEPENDS = "git-native" -SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" +SRCREV = "388b67974deb2176c06994a325676cbf23e5fce8" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.19.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe
On Wed, Feb 5, 2020 at 12:43 PM Martin Jansa wrote: > > On Wed, Feb 05, 2020 at 11:16:03AM -0500, Bruce Ashfield wrote: > > On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > > > > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfi...@gmail.com wrote: > > > > From: Bruce Ashfield > > > > > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > > > python3 safe: > > > > > > > > - we explicitly call /usr/bin/env python3 > > > > - we full specifiy our symbols > > > > - do not assume that 'None' can be converted to a string > > > > > > > > Signed-off-by: Bruce Ashfield > > > > --- > > > > > > > > I didn't realized the v5.4 series had gone in, or I would have > > > > send this sooner. This should resolve the errors that are thrown > > > > when symbol_why is run to detect missing symbol dependencies. > > > > > > > > Bruce > > > > > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > > index a4c0b6fb8a..57ec1abc6d 100644 > > > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = > > > > "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > > > > > DEPENDS = "git-native" > > > > > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > > > PR = "r12" > > > > PV = "0.2+git${SRCPV}" > > > > > > This needs a bit more cleanup for python3. > > > > Martin, > > > > I've got builds and tests running on the rest of the patches that have > > come in recently, and I wanted to loop back to this one. > > > > I'm dropping into a devshell and running the symbol_why.py script > > using python3 from the sysroot and I didn't see the same issues (But I > > do have changes for what's in your log). > > > > I'll double check once my build churns through the queued patches > > here, but I thought I'd check with you to see if you are still seeing > > this with the various fixes for the gold linker you've pulled together > > ? I'm guessing that now that it isn't aborting early, the warnings > > aren't triggering and hence it isn't even running (like it was in my > > runs), so you can't say one way or the other, > > > > I'm mainly interested to hear if it was a host python3 or the > > sysroot-native one that was tossing those errors, so I can detangle my > > last changes and test in a similar env. > > I think it was combination of gold triggering the error in Kbuild: > > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker > > 'x86_64-oe-linux-ld > > --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot > > ' not supported > which was then incorrectly handled by kconfiglib.py, the error handling > issue is very likely still there, just no longer triggered for me > after passing KERNEL_LD. > Agreed, there's some conditionals in the processing that with your linker fixes, are being avoided. > I still have your SRCREV bump included in my builds, but it seems to be > unrelated to kconfiglib.py issue shown in my build > http://git.yoctoproject.org/cgit/cgit.cgi/wr-kernel-tools/commit/?id=5358eb293399867db05fd73d04ce908d69a03bed > I'll loop back and do some additional tests and ensure that I'm using a few variants of python3, since I have a test here that triggers symbol resolution even on a good pass. > With all the queued fixes for KERNEL_LD I was able to build whole > image with ld-is-gold > That is good news! > with log.kernel_configme not showing any python exceptions > just couple symbols which then aren't included in > log.kernel_configcheck, so I assume these are expected (whole log at the > end). Yah, that's the noise that I was talking about in the other reply. Due to the way some fragments are stacked there are some unavoidable warnings. The audit heuristics know they aren't critical for a boot and didn't come from a SRC_URI fragment, so it lets things keep running with those warnings. I'm still doing another pass through them to look if I should fix any, but what you are seeing is expected at the moment. > > I was also able to boot it with qemu for testimage tasks > > There are 3 failing tests for core-image-sato-sdk-ptest: > SUMMARY: > core-image-sato-sdk-ptest () - Ran 62 tests in 7387.915s > core-image-sato-sdk-ptest - FAIL - Required tests failed (successes=34, > skipped=24, failures=3, errors=0) > ERROR: core-image-sato-sdk-ptest-1.0-r0 do_testimage: > core-image-sato-sdk-ptest - FAILED - check the task log and the ssh log > > RESULTS - kernelmodule.KernelModuleTest.test_kernel_module: FAILED (2.98s) > RESULTS - rpm.RpmBasicTest.test_rpm_query: FAILED (0.22s) > RESULTS -
[OE-core] [zeus][PATCH] devtool/standard.py: Allow recipe to disable menuconfig logic
From: Tom Hochstein u-boot.inc supports u-boot recipes with or without menuconfig [1]. However, running devtool on a u-boot recipe that does not support menuconfig results in an error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem is the devtool logic assumes that any recipe with a do_menuconfig task will generate a .config in do_configure(). Fix the problem by removing the assumption with a flag that the recipe can control, like this: do_configure() { if [ menuconfig-supported ]; then ... else DEVTOOL_DISABLE_MENUCONFIG=true fi } [1] https://github.com/openembedded/openembedded-core/commit/11278e3b2c75be80645b9841763a97dbb35daadc Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie Signed-off-by: Peter Kjellerstedt --- scripts/lib/devtool/standard.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 60c9a046f9..b43c725cf8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -940,8 +940,10 @@ def modify(args, config, basepath, workspace): '}\n') if rd.getVarFlag('do_menuconfig','task'): f.write('\ndo_configure_append() {\n' -'cp ${B}/.config ${S}/.config.baseline\n' -'ln -sfT ${B}/.config ${S}/.config.new\n' +'if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' +'cp ${B}/.config ${S}/.config.baseline\n' +'ln -sfT ${B}/.config ${S}/.config.new\n' +'fi\n' '}\n') if initial_rev: f.write('\n# initial_rev: %s\n' % initial_rev) -- 2.21.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Reproducible Builds Issue Status
On Wed, 2020-02-05 at 14:27 +, Richard Purdie wrote: > Good news is we're down to a set of specific issues and those issues > seem "stable". The ones we haven't fixed yet with master-next are: > > /srv/autobuilder/autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl: > (https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb > (needs a bug) Ross has a patch for the gtk3 issue (thanks!). > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) I've sent a patch for libidn2. > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb > (needs a bug) Still needs a bug, not looked at. > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) 13772 is looking to be partially a dash vs bash issue. 13774 is partially a sorting issue from perl-cross, I've something locally I'm experimenting with. There are multiple perl issues intertwined and I suspect several more issues to find. > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb > (needs a bug) This one is fixed, patch out for review. > Also: > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 > (didn't show on this set of builds) I looked at and commented on this but don't know how to reproduce. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe
On Wed, Feb 05, 2020 at 11:16:03AM -0500, Bruce Ashfield wrote: > On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfi...@gmail.com wrote: > > > From: Bruce Ashfield > > > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > > python3 safe: > > > > > > - we explicitly call /usr/bin/env python3 > > > - we full specifiy our symbols > > > - do not assume that 'None' can be converted to a string > > > > > > Signed-off-by: Bruce Ashfield > > > --- > > > > > > I didn't realized the v5.4 series had gone in, or I would have > > > send this sooner. This should resolve the errors that are thrown > > > when symbol_why is run to detect missing symbol dependencies. > > > > > > Bruce > > > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > index a4c0b6fb8a..57ec1abc6d 100644 > > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = > > > "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > > > DEPENDS = "git-native" > > > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > > PR = "r12" > > > PV = "0.2+git${SRCPV}" > > > > This needs a bit more cleanup for python3. > > Martin, > > I've got builds and tests running on the rest of the patches that have > come in recently, and I wanted to loop back to this one. > > I'm dropping into a devshell and running the symbol_why.py script > using python3 from the sysroot and I didn't see the same issues (But I > do have changes for what's in your log). > > I'll double check once my build churns through the queued patches > here, but I thought I'd check with you to see if you are still seeing > this with the various fixes for the gold linker you've pulled together > ? I'm guessing that now that it isn't aborting early, the warnings > aren't triggering and hence it isn't even running (like it was in my > runs), so you can't say one way or the other, > > I'm mainly interested to hear if it was a host python3 or the > sysroot-native one that was tossing those errors, so I can detangle my > last changes and test in a similar env. I think it was combination of gold triggering the error in Kbuild: > kconfiglib.KconfigError: scripts/Kconfig.include:39: gold linker > 'x86_64-oe-linux-ld > --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot > ' not supported which was then incorrectly handled by kconfiglib.py, the error handling issue is very likely still there, just no longer triggered for me after passing KERNEL_LD. I still have your SRCREV bump included in my builds, but it seems to be unrelated to kconfiglib.py issue shown in my build http://git.yoctoproject.org/cgit/cgit.cgi/wr-kernel-tools/commit/?id=5358eb293399867db05fd73d04ce908d69a03bed With all the queued fixes for KERNEL_LD I was able to build whole image with ld-is-gold with log.kernel_configme not showing any python exceptions just couple symbols which then aren't included in log.kernel_configcheck, so I assume these are expected (whole log at the end). I was also able to boot it with qemu for testimage tasks There are 3 failing tests for core-image-sato-sdk-ptest: SUMMARY: core-image-sato-sdk-ptest () - Ran 62 tests in 7387.915s core-image-sato-sdk-ptest - FAIL - Required tests failed (successes=34, skipped=24, failures=3, errors=0) ERROR: core-image-sato-sdk-ptest-1.0-r0 do_testimage: core-image-sato-sdk-ptest - FAILED - check the task log and the ssh log RESULTS - kernelmodule.KernelModuleTest.test_kernel_module: FAILED (2.98s) RESULTS - rpm.RpmBasicTest.test_rpm_query: FAILED (0.22s) RESULTS - systemd.SystemdBasicTests.test_systemd_failed: FAILED (0.35s) Only the first one seems to be related to ld-is-gold and 5.4 kernel (as reported in separate e-mail before), rpm test failed probably because I'm using package_ipk not rpm and systemd test failed because of mdmon@md125.service failing. I don't have a good base build to compare with, I usually don't use testimage and all my previous tries failed even more badly :). log.kernel_configme: DEBUG: Executing python function extend_recipe_sysroot NOTE: Direct dependencies are ['/OE/build/oe-core/openembedded-core/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot', '/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross_9.2.bb:do_populate_sysroot', 'virtual:native:/OE/build/oe-core/openembedded-core/meta/recipes-extended/bc/bc_1.07.1.bb:do_populate_sysroot',
[OE-core] [PATCH v2] gtk+3: sort resources for reproducible binaries
From: Ross Burton The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. Signed-off-by: Ross Burton --- .../gtk+/gtk+3/sort-resources.patch | 19 +++ meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 000..7f87372c52d --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb index 18976b54c5c..025d8870e23 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb @@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ + file://sort-resources.patch \ " SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Reproducible Builds Issue Status
On 05/02/2020 14:27, Richard Purdie wrote: /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb I grabbed the library on the theory that this is just a single probem. The issue is that the gresources segment in libgdk.so (files embedded inside the binary) had the same files in a different order, so I just sent a patch to sort the $(wildcard). Hopefully that solves the problem. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gtk+3: sort resources for reproducible binaries
From: Ross Burton The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. Signed-off-by: Ross Burton --- .../gtk+/gtk+3/sort-resources.patch | 19 +++ 1 file changed, 19 insertions(+) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch new file mode 100644 index 000..7f87372c52d --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch @@ -0,0 +1,19 @@ +If the resources file isn't sorted in some way then libgdk.so will differ +depending on the inode order of the resource files. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gdk/Makefile.am b/gdk/Makefile.am +index e25b57ba50..26f2d57c6e 100644 +--- a/gdk/Makefile.am b/gdk/Makefile.am +@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status + # Resources + # + +-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl) ++glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl)) + + gdk.gresource.xml: Makefile.am + $(AM_V_GEN) echo "" > $@; \ -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kern-tools: tweak symbol_why to be python safe
On Mon, Feb 3, 2020 at 5:11 PM Martin Jansa wrote: > > On Mon, Feb 03, 2020 at 04:26:41PM -0500, bruce.ashfi...@gmail.com wrote: > > From: Bruce Ashfield > > > > Updating the SRCREV to pickup tweaks to symbol_why.py to be > > python3 safe: > > > > - we explicitly call /usr/bin/env python3 > > - we full specifiy our symbols > > - do not assume that 'None' can be converted to a string > > > > Signed-off-by: Bruce Ashfield > > --- > > > > I didn't realized the v5.4 series had gone in, or I would have > > send this sooner. This should resolve the errors that are thrown > > when symbol_why is run to detect missing symbol dependencies. > > > > Bruce > > > > meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > index a4c0b6fb8a..57ec1abc6d 100644 > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = > > "file://git/tools/kgit;beginline=5;endline=9;md5=9c30e971d435 > > > > DEPENDS = "git-native" > > > > -SRCREV = "7465c8497893ef8f6503c918aeede969f7e9753b" > > +SRCREV = "5358eb293399867db05fd73d04ce908d69a03bed" > > PR = "r12" > > PV = "0.2+git${SRCPV}" > > This needs a bit more cleanup for python3. Martin, I've got builds and tests running on the rest of the patches that have come in recently, and I wanted to loop back to this one. I'm dropping into a devshell and running the symbol_why.py script using python3 from the sysroot and I didn't see the same issues (But I do have changes for what's in your log). I'll double check once my build churns through the queued patches here, but I thought I'd check with you to see if you are still seeing this with the various fixes for the gold linker you've pulled together ? I'm guessing that now that it isn't aborting early, the warnings aren't triggering and hence it isn't even running (like it was in my runs), so you can't say one way or the other, I'm mainly interested to hear if it was a host python3 or the sysroot-native one that was tossing those errors, so I can detangle my last changes and test in a similar env. Cheers, Bruce > > DEBUG: Executing python function do_kernel_configcheck > Traceback (most recent call last): > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2776, in _expand_macro > res += args[int(new_args[0])] > ValueError: invalid literal for int() with base 10: 'error-if' > > During handling of the above exception, another exception occurred: > > Traceback (most recent call last): > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/symbol_why.py", > line 295, in > conf = kconfiglib.Kconfig( kconf, show_errors, show_errors ) > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 947, in __init__ > self._init(filename, warn, warn_to_stderr, encoding) > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 1085, in _init > self._parse_block(None, self.top_node, self.top_node).next = None > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2982, in _parse_block > prev = self._parse_block(None, parent, prev) > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2907, in _parse_block > while self._next_line(): > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2234, in _next_line > self._tokens = self._tokenize(line) > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2364, in _tokenize > self._parse_assignment(s) > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2604, in _parse_assignment > s, i = self._expand_macro(s, i, ()) > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2780, in _expand_macro > res += self._fn_val(new_args) > File > "/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/linux-yocto/5.4.15-r0/recipe-sysroot-native/usr/bin/kconfiglib.py", > line 2843, in _fn_val > return py_fn(self, *args) > File >
[OE-core] [PATCH] libidn2: Fix reproducibility issue
The previous tweak for reproducibility didn't handle the duplicate whitepace left behind, fix this. [YOCTO #13771] Signed-off-by: Richard Purdie --- meta/recipes-extended/libidn/libidn2_2.3.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/libidn/libidn2_2.3.0.bb b/meta/recipes-extended/libidn/libidn2_2.3.0.bb index 8e7e6c0dbcb..7adf924aebf 100644 --- a/meta/recipes-extended/libidn/libidn2_2.3.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.3.0.bb @@ -22,7 +22,8 @@ EXTRA_OECONF += "--disable-rpath \ " do_install_append() { - sed -i -e 's|-L${STAGING_LIBDIR}||' ${D}${libdir}/pkgconfig/libidn2.pc + # Need to remove any duplicate whitespace too for reproducibility + sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Reproducible Builds Issue Status
Good to hear, I am still settling at the new workplace (there's no build machine yet that I can use, but it's apparently on the way). I'll try to use the auto builders to look into these issues from home, but can't promise quick patches. I think a green a-full looks within reach now! Alex On Wed, 5 Feb 2020 at 15:27, Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > Good news is we're down to a set of specific issues and those issues > seem "stable". The ones we haven't fixed yet with master-next are: > > /srv/autobuilder/ > autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl > : > ( > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/ > ) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb > (needs a bug) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb > (needs a bug) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb > (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb > (unfiled, may be related to above 13772) > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb > > /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb > (needs a bug) > > Also: > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 > (didn't show on this set of builds) > > Cheers, > > Richard > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tar: Fix build determinism, disable rsh
rsh is insecure and obsolete but tar will enable support if the binary is on the host system. Some systems point it at ssh. Lets explictly disable it for now unless someone actually needs/uses this at which point it could become a packageconfig. Signed-off-by: Richard Purdie --- meta/recipes-extended/tar/tar_1.32.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index 18f09b5711c..ebe6cb0dbdd 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb @@ -22,6 +22,8 @@ PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + # Let aclocal use the relative path for the m4 file rather than the # absolute since tar has a lot of m4 files, otherwise there might # be an "Argument list too long" error when it is built in a long/deep -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake
On Wed, Feb 05, 2020 at 09:39:25AM -0500, Bruce Ashfield wrote: > On Wed, Feb 5, 2020 at 8:57 AM Martin Jansa wrote: > > > > OK, the patchdir cleanup won't be needed as you've already applied that > > .patch file in the repo. > > > > But I have forgot to update LIC_FILES_CHKSUM, which shouldn't have the > > "git/" anymore as it's relative to ${S}. > > > > LIC_FILES_CHKSUM = > > "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" > > > > Please adjust in your consolidated pull requests. > > Absolutely, I tweaked and squashed it here. > > But I've definitely taken the cleanups, since there's no valid reason > to make it so hard to patch (even if I grab and merge things). BTW there is still another issue with gold enabled builds in runtime When running "bitbake -k -c testimage core-image-sato-sdk-ptest" to test my artifacts changes I've noticed: Stopped HTTPService on 0.0.0.0:0 Traceback (most recent call last): File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) [Previous line repeated 2 more times] File "/OE/build/oe-core/openembedded-core/meta/lib/oeqa/runtime/cases/kernelmodule.py", line 46, in test_kernel_module self.assertEqual(status, 0, msg='\n'.join([cmd, output])) AssertionError: 2 != 0 : cd /usr/src/kernel && make scripts prepare HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/confdata.o HOSTCC scripts/kconfig/expr.o LEX scripts/kconfig/lexer.lex.c YACCscripts/kconfig/parser.tab.[ch] HOSTCC scripts/kconfig/lexer.lex.o HOSTCC scripts/kconfig/parser.tab.o HOSTCC scripts/kconfig/preprocess.o HOSTCC scripts/kconfig/symbol.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --syncconfig Kconfig scripts/Kconfig.include:39: gold linker 'ld' not supported make[2]: *** [scripts/kconfig/Makefile:73: syncconfig] Error 1 make[1]: *** [Makefile:567: syncconfig] Error 2 make: *** [Makefile:678: include/config/auto.conf.cmd] Error 2 make: *** [include/config/auto.conf.cmd] Deleting file 'include/config/tristate.conf' Looks like kernelmodule.py also needs to be adjusted to pass KERNEL_LD as LD. Regards, > > On Wed, Feb 5, 2020 at 3:54 AM Bruce Ashfield > > wrote: > >> > >> On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: > >> > > >> > Signed-off-by: Martin Jansa > >> > --- > >> > .../kern-tools/kern-tools-native_git.bb | 11 +++ > >> > 1 file changed, 7 insertions(+), 4 deletions(-) > >> > > >> > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > index 8053483355..28080e510f 100644 > >> > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > >> > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" > >> > inherit native > >> > > >> > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" > >> > -S = "${WORKDIR}" > >> > +S = "${WORKDIR}/git" > >> > >> While not common, this was on purpose. This isn't something that is > >> typically patched, it is something I queue and bump for release. > >> > >> So I'm ok with the cleanup, but I'll drop the patch tweaking part when > >> I queue for test, since I'll have the patch already in the repo. > >> > >> Bruce > >> > >> > UPSTREAM_CHECK_COMMITS = "1" > >> > > >> > +do_configure() { > >> > + : > >> > +} > >> > + > >> > do_compile() { > >> > : > >> > } > >> > > >> > do_install() { > >> > - cd ${S}/git > >> > - make DESTDIR=${D}${bindir} install > >> > + oe_runmake DESTDIR=${D}${bindir} install > >> > } > >> > > >> > -SRC_URI += > >> > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" > >> > +SRC_URI += > >> > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" > >> > -- > >> > 2.20.1 > >> > > >> > >> > >> -- > >> - Thou shalt not follow the NULL pointer, for chaos and madness await > >> thee at its end > >> - "Use the force Harry" - Gandalf, Star Trek II > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II signature.asc Description: PGP signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake
On Wed, Feb 5, 2020 at 8:57 AM Martin Jansa wrote: > > OK, the patchdir cleanup won't be needed as you've already applied that > .patch file in the repo. > > But I have forgot to update LIC_FILES_CHKSUM, which shouldn't have the "git/" > anymore as it's relative to ${S}. > > LIC_FILES_CHKSUM = > "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" > > Please adjust in your consolidated pull requests. Absolutely, I tweaked and squashed it here. But I've definitely taken the cleanups, since there's no valid reason to make it so hard to patch (even if I grab and merge things). Cheers, Bruce > > On Wed, Feb 5, 2020 at 3:54 AM Bruce Ashfield > wrote: >> >> On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa wrote: >> > >> > Signed-off-by: Martin Jansa >> > --- >> > .../kern-tools/kern-tools-native_git.bb | 11 +++ >> > 1 file changed, 7 insertions(+), 4 deletions(-) >> > >> > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> > index 8053483355..28080e510f 100644 >> > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb >> > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" >> > inherit native >> > >> > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" >> > -S = "${WORKDIR}" >> > +S = "${WORKDIR}/git" >> >> While not common, this was on purpose. This isn't something that is >> typically patched, it is something I queue and bump for release. >> >> So I'm ok with the cleanup, but I'll drop the patch tweaking part when >> I queue for test, since I'll have the patch already in the repo. >> >> Bruce >> >> > UPSTREAM_CHECK_COMMITS = "1" >> > >> > +do_configure() { >> > + : >> > +} >> > + >> > do_compile() { >> > : >> > } >> > >> > do_install() { >> > - cd ${S}/git >> > - make DESTDIR=${D}${bindir} install >> > + oe_runmake DESTDIR=${D}${bindir} install >> > } >> > >> > -SRC_URI += >> > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" >> > +SRC_URI += >> > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" >> > -- >> > 2.20.1 >> > >> >> >> -- >> - Thou shalt not follow the NULL pointer, for chaos and madness await >> thee at its end >> - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Reproducible Builds Issue Status
Good news is we're down to a set of specific issues and those issues seem "stable". The ones we haven't fixed yet with master-next are: /srv/autobuilder/autobuilder.yoctoproject.org/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl: (https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200205-rtw2qpgl/) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb (needs a bug) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13771) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/ncurses-doc_6.1+20191019-r0_amd64.deb (needs a bug) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/openssl-ptest_1.1.1d-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13770) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dbg_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13773) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-dev_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-config-heavy_5.30.1-r0_amd64.deb (https://bugzilla.yoctoproject.org/show_bug.cgi?id=13774) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-module-data-dumper_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl-ptest_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/perl_5.30.1-r0_amd64.deb (unfiled, may be related to above 13772) /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar-dbg_1.32-r0_amd64.deb /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-25815/reproducibleB/tmp/deploy/deb/./core2-64/tar_1.32-r0_amd64.deb (needs a bug) Also: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13776 (didn't show on this set of builds) Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/4] kern-tools-native: use more common S value and oe_runmake
OK, the patchdir cleanup won't be needed as you've already applied that .patch file in the repo. But I have forgot to update LIC_FILES_CHKSUM, which shouldn't have the "git/" anymore as it's relative to ${S}. LIC_FILES_CHKSUM = "file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249624278c3e343e501" Please adjust in your consolidated pull requests. On Wed, Feb 5, 2020 at 3:54 AM Bruce Ashfield wrote: > On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa > wrote: > > > > Signed-off-by: Martin Jansa > > --- > > .../kern-tools/kern-tools-native_git.bb | 11 +++ > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > index 8053483355..28080e510f 100644 > > --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb > > @@ -11,16 +11,19 @@ PV = "0.2+git${SRCPV}" > > inherit native > > > > SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git" > > -S = "${WORKDIR}" > > +S = "${WORKDIR}/git" > > While not common, this was on purpose. This isn't something that is > typically patched, it is something I queue and bump for release. > > So I'm ok with the cleanup, but I'll drop the patch tweaking part when > I queue for test, since I'll have the patch already in the repo. > > Bruce > > > UPSTREAM_CHECK_COMMITS = "1" > > > > +do_configure() { > > + : > > +} > > + > > do_compile() { > > : > > } > > > > do_install() { > > - cd ${S}/git > > - make DESTDIR=${D}${bindir} install > > + oe_runmake DESTDIR=${D}${bindir} install > > } > > > > -SRC_URI += > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git" > > +SRC_URI += > "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch" > > -- > > 2.20.1 > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/6] oeqa/reproducible: Improve test output and ensure deb+ipk compared
On Wed, Feb 5, 2020, 6:12 AM Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > Adding newline characters between the packages in the failure output > massively improves readability. > > Also ensure to output ipk failures when there are deb failures by > calling self.fail() at the end, else sometimes only partial differences > are returned. > > Signed-off-by: Richard Purdie > --- > meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py > b/meta/lib/oeqa/selftest/cases/reproducible.py > index 04dc46f38a0..f6433c9a02b 100644 > --- a/meta/lib/oeqa/selftest/cases/reproducible.py > +++ b/meta/lib/oeqa/selftest/cases/reproducible.py > @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): > # NOTE: The temp directories from the reproducible build are > purposely > # kept after the build so it can be diffed for debugging. > > +fails = [] > + > for c in self.package_classes: > with self.subTest(package_class=c): > It too bad subtests are broken. If we can't handle failed subtests, we can remove this line that creates the subtest in the first place. package_class = 'package_' + c > @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): > self.copy_file(d.test, '/'.join([save_dir, > d.test])) > > if result.missing or result.different: > -self.fail("The following %s packages are missing or > different: %s" % > -(c, ' '.join(r.test for r in (result.missing > + result.different > +fails.append("The following %s packages are missing > or different: %s" % > +(c, '\n'.join(r.test for r in (result.missing > + result.different > + > +if fails: > +self.fail('\n'.join(fails)) > > # Clean up empty directories > if self.save_results: > -- > 2.20.1 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 0/5] Microblaze tune updates
On Wed, 5 Feb 2020 at 07:06, Mark Hatle wrote: > > Version 4 of the patch set. > > I've collected all of the patches resently sent, and reworked them per > the comments on the mailing list. > > The patches are directly available at: > > git://git.openembedded.org/openembedded-core-contrib mgh/xilinx-microblaze > > The work was broken up into a few more individual pieces. This will allow > backports to Zeus for fixes vs new features. > > Mark Hatle (5): > microblaze tune: change microblazeeb to microblaze > microblaze tune: Allow no version to be set > microblaze tune: Enable 64-bit > microblaze tune: cleanup += > Microblaze: Adjust Linux items from microblazeeb to microblaze Looks good. I gave it a quick test, qemu big endian builds and boots core-image-minimal now. Thanks, Nathan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] mc: Fix manpage date indeterminism
The man page date can vary depending upon the host perl, e.g. in Russian some versions print 'июня', others 'Июнь' or Polish 'czerwca' or 'czerwiec'. Rather than depend upon perl-native to fix this, just remove the date from the manpages. Signed-off-by: Richard Purdie --- .../recipes-extended/mc/files/nomandate.patch | 21 +++ meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-extended/mc/files/nomandate.patch diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch new file mode 100644 index 000..48bd73b1102 --- /dev/null +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -0,0 +1,21 @@ +The man page date can vary depending upon the host perl, e.g. in Russian +some versions print 'июня', others 'Июнь' or Polish 'czerwca' or 'czerwiec'. +Rather than depend upon perl-native to fix this, just remove the date from +the manpages. + +RP 2020/2/4 + +Upstream-Status: Inappropriate [OE specficic reproducibility workaround] +Signed-off-by: Richard Purdie + +Index: mc-4.8.23/doc/man/date-of-man-include.am +=== +--- mc-4.8.23.orig/doc/man/date-of-man-include.am mc-4.8.23/doc/man/date-of-man-include.am +@@ -1,5 +1,5 @@ + SED_PARAMETERS = \ +- -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ ++ -e "s/%DATE_OF_MAN_PAGE%//g" \ + -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s{%prefix%{@prefix@{g" \ + -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index d8c8f8643e1..ead348b92e7 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -11,6 +11,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://0001-Add-option-to-control-configure-args.patch \ file://0001-Ticket-3629-configure.ac-drop-bundled-gettext.patch \ + file://nomandate.patch \ " SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89" SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] xserver-xorg: Fix reproducibility issue
The host kernel version was being encoded into the Xorg binary. Set an appropriate configure option to avoid this and be deterministic. Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0ae65c785d..14ba6bfee6c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -117,6 +117,7 @@ EXTRA_OECONF += "--with-fop=no \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ + --with-os-name=Linux \ " OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] patch: Extend to native/nativesdk and depend upon
There is a bug in patch 2.7.3 and earlier where index lines in patches can change file modes when they shouldn't: http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 This leaks into debug sources in particular (e.g. tcp-wrappers where source files are read-only). Add the dependency to target recipes to avoid this problem until we can rely on 2.7.4 or later. We could try and remove all index lines from patch files but it will be a losing battle. We could try and identify all the recipes which change modes on files in patches but again, its a losing battle. Instead, compromise and have patch-native as a dependency for target recipes. We use patch-replacement-native since patch-native is in ASSUME_PROVIDED. Also add nativesdk-patch to buildtools-tarball. [YOCTO #13777] Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 7 +++ meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-devtools/patch/patch_2.7.6.bb | 3 +++ 3 files changed, 11 insertions(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index cd241f1c848..25ec089ae12 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,6 +5,13 @@ QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc" PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" +# There is a bug in patch 2.7.3 and earlier where index lines +# in patches can change file modes when they shouldn't: +# http://git.savannah.gnu.org/cgit/patch.git/patch/?id=82b800c9552a088a241457948219d25ce0a407a4 +# This leaks into debug sources in particular. Add the dependency +# to target recipes to avoid this problem until we can rely on 2.7.4 or later. +PATCHDEPENDENCY_append_class-target = " patch-replacement-native:do_populate_sysroot" + PATCH_GIT_USER_NAME ?= "OpenEmbedded" PATCH_GIT_USER_EMAIL ?= "oe.patch@oe" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 95ebda7fa15..aa55cde84a9 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-texinfo \ nativesdk-libnss-nis \ nativesdk-rpcsvc-proto \ +nativesdk-patch \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 5d7f55f8dc3..b5897b357ae 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -22,3 +22,6 @@ acpaths = "-I ${S}/m4 " PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}" PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PROVIDES_append_class-native = " patch-replacement-native" + +BBCLASSEXTEND = "native nativesdk" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] oeqa/reproducible: Improve test output and ensure deb+ipk compared
Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 04dc46f38a0..f6433c9a02b 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. +fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) if result.missing or result.different: -self.fail("The following %s packages are missing or different: %s" % -(c, ' '.join(r.test for r in (result.missing + result.different +fails.append("The following %s packages are missing or different: %s" % +(c, '\n'.join(r.test for r in (result.missing + result.different + +if fails: +self.fail('\n'.join(fails)) # Clean up empty directories if self.save_results: -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] mc: Set zipinfo presence determinstically
This value was floating causing differences in generated files. Set it determinstically. Signed-off-by: Richard Purdie --- meta/recipes-extended/mc/mc_4.8.23.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 95fa1dae78d..d8c8f8643e1 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -29,6 +29,7 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable- CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" +CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] opkg-utils: Fix reproducibility issues in opkg-build
There is a sorting problem with opkg-build where the ipk generated is depending upon the order of files on disk. The reason is the --sort option to tar only influences the orders of files tar reads, not those passed by the -T option. Add in a sort call to resolve this issue. To ensure consistent sorting we also need to force to a specific locale (C) else the results are still not deterministic. Signed-off-by: Richard Purdie --- .../opkg-utils/fix-reproducibility.patch | 32 +++ .../opkg-utils/opkg-utils_0.4.2.bb| 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 000..945979bc8a7 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch @@ -0,0 +1,32 @@ +Fix reproducibility issues in opkg-build + +There is a sorting problem with opkg-build where the ipk generated is depending +upon the order of files on disk. The reason is the --sort option to tar only +influences the orders of files tar reads, not those passed by the -T option. + +Add in a sort call to resolve this issue. To ensure consistent sorting we +also need to force to a specific locale (C) else the results are still not +deterministic. + +RP 2020/2/5 + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] +Signed-off-by: Richard Purdie + +Index: opkg-utils-0.4.2/opkg-build +=== +--- opkg-utils-0.4.2.orig/opkg-build opkg-utils-0.4.2/opkg-build +@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then + mtime_args="--mtime=@$build_date --clamp-mtime" + fi + +-( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) +-( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) ++export LANG=C ++export LC_ALL=C ++( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) ++( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) + ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) + ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index 8e7ef00b087..eda73db6a4b 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ + file://fix-reproducibility.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/; -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for "[zeus] rsync: whitelist CVE-20..." and 2 more
== Series Details == Series: "[zeus] rsync: whitelist CVE-20..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/22429/ 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[zeus,1/3] rsync: whitelist CVE-2017-16548 Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format] Suggested fixCorrect or include the CVE tag on cve patch with format: "CVE: CVE--" 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