Re: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120
On 2/28/20 4:08 AM, Petr Vorel wrote: Hi Richard, Changes v3->v4: * Fix musl build with LIBS=-lfts Unfortunately the musl build is still failing with this version: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 Any idea, how to fix it? libcgroup uses the same flag LIBS=-lfts. Maybe the variable isn't propagated. Or is the dependency expressed enough? DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " I'll have to put back patch 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch, but that's bad, buildroot works without it. yeah in OE we fixed it differently so far, by patching makefiles, but I agree its perhaps suboptimal since the patch will not go upstream, we should pass -lfts via LIBS to configure Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120
On Fri, 2020-02-28 at 13:08 +0100, Petr Vorel wrote: > Hi Richard, > > > > Changes v3->v4: > > > * Fix musl build with LIBS=-lfts > > Unfortunately the musl build is still failing with this version: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 > > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 > Any idea, how to fix it? libcgroup uses the same flag LIBS=-lfts. > Maybe the variable isn't propagated. > Or is the dependency expressed enough? > > DEPENDS_append_libc-musl = " fts " > EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " > > I'll have to put back patch > 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch, but > that's bad, buildroot works without it. I have to admit I haven't looked in detail at the issue. These builds are proving a bit tricky to sort out as there are so many issues with different patches. It will be later today before I could think about that. I'm hoping Khem may have more ideas. Unfortunately there is a second ltp issue (non-musl): https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/574 It would be nice to move to the new version and drop some of the patches for 3.1... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120
Hi Richard, > > Changes v3->v4: > > * Fix musl build with LIBS=-lfts > Unfortunately the musl build is still failing with this version: > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 Any idea, how to fix it? libcgroup uses the same flag LIBS=-lfts. Maybe the variable isn't propagated. Or is the dependency expressed enough? DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " I'll have to put back patch 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch, but that's bad, buildroot works without it. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120
On Fri, 2020-02-28 at 07:12 +0100, Petr Vorel wrote: > 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 Unfortunately the musl build is still failing with this version: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 Cheers, Richard -- ___ 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
---
