From 1ace31aec59dc06375ba192b5838c4cc99072e81 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sun, 16 Apr 2023 22:17:05 +0200 Subject: [PATCH] package/ltp-testsuite: bump version to 20230127 Backport mount_attr fix for glibc-based toolchain. Fixes: - http://autobuild.buildroot.org/results/4dbb72e1bf081afd3cd944571b9beeefc7608865 Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- ...onfigure.ac-fix-mount_attr-detection.patch | 54 +++++++++++++++++++ package/ltp-testsuite/ltp-testsuite.hash | 5 +- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch diff --git a/package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch b/package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch new file mode 100644 index 0000000000..740d3a6d6a --- /dev/null +++ b/package/ltp-testsuite/0001-configure.ac-fix-mount_attr-detection.patch @@ -0,0 +1,54 @@ +From 30353a1eb3ee8940f38d6a0e8f5f39352fd8a179 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:25:54 +0100 +Subject: [PATCH] configure.ac: fix mount_attr detection +Upstream: https://github.com/linux-test-project/ltp/commit/30353a1eb3ee8940f38d6a0e8f5f39352fd8a179 + +Commit b857f8723f30a4b9554bf6b0ff8fa52fd07e8b60 tried to fix build with +latest glibc which provides mount_attr in sys/mount.h. Unfortunately, +the following build failure is still raised because sys/mount is now +unconditionally included in include/lapi/fsmount.h: + +In file included from fsconfig01.c:9: +../../../../include/lapi/fsmount.h:55:8: error: redefinition of 'struct mount_attr' + 55 | struct mount_attr { + | ^~~~~~~~~~ +In file included from ../../../../include/lapi/fsmount.h:14: +/home/autobuild/autobuild/instance-4/output-1/host/armeb-buildroot-linux-gnueabi/sysroot/usr/include/sys/mount.h:210:8: note: originally defined here + 210 | struct mount_attr + | ^~~~~~~~~~ + +Fixes: b857f8723 ("lapi/fsmount: resolve conflict in different header files") +Fixes: http://autobuild.buildroot.org/results/4dbb72e1bf081afd3cd944571b9beeefc7608865 +Link: https://lore.kernel.org/ltp/20230226192554.669332-1-fontaine.fabrice@gmail.com/ +Reviewed-by: Li Wang +[ pvorel: fix from b857f8723 is needed for glibc before glibc-2.37~426, +i.e. without fix 774058d729 ("linux: Fix sys/mount.h usage with kernel headers") +(which was backported to 2.35 and 2.34 maintenance). ] +Reviewed-by: Petr Vorel +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 114468ae3..4c8763376 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -224,10 +224,10 @@ AC_CHECK_TYPES([struct __kernel_old_timeval, struct __kernel_old_timespec, struc + + AC_CHECK_TYPES([struct futex_waitv],,,[#include ]) + AC_CHECK_TYPES([struct mount_attr],,,[ +-#ifdef HAVE_LINUX_MOUNT_H +-# include +-#else ++#ifdef HAVE_MOUNT_SETATTR + # include ++#elif HAVE_LINUX_MOUNT_H ++# include + #endif + ]) + +-- +2.40.0 + diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 8b411a8ffe..59ba5d0045 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,5 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20220527/ltp-full-20220527.tar.bz2.sha1 -sha1 c8d658cd3ab1f5a5c7b5bf56398d3a9525012c6b ltp-full-20220930.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20230127/ltp-full-20230127.tar.xz.sha256 +sha256 254412a52c7238f35a247337da186f485e76fb64c6549ed849b3442fc7a417ef ltp-full-20230127.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 533ab63915b916640667ecce17ee4998006d80d394d4b1f1d105a7aa1df50d38 ltp-full-20220930.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 34412d562f..78271b0730 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20220930 +LTP_TESTSUITE_VERSION = 20230127 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION)