Re: [OE-core] [PATCH 1/2 v3] coreutils: add ptest
On Thu, 2020-02-27 at 18:51 -0500, Trevor Gamblin wrote: > On 2/27/20 6:26 PM, Richard Purdie wrote: > > On Wed, 2020-02-26 at 19:13 +0100, Alexander Kanavin wrote: > > > valgrind, gdb and strace are already pulled into core-image-sato- > > > sdk- > > > ptest (the one that runs the slow ptests on the AB), so there is > > > no > > > harm in adding them here as well. > > Actually, there is. > > > > Adding valgrind to the RDEPENDS of coreutils means all builds end > > up > > needing to include valgrind. We really don't want that. > > > > I know this is bad but it is the way dependencies work today :( > Should I resubmit with gdb and strace? My personal opinion is no, these all end up enlarging the dependency chains too much :( Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] make: 4.2.1 -> 4.3
On Mon, 2020-02-24 at 15:39 +0100, Jens Rehsack wrote: > Announcement: > https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html > > 1) Remove upstream provided patches > 0001-glob-Do-not-assume-glibc-glob-internals.patch >and 0002-glob-Do-not-assume-glibc-glob-internals.patch. > > 2) License has been changed to GPLv3 only > > 3) Important bug-fix is >* https://lists.gnu.org/archive/html/bug-make/2018-09/msg6.html > > 4) Backward-incompatibilities: >* Number signs (#) appearing inside a macro reference or function > invocation > no longer introduce comments and should not be escaped with backslashes >* Previously appending using '+=' to an empty variable would result in a > value > starting with a space. Now the initial space is only added if the > variable > already contains some value. Similarly, appending an empty string does > not > add a trailing space. > > Fix incompatibility issues between gnulib bundled with updated make fix issues > in w32 compat sources. > > Signed-off-by: Jens Rehsack https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] libmodule-build-perl: upgrade 0.4229 -> 0.4231
On Tue, 2020-02-25 at 15:46 -0800, Tim Orling wrote: > Upstream release notes: > " > 0.4231 - Wed Jan 29 08:47:56 CET 2020 > > - Released 0.42_30 without code changes > > 0.42_30 - Wed Jul 31 13:15:39 CEST 2019 > > - Add dependency on ExtUtils::PL2Bat > " > > Add ptest RDEPENDS: > - ExtUtils::Command::MM for t/compat.t > - gcc, make didn't seem like enough for ptest, replace with > packagegroup-core-buildessential which definitely works > - perl-dev for EXTERN.h in t/xs.t > > Add INSANE_SKIP dev-deps for the -ptest package because of perl-dev > > Five tests from t/help.t are skipped because they are TODO > > t/par.t is skipped because PAR::Dist (0.17+) is not present > > t/ppm.t is skipped because "HTML support not installed" > > All other tests pass. > > Signed-off-by: Tim Orling > --- > ...rl_0.4229.bb => libmodule-build-perl_0.4231.bb} | 14 +--- > -- > 1 file changed, 9 insertions(+), 5 deletions(-) > rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4229.bb => > libmodule-build-perl_0.4231.bb} (90%) unfortunately this has reproducibility issues: https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20200228-93xlitnd/packages/diff-html/ (see after the gettext issue) Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-security][PATCH] linux: drop the bbappend for linux v4.x series
pon., 24 lut 2020 o 17:16 akuster808 napisał(a): > > wrong ml. > > should be yo...@list.yoctoproject.org > > On 2/24/20 7:45 AM, Bartosz Golaszewski wrote: > > From: Bartosz Golaszewski > > > > v4.19 LTS has been dropped in poky in favor of v5.4. Drop the bbappend > > from meta-security as right now the build fails. > > Thanks for the patch. I saw this issue yesterday and you beat me to > fixing it. > Hi Armin, just a gentle ping as this is still broken - do you want me to resend it to the right mailing list? Bartosz -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/2] ltp: Update to 20200120
Hi Khem, > > It looks like this is failing with musl: > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_memory_test/../cpuset_lib/libcpu_set.a(libcpuset.o): > > in function `cpuset_fts_open': > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3214: > > undefined reference to `fts_open' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: > > undefined reference to `fts_read' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: > > undefined reference to `fts_close' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: > > undefined reference to `fts_close' > I think we need to add > DEPENDS_append_libc-musl = " fts " > EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" Thanks! LIBS=-lfts should fix missing fts. I've sent it as v4. I'm trying to test it on TARGET_SYS = "x86_64-oe-linux-musl" (run via TCLIBC=musl bitbake ltp, I should probably test it also on other arch: MACHINE=qemuarm TCLIBC=musl bitbake ltp). Anuj, can you test it as well? Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 1/2] ltp: Update to 20200120
Removed ffsb copying file (tool removed from upstream) Added LIBS=-lfts for MUSL. Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Changes v3->v4: * Fix musl build with LIBS=-lfts .../ltp/0001-Add-more-musl-exclusions.patch | 37 +-- ...option-to-select-libc-implementation.patch | 103 +- ...udevadm-trigger-before-swap-verifica.patch | 35 -- ...ix-zeros-of-the-addresses-output-by-.patch | 43 ...or-time64-unsafe-syscalls-before-usi.patch | 41 +-- ...es-fix-an-absent-format-string-issue.patch | 24 ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 -- ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 10 files changed, 81 insertions(+), 321 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (89%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 - testcases/kernel/syscalls/fanotify/Makefile | 6 ++ - testcases/kernel/syscalls/setxattr/Makefile | 4 testcases/kernel/syscalls/timer_create/Makefile | 4 - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS:= accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS+= -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta/recipes-extended
[OE-core] [PATCH v4 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v3->v4: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 --- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..00 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { -/* Even MAP_FIXED mappings must reside within TASK_SIZE */ -if (TASK_SIZE - len < addr) -return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 312eeca114..847f267b0b 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1
All those build failures are on CentOS-7. Grumble grumble. On Thu, Feb 27, 2020 at 8:32 PM Tim Orling wrote: > Strange. I built it in new environment, tip of master, on Debian-10 and no > problems. I’ll look into it tomorrow. > > Thank you for the information. > > On Thu, Feb 27, 2020 at 8:28 PM Khem Raj wrote: > >> >> >> On 2/27/20 7:54 PM, Anuj Mittal wrote: >> > Hi Tim, >> > >> > On 27-Feb-20 08:06 AM, Tim Orling wrote: >> >> Release notes: >> >> >> https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS >> >> >> >> >> >> License-Update: Changed to LGPL-2.1+ >> >> >> >> Signed-off-by: Tim Orling >> >> --- >> >> .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 >> >> >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => >> >> at-spi2-atk_2.34.1.bb} (66%) >> > >> > This is failing on musl-qemu86: >> > >> > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 >> > >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field >> > ‘tv_sec’ specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near >> > initialization for ‘timeout’) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field >> > ‘tv_nsec’ specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near >> > initialization for ‘timeout’) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size >> > of ‘timeout’ isn’t known >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit >> > declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] >> > nanosleep(&timeout, NULL); >> > ^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function >> ‘terminate_app’: >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable >> > ‘timeout’ has initializer but incomplete type >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; >> >^ >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown >> field >> > ‘tv_sec’ specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near >> > initialization for ‘timeout’) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown >> field >> > ‘tv_nsec’ specified in initializer >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess >> > elements in struct initializer [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near >> > initialization for ‘timeout’) [enabled by default] >> > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size >> > of ‘timeout’ isn’t known >> > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; >> > >> >> yeah this is exposing a bug in use if time_t struct in this component. >> there are several patches done to address that, we will perhaps need one >> of these patches here. >> >> -- >> ___ >> 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 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1
Strange. I built it in new environment, tip of master, on Debian-10 and no problems. I’ll look into it tomorrow. Thank you for the information. On Thu, Feb 27, 2020 at 8:28 PM Khem Raj wrote: > > > On 2/27/20 7:54 PM, Anuj Mittal wrote: > > Hi Tim, > > > > On 27-Feb-20 08:06 AM, Tim Orling wrote: > >> Release notes: > >> > https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS > >> > >> > >> License-Update: Changed to LGPL-2.1+ > >> > >> Signed-off-by: Tim Orling > >> --- > >> .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 > > >> 1 file changed, 4 insertions(+), 4 deletions(-) > >> rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => > >> at-spi2-atk_2.34.1.bb} (66%) > > > > This is failing on musl-qemu86: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 > > > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > > ‘tv_sec’ specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > > initialization for ‘timeout’) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field > > ‘tv_nsec’ specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near > > initialization for ‘timeout’) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size > > of ‘timeout’ isn’t known > > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; > > ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit > > declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] > > nanosleep(&timeout, NULL); > > ^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’: > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable > > ‘timeout’ has initializer but incomplete type > > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; > >^ > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > > ‘tv_sec’ specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > > initialization for ‘timeout’) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field > > ‘tv_nsec’ specified in initializer > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess > > elements in struct initializer [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near > > initialization for ‘timeout’) [enabled by default] > > ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size > > of ‘timeout’ isn’t known > > struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; > > > > yeah this is exposing a bug in use if time_t struct in this component. > there are several patches done to address that, we will perhaps need one > of these patches here. > > -- > ___ > 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 v3 1/2] ltp: Update to 20200120
On 2/27/20 8:06 PM, Anuj Mittal wrote: On 28-Feb-20 05:29 AM, Petr Vorel wrote: Removed ffsb copying file (tool removed from upstream) Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel It looks like this is failing with musl: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_memory_test/../cpuset_lib/libcpu_set.a(libcpuset.o): in function `cpuset_fts_open': /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3214: undefined reference to `fts_open' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: undefined reference to `fts_close' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: undefined reference to `fts_close' I think we need to add DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" here. Complete logs here: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623/steps/8/logs/step1b https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1627/steps/8/logs/step1b Thanks, Anuj --- Changes v2->v3: ffsb-6.0-rc2 has been removed => remove it from upstream. Kind regards, Petr .../ltp/0001-Add-more-musl-exclusions.patch | 37 +-- ...option-to-select-libc-implementation.patch | 103 +- ...udevadm-trigger-before-swap-verifica.patch | 35 -- ...ix-zeros-of-the-addresses-output-by-.patch | 43 ...or-time64-unsafe-syscalls-before-usi.patch | 41 +-- ...es-fix-an-absent-format-string-issue.patch | 24 ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 -- ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 8 +- 10 files changed, 80 insertions(+), 320 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/ke
Re: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1
On 2/27/20 7:54 PM, Anuj Mittal wrote: Hi Tim, On 27-Feb-20 08:06 AM, Tim Orling wrote: Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling --- .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (66%) This is failing on musl-qemu86: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_sec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_nsec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ‘timeout’ isn’t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] nanosleep(&timeout, NULL); ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’: ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ‘timeout’ has initializer but incomplete type struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_sec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_nsec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ‘timeout’ isn’t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; yeah this is exposing a bug in use if time_t struct in this component. there are several patches done to address that, we will perhaps need one of these patches here. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rng-tools: only print the success message when initialize entropy sources
From: Mingli Yu There is below message when check rngd service status in qemu env. [rdrand]: Initialization Failed The complete service status as below in qemu env: # systemctl status rngd rngd.service - Hardware RNG Entropy Gatherer Daemon Loaded: loaded (/lib/systemd/system/rngd.service; enabled; vendor preset: > Active: active (running) since Tue 2020-02-25 05:08:11 UTC; 42min ago Main PID: 133 (rngd) Tasks: 2 (limit: 3591) Memory: 1.0M CGroup: /system.slice/rngd.service `-133 /usr/sbin/rngd -f -r /dev/hwrng Feb 25 05:08:14 qemux86-64 rngd[133]: Initializing available sources Feb 25 05:08:14 qemux86-64 rngd[133]: [hwrng ]: Initialized Feb 25 05:08:14 qemux86-64 rngd[133]: [rdrand]: Initialization Failed Feb 25 05:08:14 qemux86-64 rngd[133]: [jitter]: Initializing AES buffer Feb 25 05:08:31 qemux86-64 rngd[133]: [jitter]: Enabling JITTER rng support Feb 25 05:08:39 qemux86-64 rngd[133]: [jitter]: Initialized Warning: Journal has been rotated since unit was started. Log output is incompl The message "[rdrand]: Initialization Failed" is misleading and also results in parselogs.ParseLogsTest.test_parselogs failed in do_testimage. In fact, the message only indicates the rdrand entropy source initialized failed and it doesn't affect the rngd function. So improve to only print the message for the entropy sources which initialized successfully to avoid misleading users. That makes sense as after check the available entropy sources, there is a logic to check whether there is at least one available entropy source exist as below in rngd.c if (!ent_sources) { message(LOG_DAEMON|LOG_ERR, "can't open any entropy source"); message(LOG_DAEMON|LOG_ERR, "Maybe RNG device modules are not loaded\n"); return 1; } That's to say, only printing the message for the entropy sources which initialized successfully is safe. Signed-off-by: Mingli Yu --- ...-print-the-success-message-when-initializ.patch | 47 ++ meta/recipes-support/rng-tools/rng-tools_6.9.bb| 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch diff --git a/meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch b/meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch new file mode 100644 index 000..ba3958f --- /dev/null +++ b/meta/recipes-support/rng-tools/rng-tools/0001-rngd.c-only-print-the-success-message-when-initializ.patch @@ -0,0 +1,47 @@ +From 820d7fc8477b690803f9640452ce6df2f3eb6a79 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 28 Feb 2020 02:39:53 + +Subject: [PATCH] rngd.c: only print the success message when initialize + +Only print the message for the entropy sources which +initialized successfully to avoid misleading users. + +That makes sense as after check the available entropy +sources, there is logic to check whether there is at +least one available entropy source exist as below: +if (!ent_sources) { + message(LOG_DAEMON|LOG_ERR, + "can't open any entropy source"); + message(LOG_DAEMON|LOG_ERR, + "Maybe RNG device modules are not loaded\n"); + return 1; +} + +That's to say, only printing the message for the entropy +sources which initialized successfully is safe. + +Upstream-Status: Submitted [https://github.com/nhorman/rng-tools/pull/84] + +Signed-off-by: Mingli Yu +--- + rngd.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/rngd.c b/rngd.c +index d8cd9af..78dae36 100644 +--- a/rngd.c b/rngd.c +@@ -795,9 +795,8 @@ int main(int argc, char **argv) + ent_sources++; + ent_src->fipsctx = malloc(sizeof(fips_ctx_t)); + fips_init(ent_src->fipsctx, discard_initial_data(ent_src)); +-message_entsrc(ent_src, LOG_DAEMON|LOG_INFO, "Initialized\n"); ++message_entsrc(ent_src, LOG_DAEMON|LOG_INFO, "Initialized successfully\n"); + } else { +-message_entsrc(ent_src, LOG_DAEMON|LOG_ERR, "Initialization Failed\n"); + ent_src->disabled = true; + } + } +-- +2.24.1 + diff --git a/meta/recipes-support/rng-tools/rng-tools_6.9.bb b/meta/recipes-support/rng-tools/rng-tools_6.9.bb index 913342c..cce61aa 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.9.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.9.bb @@ -10,6 +10,7 @@ DEPENDS = "sysfsutils" SRC_URI = "\ git://github.com/nhorman/rng-tools.git \ +file://0001-rngd.c-only-print-the-success-message-when-initializ.patch \ file://init \ file://default \ file://rngd.service \ -- 2.7.4 -- _
Re: [OE-core] [PATCH] wic: Add include-dir option
Paul, On 2/27/20 11:50 AM, Paul Barker wrote: > On Thu, 27 Feb 2020 at 19:43, akuster808 wrote: >> >> >> On 2/27/20 12:12 AM, Martin Hundebøll wrote: >>> Hi Armin, >>> >>> On 27/02/2020 05.26, Armin Kuster wrote: This option allows for the inclusion of a single directory for a partition. >>> I am unsure how this is used in a .wks file. >> Yeah, the documentation does not cover this. >> >> This is what I used to verified it works >> >> part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs >> --align 4096 --exclude-path=var >> part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var >> --align 4096 --include-dir=var >> >> >>> From the code it looks similar to the include-path option, but >>> relative to the rootfs source dir instead of the wic working dir? >> the --include-path adds an entire rootfs to the partition. I don't want >> the another rootfs. The help file even says that. I want on directory. >> --exclude-dir allows me to "exclude" a dir . >> >> >> I used wic ls {path to partition}:{partition number} to view the >> contents of the partition. >> >>> But the include-dir value is also used in the destination path? >> Then please document it and I don't mean the "help" file which is unclear. >> >> So how would you have "home" or "var" be in their own partitions? Please >> show an example. > IIRC, > > part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs > --align 4096 --exclude-path=var > part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var > --align 4096 --rootfs-dir=${IMAGE_ROOTFS}/var > > For an example see scripts/lib/wic/canned-wks/efi-bootdisk.wks.in Yeah, I looked all the wks files an nothing jumped out at me. The "--rootfs-dir" is not intuitive for selecting a single dir but I see that it does address my issue. thanks, Armin > > Thanks, > Paul -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/2] ltp: Update to 20200120
On 28-Feb-20 05:29 AM, Petr Vorel wrote: Removed ffsb copying file (tool removed from upstream) Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel It looks like this is failing with musl: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_memory_test/../cpuset_lib/libcpu_set.a(libcpuset.o): in function `cpuset_fts_open': /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3214: undefined reference to `fts_open' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: undefined reference to `fts_close' /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: undefined reference to `fts_close' Complete logs here: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623/steps/8/logs/step1b https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1627/steps/8/logs/step1b Thanks, Anuj --- Changes v2->v3: ffsb-6.0-rc2 has been removed => remove it from upstream. Kind regards, Petr .../ltp/0001-Add-more-musl-exclusions.patch | 37 +-- ...option-to-select-libc-implementation.patch | 103 +- ...udevadm-trigger-before-swap-verifica.patch | 35 -- ...ix-zeros-of-the-addresses-output-by-.patch | 43 ...or-time64-unsafe-syscalls-before-usi.patch | 41 +-- ...es-fix-an-absent-format-string-issue.patch | 24 ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 -- ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 8 +- 10 files changed, 80 insertions(+), 320 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 - testcases/kernel/syscalls/fanotify/Makefile | 6 ++ - testcases/kernel/syscalls/setxattr/Makefile | 4 testcase
Re: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1
It looks like this is failing on non musl as well: https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/1617 https://autobuilder.yoctoproject.org/typhoon/#/builders/110/builds/524 Thanks, Anuj On 28-Feb-20 11:54 AM, Anuj Mittal wrote: Hi Tim, On 27-Feb-20 08:06 AM, Tim Orling wrote: Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling --- .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (66%) This is failing on musl-qemu86: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_sec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_nsec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ‘timeout’ isn’t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] nanosleep(&timeout, NULL); ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’: ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ‘timeout’ has initializer but incomplete type struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_sec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_nsec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ‘timeout’ isn’t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2 v3] coreutils: add ptest
On 27-Feb-20 02:07 AM, Trevor Gamblin wrote: coreutils has a large number of tests, including some added by the Makefile flags RUN_EXPENSIVE_TESTS and RUN_VERY_EXPENSIVE_TESTS that significantly increase runtime (and which have been disabled). Note that the coreutils ptest directory is given blanket permissions at runtime with chmod -R 777, to ensure that the user created for the tests will be able to run the test scripts and create the necessary files in the process without being impeded by permissions issues. There is still room to improve the results of this ptest without the aforementioned additions. Of the tests marked SKIP, there are 30 tests that are currently counted as SKIP because they require sudo permissions, and another 21 that require membership in multiple user groups. It is important to know that coreutils has tests for both root and non-root users. Testing showed that 42 tests are skipped when running as root versus 30 when running as a non-root user, so the decision was made to run the suite as the latter. Additionally, gdb, valgrind, and strace could be included in the RDEPENDS list to increase pass rate, but their total contribution is 13 tests, so they were omitted to reduce image size. Finally, note that at least one ptest (misc/head-write-error.sh) is prone to ERROR on builds of core-image-minimal if extra space is not provided with IMAGE_ROOTFS_EXTRA_SPACE. Signed-off-by: Trevor Gamblin --- .../coreutils/coreutils/run-ptest | 17 + meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++ 2 files changed, 54 insertions(+) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest diff --git a/meta/recipes-core/coreutils/coreutils/run-ptest b/meta/recipes-core/coreutils/coreutils/run-ptest new file mode 100755 index 00..6d4a7b365d --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +# remove any stale lock files so that the calls to groupadd/useradd don't stop +# the ptest if re-using the same image +rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock + +COREUTILSLIB=@libdir@/coreutils +LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log" +USERNAME="tester" +groupadd ugroup1 +groupadd ugroup2 +useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already exists" + +su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG} +userdel $USERNAME +groupdel ugroup1 +groupdel ugroup2 diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 57b2c1bdba..8bec4e0f3c 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ file://0001-local.mk-fix-cross-compiling-problem.patch \ + file://run-ptest \ " SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" @@ -143,3 +144,39 @@ python __anonymous() { } BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" + +do_install_ptest () { +install -d ${D}${PTEST_PATH}/tests +cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests +sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq` +install -d ${D}${PTEST_PATH}/build-aux +install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ +cp ${B}/Makefile ${D}${PTEST_PATH}/ +cp ${S}/init.cfg ${D}${PTEST_PATH}/ +cp -r ${B}/src ${D}${PTEST_PATH}/ +cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src +sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile +sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile +sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile +sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile +sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile +sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile +sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile +chmod -R 777 ${D}${PTEST_PATH} + +# Disable subcase stty-pairs.sh, it will cause test framework hang +sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile + +# Tweak test d_type-check to use python3 instead of python +sed -i "1s@.*@#!/usr/bin/python3@" ${WORKDIR}/image/usr/lib/coreutils/ptest/tests/d_type-check This is assuming /usr/lib and failing with multilib: https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/1642/steps/8/logs/step3b ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/multilib/buil
Re: [OE-core] [PATCH 3/4] at-spi2-atk: upgrade 2.32.0 -> 2.34.1
Hi Tim, On 27-Feb-20 08:06 AM, Tim Orling wrote: Release notes: https://gitlab.gnome.org/GNOME/at-spi2-atk/-/raw/043b793de2161a0548835424f4d087ac90d1172d/NEWS License-Update: Changed to LGPL-2.1+ Signed-off-by: Tim Orling --- .../atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/atk/{at-spi2-atk_2.32.0.bb => at-spi2-atk_2.34.1.bb} (66%) This is failing on musl-qemu86: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1623 ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_sec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: error: unknown field ‘tv_nsec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:75:19: error: storage size of ‘timeout’ isn’t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:90:5: warning: implicit declaration of function ‘nanosleep’ [-Wimplicit-function-declaration] nanosleep(&timeout, NULL); ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c: In function ‘terminate_app’: ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: variable ‘timeout’ has initializer but incomplete type struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; ^ ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_sec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: error: unknown field ‘tv_nsec’ specified in initializer ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: excess elements in struct initializer [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:10: warning: (near initialization for ‘timeout’) [enabled by default] ../at-spi2-atk-2.34.1/tests/atk_test_util.c:108:19: error: storage size of ‘timeout’ isn’t known struct timespec timeout = { .tv_sec = 0, .tv_nsec = 10 * 100 }; -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/4] systemd: Do not force removing resolved from PACKAGECONFIG
This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj --- v2: Fix typo in append meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d863410b8..a56a28a189 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ -resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0" + # Use the upstream systemd serial-getty@.service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2 v3] coreutils: add ptest
On 2/27/20 6:26 PM, Richard Purdie wrote: On Wed, 2020-02-26 at 19:13 +0100, Alexander Kanavin wrote: valgrind, gdb and strace are already pulled into core-image-sato-sdk- ptest (the one that runs the slow ptests on the AB), so there is no harm in adding them here as well. Actually, there is. Adding valgrind to the RDEPENDS of coreutils means all builds end up needing to include valgrind. We really don't want that. I know this is bad but it is the way dependencies work today :( Should I resubmit with gdb and strace? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32
On Fri, 2020-02-28 at 07:42 +0800, Anuj Mittal wrote: > > On 26-Feb-20 12:47 PM, Richard Purdie wrote: > > On Mon, 2020-02-24 at 15:02 -0500, bruce.ashfi...@gmail.com wrote: > > > From: Bruce Ashfield > > > > > > Updating linux-yocto/5.2 to the latest korg -stable release that > > > comprises > > > the following commits: > > > > This was included in testing on the autobuilder and we saw: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 > > > > and I'm not sure if they're from this? > > > > I had picked this for zeus as well and didn't get this error on > autobuilder. The builds failing above are building v5.4 by default. > So > it doesn't look like it's related. > > I am not sure what could be causing this problem though ... I've come to the same conclusion having run builds without this patch, its something else in -next, maybe the make patch. Trying with the reverted, failing that we'll have to bisect next :/. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/4] systemd: Do not force removing resolved from PACKAGECONFIG
On Thu, Feb 27, 2020 at 12:06 AM Khem Raj wrote: > > This needs __UAPI_DEF_ETHHDR to be set to 0 which now > taken care by CFLAGS > > Signed-off-by: Khem Raj > --- > meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-core/systemd/systemd_244.3.bb > b/meta/recipes-core/systemd/systemd_244.3.bb > index 5d863410b8..e7d2997963 100644 > --- a/meta/recipes-core/systemd/systemd_244.3.bb > +++ b/meta/recipes-core/systemd/systemd_244.3.bb > @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ > nss \ > nss-mymachines \ > nss-resolve \ > -resolved \ > smack \ > sysusers \ > utmp \ > " > > +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " Should have a leading space (and no trailing space). > # Use the upstream systemd serial-getty@.service and rely on > # systemd-getty-generator instead of using the OE-core specific > # systemd-serialgetty.bb - not enabled by default. > -- > 2.25.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] libgpg-error: upgrade 1.36 -> 1.37
On 2/27/20 6:14 PM, Richard Purdie wrote: On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote: Looks like I got beat by a day! Does your version work on x32 though? :) We need one that does... They look the same, unfortunately. Will take a look in between some other tasks, unless Alex gets to it first (he usually does, that guy's a machine). Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-yocto/5.2: update to v5.2.32
On 26-Feb-20 12:47 PM, Richard Purdie wrote: On Mon, 2020-02-24 at 15:02 -0500, bruce.ashfi...@gmail.com wrote: From: Bruce Ashfield Updating linux-yocto/5.2 to the latest korg -stable release that comprises the following commits: This was included in testing on the autobuilder and we saw: https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/1612 https://autobuilder.yoctoproject.org/typhoon/#/builders/102/builds/315 https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/1616 and I'm not sure if they're from this? I had picked this for zeus as well and didn't get this error on autobuilder. The builds failing above are building v5.4 by default. So it doesn't look like it's related. I am not sure what could be causing this problem though ... Thanks, Anuj -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2 v3] coreutils: add ptest
On Wed, 2020-02-26 at 19:13 +0100, Alexander Kanavin wrote: > valgrind, gdb and strace are already pulled into core-image-sato-sdk- > ptest (the one that runs the slow ptests on the AB), so there is no > harm in adding them here as well. Actually, there is. Adding valgrind to the RDEPENDS of coreutils means all builds end up needing to include valgrind. We really don't want that. I know this is bad but it is the way dependencies work today :( Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37
On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote: > Looks like I got beat by a day! Does your version work on x32 though? :) We need one that does... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 10/12] libgpg-error: upgrade 1.36 -> 1.37
On Tue, 2020-02-25 at 19:53 +0100, Alexander Kanavin wrote: > Signed-off-by: Alexander Kanavin > --- > .../libgpg-error-1.36-gawk5-support.patch | 144 > -- > ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 7 +- > 2 files changed, 3 insertions(+), 148 deletions(-) > delete mode 100644 meta/recipes-support/libgpg-error/libgpg- > error/libgpg-error-1.36-gawk5-support.patch > rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => > libgpg-error_1.37.bb} (92%) Fails on x32. It did this when proposed last time :/ https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/1605 Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] lsb-release: fix likely reproducabilty timestamp
Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman --- .../0001-Remove-timestamp-from-manpage.patch | 27 +++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 00..af095fd322 --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,27 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 + +Subject: [PATCH] Remove timestamp from manpage + +Upstream-Status: Submitted [lsb-disc...@lists.linux-foundation.org] +Signed-off-by: Jeremy A. Puhlman +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e30267f5..a06cbcf845 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libuv: needed by bind 9.16
On 2/27/20 2:33 PM, Anuj Mittal wrote: > > > On 28-Feb-20 04:56 AM, Armin Kuster wrote: >> From: Armin Kuster >> >> move from meta-oe to core >> >> Signed-off-by: Armin Kuster >> --- >> .../libuv/libuv_1.34.0.bb | 19 +++ >> 1 file changed, 19 insertions(+) >> create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb > > This will need an entry in maintainers.inc as well. Interesting question. Does that default to the meta-oe maintainer as that is where we are getting the recipe from or the person submitting the patch? - armin > > Thanks, > > Anuj > >> >> diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.0.bb >> b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb >> new file mode 100644 >> index 00..b842bbda7a >> --- /dev/null >> +++ b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb >> @@ -0,0 +1,19 @@ >> +SUMMARY = "A multi-platform support library with a focus on >> asynchronous I/O" >> +HOMEPAGE = "https://github.com/libuv/libuv"; >> +BUGTRACKER = "https://github.com/libuv/libuv/issues"; >> +LICENSE = "MIT" >> +LIC_FILES_CHKSUM = >> "file://LICENSE;md5=a68902a430e32200263d182d44924d47" >> + >> +SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" >> +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" >> + >> +S = "${WORKDIR}/git" >> + >> +inherit autotools >> + >> +do_configure() { >> + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" >> + oe_runconf >> +} >> + >> +BBCLASSEXTEND = "native" >> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] lsb-release: fix likely reproducabilty timestamp
On 2/27/20 2:15 PM, Jeremy A. Puhlman wrote: > From: Jeremy Puhlman > > Remove timestamp from gzipped manpage. > > Signed-off-by: Jeremy A. Puhlman > --- > .../0001-Remove-timestamp-from-manpage.patch | 25 +++ > meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + > 2 files changed, 26 insertions(+) > create mode 100644 > meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch > > diff --git > a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch > > b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch > new file mode 100644 > index 00..e7ff00d132 > --- /dev/null > +++ > b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch > @@ -0,0 +1,25 @@ > +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 > +From: Jeremy Puhlman > +Date: Sat, 22 Feb 2020 19:01:28 + > +Subject: [PATCH] Remove timestamp from manpage Missing "Upstream-Status:" and "signed-off-by" in patch - armin > + > +--- > + Makefile | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index 04fdecd..5be8081 100644 > +--- a/Makefile > b/Makefile > +@@ -17,7 +17,7 @@ man: lsb_release.1.gz > + > + lsb_release.1.gz: lsb_release > + @./help2man -N --include ./lsb_release.examples > --alt_version_key=program_version ./lsb_release >lsb_release.1 > +-@gzip -9f lsb_release.1 > ++@gzip -9fn lsb_release.1 > + > + install: all > + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz > +-- > +2.13.3 > + > diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb > b/meta/recipes-extended/lsb/lsb-release_1.4.bb > index 52e30267f5..a06cbcf845 100644 > --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb > +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb > @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = > "file://README;md5=12da544b1a3a5a1795a21160b49471cf" > > SRC_URI = > "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ > > file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ > + file://0001-Remove-timestamp-from-manpage.patch \ > " > > SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Overriding SDE_FILE
On 28/02/20 11:34 am, Joshua Watt wrote: On 2/27/20 4:29 PM, Douglas Royds wrote: On 28/02/20 10:49 am, Joshua Watt wrote: On 2/27/20 3:22 PM, Douglas Royds wrote: On 28/02/20 5:45 am, Joshua Watt wrote: On 2/27/20 9:01 AM, Joshua Watt wrote: On 2/26/20 11:46 PM, Douglas Royds wrote: On 26/02/20 4:53 am, Jacob Kroon wrote: On 2/24/20 8:25 AM, Jacob Kroon wrote: Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. * * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable *must* be calculable at parse time before any task is ran, but in practice it's value is only available once the __source_date_epoch.txt file is present, which is after parsing. This causes the taskhash to be calculated differently during parsing and task execution which causes taskhash mismatch errors. True. What to do? Would it work to use a different non-whitelisted variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? Ya, that would work. You'd have to figure out how to get the variable to be included in each taskhash even though it's not directly referenced, but I'm sure that's possible. Another option that's at lot more "magic" would be something like this: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd That's really weird, and I'm not sure I like it, but worth a thought. If it works, it's good. I like the fact that the user can just set SOURCE_DATE_EPOCH directly in their recipe. How about ... BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not source_date_epoch_var(d) else ''}" Ya, that works. The only reason I chose "is None" was in case a user really wanted to do SOURCE_DATE_EPOCH = "0" True, best to allow for that. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Overriding SDE_FILE
On 2/27/20 4:29 PM, Douglas Royds wrote: On 28/02/20 10:49 am, Joshua Watt wrote: On 2/27/20 3:22 PM, Douglas Royds wrote: On 28/02/20 5:45 am, Joshua Watt wrote: On 2/27/20 9:01 AM, Joshua Watt wrote: On 2/26/20 11:46 PM, Douglas Royds wrote: On 26/02/20 4:53 am, Jacob Kroon wrote: On 2/24/20 8:25 AM, Jacob Kroon wrote: Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. * * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable *must* be calculable at parse time before any task is ran, but in practice it's value is only available once the __source_date_epoch.txt file is present, which is after parsing. This causes the taskhash to be calculated differently during parsing and task execution which causes taskhash mismatch errors. True. What to do? Would it work to use a different non-whitelisted variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? Ya, that would work. You'd have to figure out how to get the variable to be included in each taskhash even though it's not directly referenced, but I'm sure that's possible. Another option that's at lot more "magic" would be something like this: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd That's really weird, and I'm not sure I like it, but worth a thought. If it works, it's good. I like the fact that the user can just set SOURCE_DATE_EPOCH directly in their recipe. How about ... BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not source_date_epoch_var(d) else ''}" Ya, that works. The only reason I chose "is None" was in case a user really wanted to do SOURCE_DATE_EPOCH = "0" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libuv: needed by bind 9.16
On 28-Feb-20 04:56 AM, Armin Kuster wrote: From: Armin Kuster move from meta-oe to core Signed-off-by: Armin Kuster --- .../libuv/libuv_1.34.0.bb | 19 +++ 1 file changed, 19 insertions(+) create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb This will need an entry in maintainers.inc as well. Thanks, Anuj diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb new file mode 100644 index 00..b842bbda7a --- /dev/null +++ b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv"; +BUGTRACKER = "https://github.com/libuv/libuv/issues"; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { +${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" +oe_runconf +} + +BBCLASSEXTEND = "native" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for "sysvinit: remove logsave.8..." and 2 more
== Series Details == Series: "sysvinit: remove logsave.8..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/22997/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fixSign off the added patch file (meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fixAdd Upstream-Status: to the header of meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] 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
Re: [OE-core] Overriding SDE_FILE
On 28/02/20 10:49 am, Joshua Watt wrote: On 2/27/20 3:22 PM, Douglas Royds wrote: On 28/02/20 5:45 am, Joshua Watt wrote: On 2/27/20 9:01 AM, Joshua Watt wrote: On 2/26/20 11:46 PM, Douglas Royds wrote: On 26/02/20 4:53 am, Jacob Kroon wrote: On 2/24/20 8:25 AM, Jacob Kroon wrote: Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. * * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable *must* be calculable at parse time before any task is ran, but in practice it's value is only available once the __source_date_epoch.txt file is present, which is after parsing. This causes the taskhash to be calculated differently during parsing and task execution which causes taskhash mismatch errors. True. What to do? Would it work to use a different non-whitelisted variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? Ya, that would work. You'd have to figure out how to get the variable to be included in each taskhash even though it's not directly referenced, but I'm sure that's possible. Another option that's at lot more "magic" would be something like this: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd That's really weird, and I'm not sure I like it, but worth a thought. If it works, it's good. I like the fact that the user can just set SOURCE_DATE_EPOCH directly in their recipe. How about ... BB_HASHBASE_WHITELIST += "${@'SOURCE_DATE_EPOCH' if not source_date_epoch_var(d) else ''}" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] rt-tests: make manpages reproducible
From: Jeremy Puhlman add -n to gzip call Signed-off-by: Jeremy A. Puhlman --- ...gzip-with-n-for-build-reproducibilty.patch | 62 +++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch new file mode 100644 index 00..3bafbbe08f --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch @@ -0,0 +1,62 @@ +From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Tue, 25 Feb 2020 22:58:59 + +Subject: [PATCH] gzip with -n for build reproducibilty + +The date can get encoded in the header of the gz file, which +causes the binary files between two different builds of the +same data to be different. Add -n for reproducibilty + +Signed-off-by: Jeremy Puhlman + +Upstream-Status: Submitted [mailinglist] + +--- + Makefile | 24 + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index a54d82b..e9f0d5a 100644 +--- a/Makefile b/Makefile +@@ -168,17 +168,17 @@ install: all install_hwlatdetect + cp $(TARGETS) "$(DESTDIR)$(bindir)" + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" +- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" +- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" +- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" +- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" +- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" +- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" +- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" ++ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" ++ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" ++ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" ++ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" ++ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" ++ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" ++ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" ++ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" ++ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" ++ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" ++ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect +@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: tarball +-- +2.23.0 + diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index 5aa0aa10c3..dad252b4ed 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -13,6 +13,7 @@ inherit ptest SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ +file://0001-gzip-with-n-for-build-reproducibilty.patch \ " # rt-tests needs PI mutex support in libc -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] sysvinit: remove logsave.8
From: Jeremy Puhlman logsave is a duplicate from e2fsprogs, which was already removed, but the man page remained which is also a duplicate. However it does not get modifed on install so it conflicts with the e2fsprogs version. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb index 63c10848b4..d2b85ed9c0 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb @@ -110,4 +110,5 @@ do_install () { # Already provided by e2fsprogs; sysvinit's version is a copy from there rm ${D}${base_sbindir}/logsave +rm ${D}${mandir}/man8/logsave.8 } -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] lsb-release: fix likely reproducabilty timestamp
From: Jeremy Puhlman Remove timestamp from gzipped manpage. Signed-off-by: Jeremy A. Puhlman --- .../0001-Remove-timestamp-from-manpage.patch | 25 +++ meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch diff --git a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch new file mode 100644 index 00..e7ff00d132 --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch @@ -0,0 +1,25 @@ +From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 22 Feb 2020 19:01:28 + +Subject: [PATCH] Remove timestamp from manpage + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 04fdecd..5be8081 100644 +--- a/Makefile b/Makefile +@@ -17,7 +17,7 @@ man: lsb_release.1.gz + + lsb_release.1.gz: lsb_release + @./help2man -N --include ./lsb_release.examples --alt_version_key=program_version ./lsb_release >lsb_release.1 +- @gzip -9f lsb_release.1 ++ @gzip -9fn lsb_release.1 + + install: all + install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz +-- +2.13.3 + diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 52e30267f5..a06cbcf845 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ + file://0001-Remove-timestamp-from-manpage.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Overriding SDE_FILE
On 2/27/20 3:22 PM, Douglas Royds wrote: On 28/02/20 5:45 am, Joshua Watt wrote: On 2/27/20 9:01 AM, Joshua Watt wrote: On 2/26/20 11:46 PM, Douglas Royds wrote: On 26/02/20 4:53 am, Jacob Kroon wrote: On 2/24/20 8:25 AM, Jacob Kroon wrote: Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. * * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable *must* be calculable at parse time before any task is ran, but in practice it's value is only available once the __source_date_epoch.txt file is present, which is after parsing. This causes the taskhash to be calculated differently during parsing and task execution which causes taskhash mismatch errors. True. What to do? Would it work to use a different non-whitelisted variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? Ya, that would work. You'd have to figure out how to get the variable to be included in each taskhash even though it's not directly referenced, but I'm sure that's possible. Another option that's at lot more "magic" would be something like this: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=2b524916cf35238ff3deea34017e8a4cd73926cd That's really weird, and I'm not sure I like it, but worth a thought. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] ltp: Update to 20200120
Removed ffsb copying file (tool removed from upstream) Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Changes v2->v3: ffsb-6.0-rc2 has been removed => remove it from upstream. Kind regards, Petr .../ltp/0001-Add-more-musl-exclusions.patch | 37 +-- ...option-to-select-libc-implementation.patch | 103 +- ...udevadm-trigger-before-swap-verifica.patch | 35 -- ...ix-zeros-of-the-addresses-output-by-.patch | 43 ...or-time64-unsafe-syscalls-before-usi.patch | 41 +-- ...es-fix-an-absent-format-string-issue.patch | 24 ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 -- ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 8 +- 10 files changed, 80 insertions(+), 320 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 - testcases/kernel/syscalls/fanotify/Makefile | 6 ++ - testcases/kernel/syscalls/setxattr/Makefile | 4 testcases/kernel/syscalls/timer_create/Makefile | 4 - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS:= accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS+= -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta
[OE-core] [PATCH v3 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v2->v3: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 --- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..00 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { -/* Even MAP_FIXED mappings must reside within TASK_SIZE */ -if (TASK_SIZE - len < addr) -return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 579a763431..537cc72644 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Overriding SDE_FILE
On 28/02/20 5:45 am, Joshua Watt wrote: On 2/27/20 9:01 AM, Joshua Watt wrote: On 2/26/20 11:46 PM, Douglas Royds wrote: On 26/02/20 4:53 am, Jacob Kroon wrote: On 2/24/20 8:25 AM, Jacob Kroon wrote: Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. * * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable *must* be calculable at parse time before any task is ran, but in practice it's value is only available once the __source_date_epoch.txt file is present, which is after parsing. This causes the taskhash to be calculated differently during parsing and task execution which causes taskhash mismatch errors. True. What to do? Would it work to use a different non-whitelisted variable in the recipe, eg. SOURCE_DATE_EPOCH_FIXED? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] bind: Update to latest ESV version 9.16
From: Armin Kuster Removed obsolete packageconfig options License change to MPL-2.0 https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE Refreshed: bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch Signed-off-by: Armin Kuster --- in-remove-useless-L-use_openssl-lib.patch | 30 -- ...d-V-and-start-log-hide-build-options.patch | 33 +++ ...ching-for-json-headers-searches-sysr.patch | 14 +++ .../bind/{bind_9.11.13.bb => bind_9.16.0.bb} | 40 +++ 4 files changed, 38 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch rename meta/recipes-connectivity/bind/{bind_9.11.13.bb => bind_9.16.0.bb} (77%) diff --git a/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch b/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch deleted file mode 100644 index 9d31b98080..00 --- a/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2325a92f1896a2a7f586611686801b41fbc91b50 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 27 Aug 2018 15:00:51 +0800 -Subject: [PATCH] configure.in: remove useless `-L$use_openssl/lib' - -Since `--with-openssl=${STAGING_DIR_HOST}${prefix}' is used in bind recipe, -the `-L$use_openssl/lib' has a hardcoded suffix, removing it is harmless -and helpful for clean up host build path in isc-config.sh - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e85a5c6..2bbfc58 100644 a/configure.ac -+++ b/configure.ac -@@ -1631,7 +1631,7 @@ If you don't want OpenSSL, use --without-openssl]) - fi - ;; - *) -- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" -+ DST_OPENSSL_LIBS="-lcrypto" - ;; - esac - fi diff --git a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 75908aa638..5bcc16c9b2 100644 --- a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch @@ -12,23 +12,24 @@ $ named -V Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia + +Refreshed for 9.16.0 +Signed-off-by: Armin Kuster + --- bin/named/include/named/globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index ba3457e..7741da7 100644 a/bin/named/include/named/globals.h -+++ b/bin/named/include/named/globals.h -@@ -68,7 +68,7 @@ EXTERN const char * ns_g_version INIT(VERSION); - EXTERN const char * ns_g_productINIT(PRODUCT); - EXTERN const char * ns_g_descriptionINIT(DESCRIPTION); - EXTERN const char * ns_g_srcid INIT(SRCID); --EXTERN const char * ns_g_configargs INIT(CONFIGARGS); -+EXTERN const char * ns_g_configargs INIT("*** (options are hidden)"); - EXTERN const char * ns_g_builderINIT(BUILDER); - EXTERN in_port_t ns_g_port INIT(0); - EXTERN isc_dscp_t ns_g_dscp INIT(-1); --- -2.7.4 - +Index: bind-9.16.0/bin/named/include/named/globals.h +=== +--- bind-9.16.0.orig/bin/named/include/named/globals.h bind-9.16.0/bin/named/include/named/globals.h +@@ -69,7 +69,7 @@ EXTERN const char *named_g_version I + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +-EXTERN const char *named_g_configargs INIT(CONFIGARGS); ++EXTERN const char *named_g_configargs INIT("*** (options are hidden)"); + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_portINIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch index 84559e5f37..19f1a25ad7 100644 --- a/meta/recipes-connectivi
[OE-core] [PATCH 1/2] libuv: needed by bind 9.16
From: Armin Kuster move from meta-oe to core Signed-off-by: Armin Kuster --- .../libuv/libuv_1.34.0.bb | 19 +++ 1 file changed, 19 insertions(+) create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.0.bb b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb new file mode 100644 index 00..b842bbda7a --- /dev/null +++ b/meta/recipes-connectivity/libuv/libuv_1.34.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv"; +BUGTRACKER = "https://github.com/libuv/libuv/issues"; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "15ae750151ac9341e5945eb38f8982d59fb99201" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { +${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" +oe_runconf +} + +BBCLASSEXTEND = "native" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Update bind to lates ESV version 9.16
Please consider this last minute addition to 3.1. Bind 9.16.0 just dropped and is the latest ESV. It requires libuv from meta-oe so please it should be added to core too. The current 9.11 ESV is planned to be EOL'd in the middle 3.1 LTS release. Armin Kuster (2): libuv: needed by bind 9.16 bind: Update to latest ESV version 9.16 in-remove-useless-L-use_openssl-lib.patch | 30 -- ...d-V-and-start-log-hide-build-options.patch | 33 +++ ...ching-for-json-headers-searches-sysr.patch | 14 +++ .../bind/{bind_9.11.13.bb => bind_9.16.0.bb} | 40 +++ .../libuv/libuv_1.34.0.bb | 19 + 5 files changed, 57 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch rename meta/recipes-connectivity/bind/{bind_9.11.13.bb => bind_9.16.0.bb} (77%) create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.0.bb -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
Hi Khem, > > please don't deliver this patch to users, it's wrong. > Thanks Petr, is there an alternative approach we can take ? Cyril suggested at the time to skipping the test in the testrunner. Is that feasible? He also asked how do you run the test. i.e. not changing the code of the test, just don't run it. https://patchwork.ozlabs.org/comment/2012168/ Kind regards, Petr PS: better to ask on LTP ML, Cc Cyril and me. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/2] ltp: Update to 20200120
Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Changes v1->v2: * fix rebasing 0001-build-Add-option-to-select-libc-implementation.patch Kind regards, Petr .../ltp/0001-Add-more-musl-exclusions.patch | 37 +-- ...option-to-select-libc-implementation.patch | 103 +- ...udevadm-trigger-before-swap-verifica.patch | 35 -- ...ix-zeros-of-the-addresses-output-by-.patch | 43 ...or-time64-unsafe-syscalls-before-usi.patch | 41 +-- ...es-fix-an-absent-format-string-issue.patch | 24 ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 -- ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++--- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 7 +- 10 files changed, 80 insertions(+), 319 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (92%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..773844d442 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 - testcases/kernel/syscalls/fanotify/Makefile | 6 ++ - testcases/kernel/syscalls/setxattr/Makefile | 4 testcases/kernel/syscalls/timer_create/Makefile | 4 - 4 files changed, 18 insertions(+) + 2 files changed, 8 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile index 504042e11..94db06266 100644 @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS:= accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile @@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644 CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include LDLIBS+= -lpthread -lrt +-- +2.25.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..0598046b28 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-
[OE-core] [PATCH v2 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Changes v1->v2: NONE ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 --- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..00 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { -/* Even MAP_FIXED mappings must reside within TASK_SIZE */ -if (TASK_SIZE - len < addr) -return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 38fd0f6f87..069d9c2e0b 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
On Thu, Feb 27, 2020 at 12:35 PM Petr Vorel wrote: > > Upstream just disagree on this patch > https://patchwork.ozlabs.org/comment/2012045/ > > Signed-off-by: Petr Vorel > --- > Hi, > > please don't deliver this patch to users, it's wrong. > Thanks Petr, is there an alternative approach we can take ? > Kind regards, > Petr > > ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 --- > meta/recipes-extended/ltp/ltp_20200120.bb | 1 - > 2 files changed, 69 deletions(-) > delete mode 100644 > meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > > diff --git > a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > > b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > deleted file mode 100644 > index d32ac1dd7c..00 > --- > a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 > -From: "Hongzhi.Song" > -Date: Wed, 10 Oct 2018 22:07:05 -0400 > -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit > - > -Mips will return EINVAL instead of ENOMEM as expected > -if the range [addr + len) exceeds TASK_SIZE. > - > -Linux kernel code: arch/mips/mm/mmap.c > -if (flags & MAP_FIXED) { > -/* Even MAP_FIXED mappings must reside within TASK_SIZE */ > -if (TASK_SIZE - len < addr) > -return -EINVAL; > - > -Relax the condition and accept both ENOMEM and EINVAL > -as expected outcome. > - > -Upstream-Status: Submitted > [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] > - > -Signed-off-by: Hongzhi.Song > > - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 > +- > - 1 file changed, 5 insertions(+), 5 deletions(-) > - > -diff --git > a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c > b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c > -index 9cf83d9..55090a6 100644 > a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c > -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c > -@@ -7,7 +7,7 @@ > - * source tree. > - * > - * The mmap() function shall fail if: > -- * [ENOMEM] MAP_FIXED was specified, > -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, > - * and the range [addr,addr+len) exceeds that allowed > - * for the address space of a process; or, if MAP_FIXED was not specified > and > - * there is insufficient room in the address space to effect the mapping. > -@@ -15,7 +15,7 @@ > - * Test Step: > - * 1. Map a shared memory object, with size exceeding the value get from > - *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; > -- * 3. Should get ENOMEM. > -+ * 3. Should get ENOMEM or EINVAL. > - */ > - > - #include > -@@ -92,8 +92,8 @@ int main(void) > - (unsigned long)len); > - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, > fd, > - 0); > -- if (pa == MAP_FAILED && errno == ENOMEM) { > -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); > -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { > -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", > strerror(errno)); > - exit(PTS_PASS); > - } > - > -@@ -102,6 +102,6 @@ int main(void) > - else > - munmap(pa, len); > - close(fd); > -- printf("Test Fail: Did not get ENOMEM as expected\n"); > -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); > - return PTS_FAIL; > - } > --- > -2.7.4 > - > diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb > b/meta/recipes-extended/ltp/ltp_20200120.bb > index 38fd0f6f87..069d9c2e0b 100644 > --- a/meta/recipes-extended/ltp/ltp_20200120.bb > +++ b/meta/recipes-extended/ltp/ltp_20200120.bb > @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ > file://0004-guard-mallocopt-with-__GLIBC__.patch \ > file://0007-Fix-test_proc_kill-hanging.patch \ > > file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ > - > file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ > file://0001-Add-more-musl-exclusions.patch \ > > file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ > " > -- > 2.25.1 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch https://patchwork.ozlabs.org/comment/2012045/ Signed-off-by: Petr Vorel --- Hi, please don't deliver this patch to users, it's wrong. Kind regards, Petr ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 --- meta/recipes-extended/ltp/ltp_20200120.bb | 1 - 2 files changed, 69 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch diff --git a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch deleted file mode 100644 index d32ac1dd7c..00 --- a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Wed, 10 Oct 2018 22:07:05 -0400 -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit - -Mips will return EINVAL instead of ENOMEM as expected -if the range [addr + len) exceeds TASK_SIZE. - -Linux kernel code: arch/mips/mm/mmap.c -if (flags & MAP_FIXED) { -/* Even MAP_FIXED mappings must reside within TASK_SIZE */ -if (TASK_SIZE - len < addr) -return -EINVAL; - -Relax the condition and accept both ENOMEM and EINVAL -as expected outcome. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-October/009624.html] - -Signed-off-by: Hongzhi.Song - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -index 9cf83d9..55090a6 100644 a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -@@ -7,7 +7,7 @@ - * source tree. - * - * The mmap() function shall fail if: -- * [ENOMEM] MAP_FIXED was specified, -+ * [ENOMEM or EINVAL] MAP_FIXED was specified, - * and the range [addr,addr+len) exceeds that allowed - * for the address space of a process; or, if MAP_FIXED was not specified and - * there is insufficient room in the address space to effect the mapping. -@@ -15,7 +15,7 @@ - * Test Step: - * 1. Map a shared memory object, with size exceeding the value get from - *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED; -- * 3. Should get ENOMEM. -+ * 3. Should get ENOMEM or EINVAL. - */ - - #include -@@ -92,8 +92,8 @@ int main(void) - (unsigned long)len); - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, - 0); -- if (pa == MAP_FAILED && errno == ENOMEM) { -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno)); -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) { -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n", strerror(errno)); - exit(PTS_PASS); - } - -@@ -102,6 +102,6 @@ int main(void) - else - munmap(pa, len); - close(fd); -- printf("Test Fail: Did not get ENOMEM as expected\n"); -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n"); - return PTS_FAIL; - } --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 38fd0f6f87..069d9c2e0b 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0004-guard-mallocopt-with-__GLIBC__.patch \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \ " -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] ltp: Update to 20200120
Removed patches (accepted upstream) * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch * 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch * 0001-testcases-fix-an-absent-format-string-issue.patch * 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch Merged patches * 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (into 0001-build-Add-option-to-select-libc-implementation.patch as they touch the same files) Refreshed patches (some tests have been fixed for musl) * 0001-Add-more-musl-exclusions.patch * 0001-build-Add-option-to-select-libc-implementation.patch Updated status * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Signed-off-by: Petr Vorel --- Hi, tested only on glibc. But upstream release is tested also on MUSL (travis, via Alpine + glibc) and tested also on Buildroot (uclibc, musl, glibc). Actual list of MUSL incompatible tests is in travis/alpine.sh [1]. Kind regards, Petr [1] https://github.com/linux-test-project/ltp/blob/master/travis/alpine.sh .../ltp/0001-Add-more-musl-exclusions.patch | 32 + ...option-to-select-libc-implementation.patch | 72 --- ...udevadm-trigger-before-swap-verifica.patch | 35 - ...ix-zeros-of-the-addresses-output-by-.patch | 43 --- ...or-time64-unsafe-syscalls-before-usi.patch | 41 --- ...es-fix-an-absent-format-string-issue.patch | 24 --- ...rs-Link-with-libfts-explicitly-on-mu.patch | 47 ..._tgsigqueueinfo-disable-test-on-musl.patch | 35 - ...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++ .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 7 +- 10 files changed, 60 insertions(+), 303 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (92%) diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch index d3af31f34a..baf28bbecb 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add more musl exclusions Upstream-Status: Pending Signed-off-by: Alexander Kanavin +[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] +Signed-off-by: Petr Vorel --- testcases/kernel/syscalls/accept4/Makefile | 4 - testcases/kernel/syscalls/fanotify/Makefile | 6 ++ - testcases/kernel/syscalls/setxattr/Makefile | 4 testcases/kernel/syscalls/timer_create/Makefile | 4 4 files changed, 18 insertions(+) @@ -23,34 +23,6 @@ index 504042e11..94db06266 100644 +ifeq ($(LIBC),musl) +FILTER_OUT_MAKE_TARGETS:= accept4_01 +endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -diff --git a/testcases/kernel/syscalls/fanotify/Makefile b/testcases/kernel/syscalls/fanotify/Makefile -index 5d01b4825..0263a6e20 100644 a/testcases/kernel/syscalls/fanotify/Makefile -+++ b/testcases/kernel/syscalls/fanotify/Makefile -@@ -20,4 +20,10 @@ top_srcdir ?= ../../../.. - fanotify11: CFLAGS+=-pthread - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15 -+endif -+ - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+ -diff --git a/testcases/kernel/syscalls/setxattr/Makefile b/testcases/kernel/syscalls/setxattr/Makefile -index 72544c13e..7f20b2780 100644 a/testcases/kernel/syscalls/setxattr/Makefile -+++ b/testcases/kernel/syscalls/setxattr/Makefile -@@ -20,4 +20,8 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS:= setxattr03 -+endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..e0cd860935 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch @
Re: [OE-core] [PATCH] wic: Add include-dir option
On Thu, 27 Feb 2020 at 19:43, akuster808 wrote: > > > > On 2/27/20 12:12 AM, Martin Hundebøll wrote: > > Hi Armin, > > > > On 27/02/2020 05.26, Armin Kuster wrote: > >> This option allows for the inclusion of a single directory > >> for a partition. > > > > I am unsure how this is used in a .wks file. > Yeah, the documentation does not cover this. > > This is what I used to verified it works > > part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs > --align 4096 --exclude-path=var > part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var > --align 4096 --include-dir=var > > > > > > From the code it looks similar to the include-path option, but > > relative to the rootfs source dir instead of the wic working dir? > > the --include-path adds an entire rootfs to the partition. I don't want > the another rootfs. The help file even says that. I want on directory. > --exclude-dir allows me to "exclude" a dir . > > > I used wic ls {path to partition}:{partition number} to view the > contents of the partition. > > > > > But the include-dir value is also used in the destination path? > Then please document it and I don't mean the "help" file which is unclear. > > So how would you have "home" or "var" be in their own partitions? Please > show an example. IIRC, part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs --align 4096 --exclude-path=var part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var --align 4096 --rootfs-dir=${IMAGE_ROOTFS}/var For an example see scripts/lib/wic/canned-wks/efi-bootdisk.wks.in Thanks, Paul -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wic: Add include-dir option
On 2/27/20 12:12 AM, Martin Hundebøll wrote: > Hi Armin, > > On 27/02/2020 05.26, Armin Kuster wrote: >> This option allows for the inclusion of a single directory >> for a partition. > > I am unsure how this is used in a .wks file. Yeah, the documentation does not cover this. This is what I used to verified it works part / --source rootfs --ondisk mmcblk1 --fstype=ext4 --label rootfs --align 4096 --exclude-path=var part /var --source rootfs --ondisk mmcblk1 --fstype=ext4 --label var --align 4096 --include-dir=var > > From the code it looks similar to the include-path option, but > relative to the rootfs source dir instead of the wic working dir? the --include-path adds an entire rootfs to the partition. I don't want the another rootfs. The help file even says that. I want on directory. --exclude-dir allows me to "exclude" a dir . I used wic ls {path to partition}:{partition number} to view the contents of the partition. > > But the include-dir value is also used in the destination path? Then please document it and I don't mean the "help" file which is unclear. So how would you have "home" or "var" be in their own partitions? Please show an example. - armin > > Thanks, > Martin > >> Signed-off-by: Armin Kuster >> --- >> scripts/lib/wic/help.py | 3 +++ >> scripts/lib/wic/ksparser.py | 1 + >> scripts/lib/wic/partition.py | 1 + >> scripts/lib/wic/plugins/source/rootfs.py | 10 -- >> 4 files changed, 13 insertions(+), 2 deletions(-) >> >> diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py >> index 4d342fcf05..517f68e11e 100644 >> --- a/scripts/lib/wic/help.py >> +++ b/scripts/lib/wic/help.py >> @@ -979,6 +979,9 @@ DESCRIPTION >> copies. This option only has an effect >> with the rootfs >> source plugin. >> + --include-dir: This option is specific to wic. It adds >> the contents >> + of the given directory to the resulting >> partition. >> + >> --extra-space: This option is specific to wic. It adds extra >> space after the space filled by the content >> of the partition. The final size can go >> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py >> index 650b976223..b8abc33c87 100644 >> --- a/scripts/lib/wic/ksparser.py >> +++ b/scripts/lib/wic/ksparser.py >> @@ -138,6 +138,7 @@ class KickStart(): >> part.add_argument('--align', type=int) >> part.add_argument('--exclude-path', nargs='+') >> part.add_argument('--include-path', nargs='+') >> + part.add_argument('--include-dir') >> part.add_argument("--extra-space", type=sizetype) >> part.add_argument('--fsoptions', dest='fsopts') >> part.add_argument('--fstype', default='vfat', >> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py >> index 2d95f78439..0b735fffd9 100644 >> --- a/scripts/lib/wic/partition.py >> +++ b/scripts/lib/wic/partition.py >> @@ -31,6 +31,7 @@ class Partition(): >> self.extra_space = args.extra_space >> self.exclude_path = args.exclude_path >> self.include_path = args.include_path >> + self.include_dir = args.include_dir >> self.fsopts = args.fsopts >> self.fstype = args.fstype >> self.label = args.label >> diff --git a/scripts/lib/wic/plugins/source/rootfs.py >> b/scripts/lib/wic/plugins/source/rootfs.py >> index 705aeb5563..d1c59cab8a 100644 >> --- a/scripts/lib/wic/plugins/source/rootfs.py >> +++ b/scripts/lib/wic/plugins/source/rootfs.py >> @@ -71,7 +71,7 @@ class RootfsPlugin(SourcePlugin): >> new_rootfs = None >> # Handle excluded paths. >> - if part.exclude_path or part.include_path: >> + if part.exclude_path or part.include_path or part.include_dir: >> # We need a new rootfs directory we can delete files >> from. Copy to >> # workdir. >> new_rootfs = os.path.realpath(os.path.join(cr_workdir, >> "rootfs%d" % part.lineno)) >> @@ -79,7 +79,13 @@ class RootfsPlugin(SourcePlugin): >> if os.path.lexists(new_rootfs): >> shutil.rmtree(os.path.join(new_rootfs)) >> - copyhardlinktree(part.rootfs_dir, new_rootfs) >> + if part.include_dir: >> + src = os.path.realpath(os.path.join(part.rootfs_dir, >> part.include_dir)) >> + dst = os.path.realpath(os.path.join(new_rootfs, >> part.include_dir)) >> + copyhardlinktree(src, dst) >> + >> + else: >> + copyhardlinktree(part.rootfs_dir, new_rootfs) >> for path in part.include_path or []: >> copyhardlinktree(path, new_rootfs) >> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://l
Re: [OE-core] [PATCH] tune-cortexa72-cortexa53.inc: Adding missing TUNE_FEATURES
On Thu, Jan 23, 2020 at 3:03 PM Jaewon Lee wrote: > > Without the proper default tune in TUNE_FEATURES, certain variables > won't expand correctly. MACHINEOVERRIDES won't add cortexa72-cortexa53: > TUNE_CCARGS won't add -mtune=cortexa72.cortexa-53, generating the toolchain > incorrectly. > Adding missing 'cortexa72-cortexa53' to both > TUNE_FEATURES_tune-cortexa72-cortexa53 and > TUNE_FEATURES_tune-cortexa72-cortexa53-crypto I can confirm that this patch is required to correctly generate the tunes for cortexa72-cortexa53... did it get missed for being merged? > > Signed-off-by: Jaewon Lee > Signed-off-by: Alejandro Enedino Hernandez Samaniego > --- > meta/conf/machine/include/tune-cortexa72-cortexa53.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc > b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc > index 0d43531..f208b98 100644 > --- a/meta/conf/machine/include/tune-cortexa72-cortexa53.inc > +++ b/meta/conf/machine/include/tune-cortexa72-cortexa53.inc > @@ -14,8 +14,8 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", > "cortexa72-cortexa53", " - > AVAILTUNES += "cortexa72-cortexa53 cortexa72-cortexa53-crypto" > ARMPKGARCH_tune-cortexa72-cortexa53 = "cortexa72-cortexa53" > ARMPKGARCH_tune-cortexa72-cortexa53-crypto = "cortexa72-cortexa53" > -TUNE_FEATURES_tune-cortexa72-cortexa53 = > "${TUNE_FEATURES_tune-armv8a-crc}" > -TUNE_FEATURES_tune-cortexa72-cortexa53-crypto= > "${TUNE_FEATURES_tune-armv8a-crc-crypto}" > +TUNE_FEATURES_tune-cortexa72-cortexa53 = > "${TUNE_FEATURES_tune-armv8a-crc} cortexa72-cortexa53" > +TUNE_FEATURES_tune-cortexa72-cortexa53-crypto= > "${TUNE_FEATURES_tune-armv8a-crc-crypto} cortexa72-cortexa53" > PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53 = > "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc}cortexa72-cortexa53" > PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-crypto = > "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa72-cortexa53 > cortexa72-cortexa53-crypto" > BASE_LIB_tune-cortexa72-cortexa53= "lib64" > -- > 2.7.4 > > -- > ___ > 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] utils.bbclass: Avoid recursive symlink in oe_soinstall
On Thu, Feb 27, 2020 at 3:42 AM Eugeny Shcheglov wrote: > > >This patch look OK but it might be nice to also clean up this error > message (and the Example comment a few lines above it) to drop the 3 > levels of version number. There should only be 2, ie the fully > versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 > > Yeah, sound reasonable. According to the tLDP > (http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) > there can be be 3 levels, but last one is optional. Quote from tLDP: "The > real name adds to the soname a period, a minor > number, another period, and the release number. The last period and release > number are optional". In terms of creating symlinks there are only two levels to the version number: .so is a symlink to .so. and .so. is a symlink to a file called .so.. (and soname matches .so.). You can define the structure of to be just a minor number, a minor number and a release number, or something else it still works fine from the point of view of this function. The common case is for to just be the minor release number and I think it's clearer if the the comments and error messages for this function reflect that. > So yes, correct fully versioned name should contain at least two numbers > > >"oe_soinstall: $libname soname is equal to fully versioned real (file) name. > >The soname should include the major version only (e.g.libfoo.so.1 instead of > >libfoo.so.1.2)" > > Good point. But what if library real name is libfoo.so.1 and soname is > libfoo.so.1 too? In my opinion there is two ways: That's a case where you only need one symlink (ie .so is a symlink to a file called .so. and soname matches .so.) and it doesn't seem to have been considered when this function was originally written. I agree it's a valid use case though (and I guess trying to fix that is the original motivation behind sending this patch?). Ideally the function should be able to distinguish between needing to create a single symlink and needing to create two symlinks but the soname is incorrect... and give a meaningful error in the second case. > 1) Add one more check: parse $sonamelink and throw bbwarn if soname is > incorrect. "Incorrect" in this case means that > soname contain more than one version (libfoo.so.1.2) > > 2) Mention both possible problems in bbwarn. Like: " $libname soname is equal > to fully versioned real (file) > name. The soname should include the major version only (e.g. libfoo.so.1 > instead of libfoo.so.1.2) or minor version > should be added to library real name (e.g. libfoo.so.1.2 instead of > libfoo.so.1) ; " > > First one is definitely clearer. So I'm going to implement it and send > version 2 of patch > > On Wed, Feb 26, 2020 at 10:08 PM Andre McCurdy wrote: >> >> On Tue, Feb 25, 2020 at 6:17 AM Yevhenii Shchehlov >> wrote: >> > >> > This patch fixes an issue when oe_soinstall function creates >> > non-functional recursive symlinks in case library soname is equal >> > to library real (file) name. >> > >> > Signed-off-by: Yevhenii Shchehlov >> > --- >> > meta/classes/utils.bbclass | 8 ++-- >> > 1 file changed, 6 insertions(+), 2 deletions(-) >> > >> > diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass >> > index cd3d05709e..dea824f54f 100644 >> > --- a/meta/classes/utils.bbclass >> > +++ b/meta/classes/utils.bbclass >> > @@ -25,7 +25,7 @@ oe_soinstall() { >> > libname=`basename $1` >> > case "$libname" in >> > *.so) >> > - bbfatal "oe_soinstall: Shared library must haved versioned >> > filename (e.g. libfoo.so.1.2.3)" >> > + bbfatal "oe_soinstall: Shared library must haved versioned >> > filename (e.g. libfoo.so.1.2.3 instead of libfoo.so)" >> >> This patch look OK but it might be nice to also clean up this error >> message (and the Example comment a few lines above it) to drop the 3 >> levels of version number. There should only be 2, ie the fully >> versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 >> >> > ;; >> > esac >> > install -m 755 $1 $2/$libname >> > @@ -33,8 +33,12 @@ oe_soinstall() { >> > if [ -z $sonamelink ]; then >> > bbfatal "oe_soinstall: $libname is missing ELF tag >> > 'SONAME'." >> > fi >> > + if [ "$sonamelink" == "$libname" ]; then >> > + bbwarn "oe_soinstall: $libname soname is equal to real >> > (file) name. Minor version should be added to a real name (e.g. >> > libfoo.so.1.2 instead of libfoo.so.1)" >> >> It might be clearer to say: >> >> "oe_soinstall: $libname soname is equal to fully versioned real (file) >> name. The soname should include the major version only (e.g. >> libfoo.so.1 instead of libfoo.so.1.2)" >> >> > + else >> > + ln -sf $libname $2/$sonamelink >> > + fi >> > solink=`echo $libname | sed -e 's/\.so\..*/.so/'` >> > - ln -sf $libname $2/$sonamelink >> > ln -s
[OE-core] Bug with extensible sdk
Hi all, I am developing a custom distribution based on poky and I am creating an extensible sdk from my image, but when I install this extensible sdk, I find an error in python3 and an error in relocate.py. For my extensible sdk to work I have to install the sdk generated by populate_sdk in its default location. Do you have an idea to solve my problem? You can see raw log : SDK environment now set up; additionally you may now run devtool to perform development tasks. Run devtool --help for further details. /home/jun/poky-evbb_sdk/sysroots/x86_64-pokysdk-linux/usr/bin/python3: line 5: /home/jun/poky-evbb_sdk/sysroots/x86_64-pokysdk-linux/usr/bin/python3.7.real: No such file or directory post-relocate command "/home/jun/poky-evbb_sdk/sysroots/x86_64-pokysdk-linux/post-relocate-setup.d/meson-setup.py /home/jun/poky-evbb_sdk" failed with status 127 SDK has been successfully set up and is ready to be used. Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g. $ . /home/jun/poky-evbb_sdk/environment-setup-armv7vet2hf-neon-evbox-linux-gnueabi Best regards, Joris Offouga -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Overriding SDE_FILE
On 2/27/20 9:01 AM, Joshua Watt wrote: On 2/26/20 11:46 PM, Douglas Royds wrote: On 26/02/20 4:53 am, Jacob Kroon wrote: On 2/24/20 8:25 AM, Jacob Kroon wrote: Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. * * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. After a discussion with Richard, we figured out why SOURCE_DATE_EPOCH has to be whitelisted. The value of the variable *must* be calculable at parse time before any task is ran, but in practice it's value is only available once the __source_date_epoch.txt file is present, which is after parsing. This causes the taskhash to be calculated differently during parsing and task execution which causes taskhash mismatch errors. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [wpe-webkit] [PATCH 08/10] webkitgtk: unbreak wayland build
On 23/02/2020 15:33, Joshua Watt wrote: > On Sun, Feb 16, 2020 at 2:52 PM Alexander Kanavin > wrote: >> >> On Sun, 16 Feb 2020 at 21:15, Khem Raj wrote: >>> >>> On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin >>> wrote: webkit nowadays requires a couple of supplementary libraries for this, so bring them in (courtesy of meta-browser, which will hopefully adjust without a lot of trouble). >>> >>> its not meta-browser, I guess you should credit meta-wpe here [1] >>> and perhaps Cc the meta-wpe maintainer as a courtesy. >> >> >> Actually, it's copied from meta-webkit >> https://github.com/Igalia/meta-webkit/ >> which does not say in the readme who the maintainer is, so I am not sure >> whom to CC. >> I can adjust the commit msg though. > > I've CC'd the WPE mailing list. > > OE-core now has libwpe and wpebackend-fdo recipes. They should > possibly be removed from meta-webkit to prevent duplication. > Thanks for the notification. Its great that those recipes are shipped now on the oe-core layer. But I don't want to remove those recipes from meta-webkit, even if they are shipped now there. That recipes are an essential part of meta-webkit, so I want to be able to raise the version or change them without depending on oe-core. For example: sometimes we need to use older versions of yocto, but we still want to use the last stable version of wpe/libwpe/wpebackend-fdo. So I find pretty useful to have all the core WPE related recipes on the meta-webkit layer and not depend on whatever oe-core ships. There should be no conflict between the recipes as long as the name used for them its the same, bitbake should simply pick the last version by default. Regards. signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libgpg-error: upgrade 1.36 -> 1.37
Looks like I got beat by a day! On 2/26/20 1:39 PM, Trevor Gamblin wrote: https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported patch is removed. Signed-off-by: Trevor Gamblin --- .../libgpg-error-1.36-gawk5-support.patch | 144 -- ...gpg-error_1.36.bb => libgpg-error_1.37.bb} | 5 +- 2 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch deleted file mode 100644 index b936d1143b..00 --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch +++ /dev/null @@ -1,144 +0,0 @@ -Upstream-Status: Backport [https://dev.gnupg.org/T4459] -Signed-off-by: Khem Raj - -From 7865041c77f4f7005282f10f9bb19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am| 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk| 2 +- - src/mkerrcodes2.awk| 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +- - 7 files changed, 11 insertions(+), 11 deletions(-) - a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print "" pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.3
Re: [OE-core] [wpe-webkit] [PATCH 08/10] webkitgtk: unbreak wayland build
On Thu, Feb 27, 2020, 9:49 AM Carlos Alberto Lopez Perez wrote: > On 23/02/2020 15:33, Joshua Watt wrote: > > On Sun, Feb 16, 2020 at 2:52 PM Alexander Kanavin > > wrote: > >> > >> On Sun, 16 Feb 2020 at 21:15, Khem Raj wrote: > >>> > >>> On Sun, Feb 16, 2020 at 7:52 AM Alexander Kanavin > >>> wrote: > > webkit nowadays requires a couple of supplementary libraries for this, > so bring them in (courtesy of meta-browser, which will hopefully > adjust without a lot of trouble). > >>> > >>> its not meta-browser, I guess you should credit meta-wpe here [1] > >>> and perhaps Cc the meta-wpe maintainer as a courtesy. > >> > >> > >> Actually, it's copied from meta-webkit > >> https://github.com/Igalia/meta-webkit/ > >> which does not say in the readme who the maintainer is, so I am not > sure whom to CC. > >> I can adjust the commit msg though. > > > > I've CC'd the WPE mailing list. > > > > OE-core now has libwpe and wpebackend-fdo recipes. They should > > possibly be removed from meta-webkit to prevent duplication. > > > > > Thanks for the notification. Its great that those recipes are shipped > now on the oe-core layer. > > But I don't want to remove those recipes from meta-webkit, even if they > are shipped now there. > > That recipes are an essential part of meta-webkit, so I want to be able > to raise the version or change them without depending on oe-core. > For example: sometimes we need to use older versions of yocto, but we > still want to use the last stable version of wpe/libwpe/wpebackend-fdo. > So I find pretty useful to have all the core WPE related recipes on the > meta-webkit layer and not depend on whatever oe-core ships. > > There should be no conflict between the recipes as long as the name used > for them its the same, bitbake should simply pick the last version by > default. > The version compare actually only matters for recipes in the same layer; if multiple layers provide the same recipe, the priority of the layers is what determines which one gets chosen (even if that means an older version in a higher priority layer would be chosen over a newer version in a lower priority layer). Anyway, you should be fine because meta-webkit has a priority of 7 and oe-core is priority 5, so it will always choose the meta-webkit version, if that layer is present. > > Regards. > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Overriding SDE_FILE
On 2/26/20 11:46 PM, Douglas Royds wrote: On 26/02/20 4:53 am, Jacob Kroon wrote: On 2/24/20 8:25 AM, Jacob Kroon wrote: Hi Douglas, You updated a comment in reproducible_build.bbclass, commit e7b891b76954c784f5a93bd0a1c91315673ce40d: -# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's ${SDE_FILE}. +# Once the value of SOURCE_DATE_EPOCH is determined, it is stored in the recipe's SDE_FILE. +# If none of these mechanisms are suitable, replace the do_deploy_source_date_epoch task +# with recipe-specific functionality to write the appropriate SOURCE_DATE_EPOCH into the SDE_FILE. +# But I can't really get this to work. What did work for me was to replace "do_create_source_date_epoch_stamp()" in my recipe: do_create_source_date_epoch_stamp() { mkdir -p ${SDE_DIR} date -d "1981-03-03" "+%s" > ${SDE_FILE} } What is the intended way to achieve the thing I'm trying to do here ? FYI, JPEW has a proposed patch here http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=jpew/reproducible&id=d091d2aa53ea417f70c10f5ce89151820c3db9ce for allowing a recipe to just set SOURCE_DATE_EPOCH directly. But maybe that currently is at odds with SOURCE_DATE_EPOCH being in BB_HASHBASE_WHITELIST ? /Jacob On the surface of it, my comment appears to be just wrong: It does make sense to replace do_create_source_date_epoch_stamp() as you suggest. Joshua's proposed patch looks promising: * Should the new function not be called first, so that it takes priority over the git, known files, and youngest file functions? If someone has explicitly set SOURCE_DATE_EPOCH, then they want it to take priority. Having that be the first option makes sense. The only case in which that might not work, is if a recipe does something like: SOURCE_DATE_EPOCH = "${@my_awesome_sde_calculation(d)}" e.g. uses a function to get the SDE instead of setting to a fixed value, but that's probably going to be extremely rare. * * As you observe, SOURCE_DATE_EPOCH would need to be removed from BB_HASHBASE_WHITELIST. I'm not sure why it was in the whitelist in the first place. I'm not sure why exactly it is whitelisted; I didn't write the original code that whitelisted it, but I've CC'd Juro in case he happens to remember. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] utils.bbclass: Avoid recursive symlink in oe_soinstall
On Tue, 2020-02-25 at 16:17 +0200, Yevhenii Shchehlov wrote: > This patch fixes an issue when oe_soinstall function creates > non-functional recursive symlinks in case library soname is equal > to library real (file) name. > > Signed-off-by: Yevhenii Shchehlov > --- > meta/classes/utils.bbclass | 8 ++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass > index cd3d05709e..dea824f54f 100644 > --- a/meta/classes/utils.bbclass > +++ b/meta/classes/utils.bbclass > @@ -25,7 +25,7 @@ oe_soinstall() { > libname=`basename $1` > case "$libname" in > *.so) > - bbfatal "oe_soinstall: Shared library must haved versioned > filename (e.g. libfoo.so.1.2.3)" > + bbfatal "oe_soinstall: Shared library must haved versioned > filename (e.g. libfoo.so.1.2.3 instead of > libfoo.so)" > ;; > esac > install -m 755 $1 $2/$libname > @@ -33,8 +33,12 @@ oe_soinstall() { > if [ -z $sonamelink ]; then > bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." > fi > + if [ "$sonamelink" == "$libname" ]; then ^^ == is a bashism, please use only one (1) = Cheers, Andre' > + bbwarn "oe_soinstall: $libname soname is equal to real (file) > name. Minor version should be added to a > real name (e.g. libfoo.so.1.2 instead of libfoo.so.1)" > + else > + ln -sf $libname $2/$sonamelink > + fi > solink=`echo $libname | sed -e 's/\.so\..*/.so/'` > - ln -sf $libname $2/$sonamelink > ln -sf $libname $2/$solink > } > > -- > 2.25.1 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe
On Thu, 27 Feb 2020 at 14:28, Adrian Bunk wrote: > >... > > It is a crypto library with a history of unfixed CVEs in supported > stable Yocto releases. > If the issue is unfixed CVEs, then I do not think it's particularly relevant which layer the recipe is in. Stable release maintainers are not expected to 'track and fix CVEs', that one is on users. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH 1/2] nss: Move to meta-oe
On Mon, Feb 24, 2020 at 08:32:24AM -0800, akuster808 wrote: >... > On 2/23/20 9:17 PM, Adrian Bunk wrote: > > On Sun, Feb 23, 2020 at 04:25:18PM -0800, Khem Raj wrote: > >> On Sun, Feb 23, 2020 at 11:34 AM Adrian Bunk wrote: > >>> rpm was the last user in OE-core. > >> we should also assess external dependencies especially on libraries, > >> there might be layers which do not depend on meta-oe but use nss > >> or enable nss packageconfigs in core components like curl. > >> ... > > Is providing a crypto library in OE-core without providing security > > support better than not shipping it? > > > > nss in warrior seems to lack fixes for at least 5 CVEs. > > I don't see how that is relevant to the RFC? >... It is a crypto library with a history of unfixed CVEs in supported stable Yocto releases. > - armin cu Adrian -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [zeus][PATCH 1/1] dhcp: Fix REQUIRE(ctx->running) assertion triggered on SIGTERM/SIGINT
Closed a small window of time between the installation of graceful shutdown signal handlers and application context startup, during which the receipt of shutdown signal would cause a REQUIRE() assertion to occur. Note this issue is only visible when compiling with ENABLE_GENTLE_SHUTDOWN defined. Reference: https://gitlab.isc.org/isc-projects/dhcp/issues/53 Upstream patches: https://gitlab.isc.org/isc-projects/dhcp/commit/ce117de7a1ed3c4911b4009c1cc23fba85370a26 https://gitlab.isc.org/isc-projects/dhcp/commit/dbd36dfa82956b53683462afadfabb1b33fa3dd1 https://gitlab.isc.org/isc-projects/dhcp/commit/95944cab6035d20be270eec01254c7bb867ec705 Signed-off-by: Ovidiu Panait --- ...s-running-prior-to-calling-isc_app_c.patch | 165 ++ ...ed-shutdown-log-statment-to-dhcrelay.patch | 29 +++ .../dhcp/0003-Addressed-review-comment.patch | 31 meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb | 3 + 4 files changed, 228 insertions(+) create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch new file mode 100644 index 00..34b2ae1e5c --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch @@ -0,0 +1,165 @@ +From f369dbb9e67eb5ef336944af63039b6d8f838384 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Thu, 12 Sep 2019 10:35:46 -0400 +Subject: [PATCH 1/3] Ensure context is running prior to calling + isc_app_ctxsuspend + +Add a release note. + +includes/omapip/isclib.h +Added actx_running flag to global context, dhcp_gbl_ctx + +omapip/isclib.c +set_ctx_running() - new function used as the ctxonrun callback + +dhcp_context_create() - installs set_ctx_running callback + +dhcp_signal_handler() - modified to use act_running flag to +determine is context is running and should be suspended + +Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] + +Signed-off-by: Ovidiu Panait +--- + RELNOTES | 7 + + includes/omapip/isclib.h | 3 ++- + omapip/isclib.c | 57 +--- + 3 files changed, 57 insertions(+), 10 deletions(-) + +diff --git a/RELNOTES b/RELNOTES +index f10305d..1730473 100644 +--- a/RELNOTES b/RELNOTES +@@ -6,6 +6,13 @@ + + NEW FEATURES + ++- Closed a small window of time between the installation of graceful ++ shutdown signal handlers and application context startup, during which ++ the receipt of shutdown signal would cause a REQUIRE() assertion to ++ occur. Note this issue is only visible when compiling with ++ ENABLE_GENTLE_SHUTDOWN defined. ++ [Gitlab #53,!18 git TBD] ++ + Please note that that ISC DHCP is now licensed under the Mozilla Public License, + MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0 + license terms. +diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h +index 6c20584..af6a6fc 100644 +--- a/includes/omapip/isclib.h b/includes/omapip/isclib.h +@@ -94,7 +94,8 @@ + typedef struct dhcp_context { + isc_mem_t *mctx; + isc_appctx_t*actx; +- int actx_started; ++ int actx_started; // ISC_TRUE if ctxstart has been called ++ int actx_running; // ISC_TRUE if ctxrun has been called + isc_taskmgr_t *taskmgr; + isc_task_t *task; + isc_socketmgr_t *socketmgr; +diff --git a/omapip/isclib.c b/omapip/isclib.c +index ce4b4a1..73e017c 100644 +--- a/omapip/isclib.c b/omapip/isclib.c +@@ -134,6 +134,35 @@ handle_signal(int sig, void (*handler)(int)) { + } + } + ++/* Callback passed to isc_app_ctxonrun ++ * ++ * BIND9 context code will invoke this handler once the context has ++ * entered the running state. We use it to set a global marker so that ++ * we can tell if the context is running. Several of the isc_app_ ++ * calls REQUIRE that the context is running and we need a way to ++ * know that. ++ * ++ * We also check to see if we received a shutdown signal prior to ++ * the context entering the run state. If we did, then we can just ++ * simply shut the context down now. This closes the relatively ++ * small window between start up and entering run via the call ++ * to dispatch(). ++ * ++ */ ++static void ++set_ctx_running(isc_task_t *task, isc_event_t *event) { ++task = task; // unused; ++ dhcp_gbl_ctx.actx_running = ISC_TRUE; ++ ++ if (shutdown_signal) { ++ // We got signaled shutdown before we entered
Re: [OE-core] [PATCH] utils.bbclass: Avoid recursive symlink in oe_soinstall
>This patch look OK but it might be nice to also clean up this error message (and the Example comment a few lines above it) to drop the 3 levels of version number. There should only be 2, ie the fully versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 Yeah, sound reasonable. According to the tLDP ( http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html) there can be be 3 levels, but last one is optional. Quote from tLDP: *"The real name adds to the soname a period, a minor * *number, another period, and the release number. The last period and release number are optional". * So yes, correct fully versioned name should contain at least two numbers >"oe_soinstall: $libname soname is equal to fully versioned real (file) name. The soname should include the major version only (e.g.libfoo.so.1 instead of libfoo.so.1.2)" Good point. But what if library real name is libfoo.so.1 and soname is libfoo.so.1 too? In my opinion there is two ways: 1) Add one more check: parse $sonamelink and throw bbwarn if soname is incorrect. "Incorrect" in this case means that soname contain more than one version (libfoo.so.1.2) 2) Mention both possible problems in bbwarn. Like: " $libname soname is equal to fully versioned real (file) name. The soname should include the major version only (e.g. libfoo.so.1 instead of libfoo.so.1.2) or minor version should be added to library real name (e.g. libfoo.so.1.2 instead of libfoo.so.1) ; " First one is definitely clearer. So I'm going to implement it and send version 2 of patch On Wed, Feb 26, 2020 at 10:08 PM Andre McCurdy wrote: > On Tue, Feb 25, 2020 at 6:17 AM Yevhenii Shchehlov > wrote: > > > > This patch fixes an issue when oe_soinstall function creates > > non-functional recursive symlinks in case library soname is equal > > to library real (file) name. > > > > Signed-off-by: Yevhenii Shchehlov > > --- > > meta/classes/utils.bbclass | 8 ++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass > > index cd3d05709e..dea824f54f 100644 > > --- a/meta/classes/utils.bbclass > > +++ b/meta/classes/utils.bbclass > > @@ -25,7 +25,7 @@ oe_soinstall() { > > libname=`basename $1` > > case "$libname" in > > *.so) > > - bbfatal "oe_soinstall: Shared library must haved > versioned filename (e.g. libfoo.so.1.2.3)" > > + bbfatal "oe_soinstall: Shared library must haved > versioned filename (e.g. libfoo.so.1.2.3 instead of libfoo.so)" > > This patch look OK but it might be nice to also clean up this error > message (and the Example comment a few lines above it) to drop the 3 > levels of version number. There should only be 2, ie the fully > versioned filename would be libfoo.so.1.2 instead of libfoo.so.1.2.3 > > > ;; > > esac > > install -m 755 $1 $2/$libname > > @@ -33,8 +33,12 @@ oe_soinstall() { > > if [ -z $sonamelink ]; then > > bbfatal "oe_soinstall: $libname is missing ELF tag > 'SONAME'." > > fi > > + if [ "$sonamelink" == "$libname" ]; then > > + bbwarn "oe_soinstall: $libname soname is equal to real > (file) name. Minor version should be added to a real name (e.g. > libfoo.so.1.2 instead of libfoo.so.1)" > > It might be clearer to say: > > "oe_soinstall: $libname soname is equal to fully versioned real (file) > name. The soname should include the major version only (e.g. > libfoo.so.1 instead of libfoo.so.1.2)" > > > + else > > + ln -sf $libname $2/$sonamelink > > + fi > > solink=`echo $libname | sed -e 's/\.so\..*/.so/'` > > - ln -sf $libname $2/$sonamelink > > ln -sf $libname $2/$solink > > } > > > > -- > > 2.25.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] [meta-clang][PATCH] conf/nonclangable.conf: Always build mesa with gcc
2020. 02. 27. 8:44 keltezéssel, Khem Raj írta: Can you send it via github pull request please Sure. On Wed, Feb 26, 2020 at 10:21 PM Böszörményi Zoltán via Openembedded-core wrote: Ignore this, the patch is against the zeus branch. Re-sent with the proper subject. 2020. 02. 27. 7:16 keltezéssel, Böszörményi Zoltán írta: Building mesa (at least version 19.3.4) with clang 9.0.1 leads to linker errors on x86/x86-64: "undefined reference to `typeinfo for llvm::raw_pwrite_stream'" in libvulkan_radeon.so and "undefined reference to `typeinfo for llvm::RTDyldMemoryManager'" in libgallium.a. It was reported at https://gitlab.freedesktop.org/mesa/mesa/issues/2533 It seems it is related to rtti not being enabled, at least reports from a few years ago on forums lead to that conclusion. But enabling rtti for clang in PACKAGECONFIG doesn't help. Just build mesa with gcc, it fixes the linker errors. Signed-off-by: Böszörményi Zoltán --- conf/nonclangable.conf | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf index 70336bb..91b9965 100644 --- a/conf/nonclangable.conf +++ b/conf/nonclangable.conf @@ -45,10 +45,9 @@ TOOLCHAIN_pn-libssp-nonshared = "gcc" TOOLCHAIN_pn-libstd-rs = "gcc" TOOLCHAIN_pn-m4_powerpc = "gcc" # clang does not have 64bit atomics on mips32 -TOOLCHAIN_pn-mesa_mips = "gcc" -TOOLCHAIN_pn-mesa_mipsel = "gcc" -TOOLCHAIN_pn-mesa_riscv64 = "gcc" -TOOLCHAIN_pn-mesa_powerpc = "gcc" +# building Mesa 19.3.x with clang causes linker errors on x86/x86-64 +# See https://gitlab.freedesktop.org/mesa/mesa/issues/2533 +TOOLCHAIN_pn-mesa = "gcc" # multiple definition of 'mongo::error_details::isNamedCode<0>' TOOLCHAIN_pn-mongodb = "gcc" # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments -- ___ 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] wic: Add include-dir option
Hi Armin, On 27/02/2020 05.26, Armin Kuster wrote: This option allows for the inclusion of a single directory for a partition. I am unsure how this is used in a .wks file. From the code it looks similar to the include-path option, but relative to the rootfs source dir instead of the wic working dir? But the include-dir value is also used in the destination path? Thanks, Martin Signed-off-by: Armin Kuster --- scripts/lib/wic/help.py | 3 +++ scripts/lib/wic/ksparser.py | 1 + scripts/lib/wic/partition.py | 1 + scripts/lib/wic/plugins/source/rootfs.py | 10 -- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 4d342fcf05..517f68e11e 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -979,6 +979,9 @@ DESCRIPTION copies. This option only has an effect with the rootfs source plugin. + --include-dir: This option is specific to wic. It adds the contents +of the given directory to the resulting partition. + --extra-space: This option is specific to wic. It adds extra space after the space filled by the content of the partition. The final size can go diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 650b976223..b8abc33c87 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -138,6 +138,7 @@ class KickStart(): part.add_argument('--align', type=int) part.add_argument('--exclude-path', nargs='+') part.add_argument('--include-path', nargs='+') +part.add_argument('--include-dir') part.add_argument("--extra-space", type=sizetype) part.add_argument('--fsoptions', dest='fsopts') part.add_argument('--fstype', default='vfat', diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 2d95f78439..0b735fffd9 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -31,6 +31,7 @@ class Partition(): self.extra_space = args.extra_space self.exclude_path = args.exclude_path self.include_path = args.include_path +self.include_dir = args.include_dir self.fsopts = args.fsopts self.fstype = args.fstype self.label = args.label diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 705aeb5563..d1c59cab8a 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -71,7 +71,7 @@ class RootfsPlugin(SourcePlugin): new_rootfs = None # Handle excluded paths. -if part.exclude_path or part.include_path: +if part.exclude_path or part.include_path or part.include_dir: # We need a new rootfs directory we can delete files from. Copy to # workdir. new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) @@ -79,7 +79,13 @@ class RootfsPlugin(SourcePlugin): if os.path.lexists(new_rootfs): shutil.rmtree(os.path.join(new_rootfs)) -copyhardlinktree(part.rootfs_dir, new_rootfs) +if part.include_dir: +src = os.path.realpath(os.path.join(part.rootfs_dir, part.include_dir)) +dst = os.path.realpath(os.path.join(new_rootfs, part.include_dir)) +copyhardlinktree(src, dst) + +else: +copyhardlinktree(part.rootfs_dir, new_rootfs) for path in part.include_path or []: copyhardlinktree(path, new_rootfs) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] go: Update to 1.14 release series
Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++-- ...ow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...ent-based-hash-generation-less-pedan.patch | 33 +++-- ...-to-be-overridden-in-the-environment.patch | 11 +- ...4-ld-add-soname-to-shareable-objects.patch | 11 ++ ...de-CC-when-building-dist-and-go_boot.patch | 9 + ...dist-separate-host-and-target-builds.patch | 37 --- ...d-go-make-GOROOT-precious-by-default.patch | 23 ...008-use-GOBUILDMODE-to-set-buildmode.patch | 9 + ...place-glibc-dynamic-linker-with-musl.patch | 23 +--- ...dian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 ...o-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../{go-native_1.13.bb => go-native_1.14.bb} | 0 ...{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../go/{go_1.13.bb => go_1.14.bb} | 0 17 files changed, 53 insertions(+), 120 deletions(-) rename meta/recipes-devtools/go/{go-1.13.inc => go-1.14.inc} (81%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (83%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0004-ld-add-soname-to-shareable-objects.patch (82%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0006-cmd-dist-separate-host-and-target-builds.patch (95%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0007-cmd-go-make-GOROOT-precious-by-default.patch (79%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0008-use-GOBUILDMODE-to-set-buildmode.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0009-ld-replace-glibc-dynamic-linker-with-musl.patch (79%) rename meta/recipes-devtools/go/{go-cross-canadian_1.13.bb => go-cross-canadian_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.13.bb => go-cross_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.13.bb => go-native_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.13.bb => go-runtime_1.14.bb} (100%) rename meta/recipes-devtools/go/{go_1.13.bb => go_1.14.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index e957e3a9bb..31d4b3b854 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31" LINUXLIBCVERSION ?= "5.4%" QEMUVERSION ?= "4.2%" -GOVERSION ?= "1.13%" +GOVERSION ?= "1.14%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "9.0.1" diff --git a/meta/recipes-devtools/go/go-1.13.inc b/meta/recipes-devtools/go/go-1.14.inc similarity index 81% rename from meta/recipes-devtools/go/go-1.13.inc rename to meta/recipes-devtools/go/go-1.14.inc index 7780aced89..ac7b95cf03 100644 --- a/meta/recipes-devtools/go/go-1.13.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -1,7 +1,7 @@ require go-common.inc -GO_BASEVERSION = "1.13" -GO_MINOR = ".8" +GO_BASEVERSION = "1.14" +GO_MINOR = "" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -19,5 +19,5 @@ SRC_URI += "\ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" -SRC_URI[main.md5sum] = "984c244563f2d2f48103e8d6db8a8308" -SRC_URI[main.sha256sum] = "b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34" +SRC_URI[main.md5sum] = "7c97bdb3b5218a5089612efb3ed30345" +SRC_URI[main.sha256sum] = "6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389" diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch similarity index 85% rename from meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch rename to meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch index ddfd5e41d1..d47664d8e2 100644 --- a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch +++ b/meta/recipes-devtools/go/go-1.14/0001-allow-CC-and-CXX-to-have-multiple-words.patch @@ -15,11 +15,9 @@ Signed-off-by: Alexander J Kube src/cmd/go/internal/envcmd/env.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff
[OE-core] [PATCH 3/4] systemd: Drop local time64 patch in favour of upstreamed patches
https://github.com/systemd/systemd/commit/9e7c8f64cfda101496f56f5546097221e8ad5d6a https://github.com/systemd/systemd/commit/601f91bec5646a9c6fbd4f1ec5f1b4ae28d3a770 Fixed this issue upstream and they are present in 244 release Signed-off-by: Khem Raj --- ...ead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 --- meta/recipes-core/systemd/systemd_244.3.bb| 3 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch deleted file mode 100644 index 33c575871c..00 --- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Dec 2019 12:49:07 -0800 -Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout - -kernel prior to 64bit time_t support might not entertain such large -timeout therefore reduce it to INT_MAX which would set timer expiration -event after 68 years of uptime, should be good for all practical -purposes - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Upstream-Status: Pending - - src/basic/time-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index d7ef30d2fe52..4d3219f114b5 100644 a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -1487,7 +1487,7 @@ int time_change_fd(void) { - - /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ - static const struct itimerspec its = { --.it_value.tv_sec = TIME_T_MAX, -+.it_value.tv_sec = INT_MAX, - }; - - _cleanup_close_ int fd; diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index e7d2997963..dfb7ad59c0 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -17,9 +17,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ + file://99-default.preset \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ - file://99-default.preset \ " # patches needed by musl @@ -42,7 +42,6 @@ SRC_URI_MUSL = "\ file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch \ file://0024-test-json.c-define-M_PIl.patch \ file://0001-do-not-disable-buffer-in-writing-files.patch \ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] systemd: Do not force removing resolved from PACKAGECONFIG
This needs __UAPI_DEF_ETHHDR to be set to 0 which now taken care by CFLAGS Signed-off-by: Khem Raj --- meta/recipes-core/systemd/systemd_244.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 5d863410b8..e7d2997963 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -98,12 +98,13 @@ PACKAGECONFIG_remove_libc-musl = " \ nss \ nss-mymachines \ nss-resolve \ -resolved \ smack \ sysusers \ utmp \ " +CFLAGS_append_libc-musl = "-D__UAPI_DEF_ETHHDR=0 " + # Use the upstream systemd serial-getty@.service and rely on # systemd-getty-generator instead of using the OE-core specific # systemd-serialgetty.bb - not enabled by default. -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR
__UAPI_DEF_ETHHDR has been defined in kernel UAPI [1] and musl already defined it to 0 via [2] So these patches can now be dropped. [1] https://patchwork.ozlabs.org/patch/872502/ [2] https://git.musl-libc.org/cgit/musl/commit/?id=b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Signed-off-by: Khem Raj Cc: Bruce Ashfield --- ...muslc-ethhdr-protection-to-uapi-file.patch | 31 --- ...revent-redefinition-of-struct-ethhdr.patch | 30 -- .../linux-libc-headers_5.4.bb | 2 -- 3 files changed, 63 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch deleted file mode 100644 index 68b244698f..00 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 897736166fd709906a5fdf16eb23f8fddff770b5 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 1 Mar 2018 18:31:01 -0500 -Subject: [PATCH] if_ether: move muslc ethhdr protection to uapi file - -Signed-off-by: Bruce Ashfield -Upstream-Status: Pending - include/uapi/linux/if_ether.h | 6 ++ - 1 file changed, 6 insertions(+) - -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index 153c9c2..7b69b73 100644 a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h -@@ -149,6 +149,12 @@ - *This is an Ethernet frame header. - */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* allow libcs like musl to deactivate this, glibc does not implement this. */ - #ifndef __UAPI_DEF_ETHHDR - #define __UAPI_DEF_ETHHDR 1 --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch deleted file mode 100644 index fb7e1de17a..00 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 75ba4a547282f91d653872a4bba5f5eae234ea6c Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Wed, 22 Jan 2014 00:57:48 +0100 -Subject: [PATCH 2/3] libc-compat.h: prevent redefinition of struct ethhdr - -Signed-off-by: Khem Raj -Upstream-Status: Submitted - - include/uapi/linux/if_ether.h| 4 +++- - include/uapi/linux/libc-compat.h | 6 ++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -Index: linux-4.15/include/uapi/linux/libc-compat.h -=== linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 -+++ linux-4.15/include/uapi/linux/libc-compat.h2018-02-05 17:40:42.334370603 -0500 -@@ -51,6 +51,12 @@ - - #ifndef __KERNEL__ /* we're used from userspace */ - -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb index 50377394f3..8a12103ee5 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb @@ -2,10 +2,8 @@ require linux-libc-headers.inc SRC_URI_append_libc-musl = "\ file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ -file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ -file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Upgrade go to 1.16, kernel-headers and systemd fixes for musl
go 1.14 was just released, it seems to be an easy one to upgrade drop couple of musl-only linux-libc-headers patches, glibc should be unaffected Enable resolved in systemd for musl now that we can compile it Drop local patch to enable 64bit time_t in favor of backports Khem Raj (4): linux-libc-headers: Drop patches manipulating __UAPI_DEF_ETHHDR systemd: Do not force removing resolved from PACKAGECONFIG systemd: Drop local time64 patch in favour of upstreamed patches go: Update to 1.14 release series meta/conf/distro/include/tcmode-default.inc | 2 +- ...ead-of-TIME_T_MAX-for-timerfd_settim.patch | 31 meta/recipes-core/systemd/systemd_244.3.bb| 6 +-- .../go/{go-1.13.inc => go-1.14.inc} | 8 ++-- ...ow-CC-and-CXX-to-have-multiple-words.patch | 7 +--- ...ent-based-hash-generation-less-pedan.patch | 33 +++-- ...-to-be-overridden-in-the-environment.patch | 11 +- ...4-ld-add-soname-to-shareable-objects.patch | 11 ++ ...de-CC-when-building-dist-and-go_boot.patch | 9 + ...dist-separate-host-and-target-builds.patch | 37 --- ...d-go-make-GOROOT-precious-by-default.patch | 23 ...008-use-GOBUILDMODE-to-set-buildmode.patch | 9 + ...place-glibc-dynamic-linker-with-musl.patch | 23 +--- ...dian_1.13.bb => go-cross-canadian_1.14.bb} | 0 .../go/{go-cross_1.13.bb => go-cross_1.14.bb} | 0 ...o-crosssdk_1.13.bb => go-crosssdk_1.14.bb} | 0 .../{go-native_1.13.bb => go-native_1.14.bb} | 0 ...{go-runtime_1.13.bb => go-runtime_1.14.bb} | 0 .../go/{go_1.13.bb => go_1.14.bb} | 0 ...muslc-ethhdr-protection-to-uapi-file.patch | 31 ...revent-redefinition-of-struct-ethhdr.patch | 30 --- .../linux-libc-headers_5.4.bb | 2 - 22 files changed, 56 insertions(+), 217 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch rename meta/recipes-devtools/go/{go-1.13.inc => go-1.14.inc} (81%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0001-allow-CC-and-CXX-to-have-multiple-words.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch (83%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0004-ld-add-soname-to-shareable-objects.patch (82%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch (88%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0006-cmd-dist-separate-host-and-target-builds.patch (95%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0007-cmd-go-make-GOROOT-precious-by-default.patch (79%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0008-use-GOBUILDMODE-to-set-buildmode.patch (85%) rename meta/recipes-devtools/go/{go-1.13 => go-1.14}/0009-ld-replace-glibc-dynamic-linker-with-musl.patch (79%) rename meta/recipes-devtools/go/{go-cross-canadian_1.13.bb => go-cross-canadian_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.13.bb => go-cross_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.13.bb => go-crosssdk_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.13.bb => go-native_1.14.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.13.bb => go-runtime_1.14.bb} (100%) rename meta/recipes-devtools/go/{go_1.13.bb => go_1.14.bb} (100%) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch -- 2.25.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core