package/ltp-testsuite: bump version to 20220121

PATCH Applied Petr Vorel 3 participants 7 messages Jan 26, 2022 – Feb 6, 2022

Share & tools

Petr Vorel

author

2022-01-26 23:57 UTC #0 lore raw

PATCH v2 1/1 package/ltp-testsuite: bump version to 20220121

LTP now builds metadata directory as host target.
It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc).

Drop patches from this release.

Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it).

Signed-off-by Petr Vorel <[email protected]>

---
Changes v1->v2:
* Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc when compiling host target)

Kind regards,
Petr

 ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++--------
 .../0002-lib-fix-MemAvailable-parsing.patch   | 36 -----------
 ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------
 ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------
 ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 -------------------
 package/ltp-testsuite/ltp-testsuite.hash      |  6 +-
 package/ltp-testsuite/ltp-testsuite.mk        |  6 +-
 7 files changed, 25 insertions(+), 223 deletions(-)
 delete mode 100644 package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch
 delete mode 100644 package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch
 delete mode 100644 package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
 delete mode 100644 package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch

package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +17 ~~-28~~

index a167d938e1..2ceba64ed5 100644
@@ -1,4 +1,4 @@
-From bee452dfa2a34ba7df7db677e5673cbdcd23f61e Mon Sep 17 00:00:00 2001
+From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001
 From: Petr Vorel <[email protected]>
 Date: Thu, 1 Oct 2020 23:28:39 +0200
 Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc

@@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel <[email protected]>
 
 diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h
 new file mode 100644
-index 000000000..d0e0e93d7
+index 0000000000..d0e0e93d7f
 --- /dev/null
 +++ b/include/lapi/sysinfo.h
 @@ -0,0 +1,22 @@

@@ -83,7 +83,7 @@ index 000000000..d0e0e93d7
 +
 +#endif /* SYSINFO_H__ */
 diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
-index d99441c86..0d26e9d45 100644
+index d99441c86f..0d26e9d455 100644
 --- a/include/tst_safe_macros.h
 +++ b/include/tst_safe_macros.h
 @@ -12,7 +12,7 @@

@@ -96,44 +96,33 @@ index d99441c86..0d26e9d45 100644
  #include <libgen.h>
  #include <signal.h>
 diff --git a/lib/safe_macros.c b/lib/safe_macros.c
-index a5b6bc504..20d01d304 100644
+index a5b6bc5047..87d922a928 100644
 --- a/lib/safe_macros.c
 +++ b/lib/safe_macros.c
-@@ -11,7 +11,6 @@
+@@ -11,7 +11,7 @@
  #include <sys/wait.h>
  #include <sys/mount.h>
  #include <sys/xattr.h>
 -#include <sys/sysinfo.h>
++#include "lapi/sysinfo.h"
  #include <errno.h>
  #include <fcntl.h>
  #include <libgen.h>
-@@ -23,6 +22,7 @@
- #include <malloc.h>
- #include "test.h"
- #include "safe_macros.h"
-+#include "lapi/sysinfo.h"
- 
- char *safe_basename(const char *file, const int lineno,
- 		    void (*cleanup_fn) (void), char *path)
 diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c
-index 69077861f..ae1cad29b 100644
+index 4a49747613..000688f5a3 100644
 --- a/lib/tst_memutils.c
 +++ b/lib/tst_memutils.c
-@@ -5,11 +5,11 @@
- 
+@@ -6,7 +6,7 @@
+ #include <stdio.h>
  #include <unistd.h>
  #include <limits.h>
 -#include <sys/sysinfo.h>
++#include "lapi/sysinfo.h"
  #include <stdlib.h>
  
  #define TST_NO_DEFAULT_MAIN
- #include "tst_test.h"
-+#include "lapi/sysinfo.h"
- 
- #define BLOCKSIZE (16 * 1024 * 1024)
- 
 diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c
-index 9676ea4b5..33b2ac822 100644
+index 20cb95191d..3462dc3f82 100644
 --- a/testcases/kernel/mem/mtest01/mtest01.c
 +++ b/testcases/kernel/mem/mtest01/mtest01.c
 @@ -20,7 +20,6 @@

@@ -153,7 +142,7 @@ index 9676ea4b5..33b2ac822 100644
  
  #define FIVE_HUNDRED_MB         (500ULL*1024*1024)
 diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c
-index 263b8e78b..4fa52e6ea 100644
+index 263b8e78bf..4fa52e6eae 100644
 --- a/testcases/kernel/syscalls/madvise/madvise06.c
 +++ b/testcases/kernel/syscalls/madvise/madvise06.c
 @@ -46,7 +46,7 @@

@@ -166,7 +155,7 @@ index 263b8e78b..4fa52e6ea 100644
  #include "tst_cgroup.h"
  
 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
-index 2ea44a2be..a237345ef 100644
+index 2ea44a2beb..a237345ef7 100644
 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c
 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
 @@ -69,7 +69,7 @@

@@ -179,7 +168,7 @@ index 2ea44a2be..a237345ef 100644
  #include "test.h"
  
 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
-index 7ad0e8bdc..61fa1ab75 100644
+index 7ad0e8bdcf..61fa1ab757 100644
 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c
 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
 @@ -65,7 +65,7 @@

@@ -192,7 +181,7 @@ index 7ad0e8bdc..61fa1ab75 100644
  
  #include "test.h"
 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c
-index af7cb6421..dc5ae65e3 100644
+index af7cb6421e..dc5ae65e35 100644
 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c
 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c
 @@ -13,7 +13,7 @@

@@ -205,7 +194,7 @@ index af7cb6421..dc5ae65e3 100644
  #include "lapi/posix_clocks.h"
  #include "tst_test.h"
 diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
-index 22e7c3638..572701f9f 100644
+index 22e7c36386..572701f9fd 100644
 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
 +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
 @@ -43,7 +43,7 @@

@@ -218,5 +207,5 @@ index 22e7c3638..572701f9f 100644
  
  #include "../testfrmw/testfrmw.h"
 -- 
-2.33.0
+2.34.1

package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch deleted +0 ~~-36~~

deleted file mode 100644
index 4a9a5b2363..0000000000
@@ -1,36 +0,0 @@
-From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001
-From: Ralph Siemsen <[email protected]>
-Date: Mon, 27 Sep 2021 22:18:50 -0400
-Subject: [PATCH] lib: fix MemAvailable parsing
-
-The amount of available memory was not being returned correctly, which
-resulted in tests being executed when they should have been skipped.
-
-Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable")
-Signed-off-by: Ralph Siemsen <[email protected]>
-Signed-off-by: Li Wang <[email protected]>
-Signed-off-by: Petr Vorel <[email protected]>
-[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ]
----
- lib/tst_memutils.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c
-index ae1cad29b..a46de78f5 100644
---- a/lib/tst_memutils.c
-+++ b/lib/tst_memutils.c
-@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar)
- 
- long long tst_available_mem(void)
- {
--	long long mem_available;
-+	unsigned long long mem_available = 0;
- 
--	if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld",
-+	if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu",
- 		&mem_available)) {
- 		mem_available = SAFE_READ_MEMINFO("MemFree:")
- 			+ SAFE_READ_MEMINFO("Cached:");
--- 
-2.33.0
-

package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted +0 ~~-37~~

deleted file mode 100644
index 056c769feb..0000000000
@@ -1,37 +0,0 @@
-From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <[email protected]>
-Date: Wed, 29 Sep 2021 19:38:42 +0200
-Subject: [PATCH] lapi/rtnetlink.h: Fix include guards
-
-Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS")
-
-Signed-off-by: Petr Vorel <[email protected]>
-[ upstream status: a2a212cf8 ("lapi/rtnetlink.h: Fix include guards") ]
----
- include/lapi/rtnetlink.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h
-index 8a1b5385b..04e9ad51a 100644
---- a/include/lapi/rtnetlink.h
-+++ b/include/lapi/rtnetlink.h
-@@ -1,8 +1,8 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- /* Copyright (c) 2021 Petr Vorel <[email protected]> */
- 
--#ifndef LAPI_IF_ADDR_H__
--# define LAPI_IF_ADDR_H__
-+#ifndef LAPI_RTNETLINK_H__
-+# define LAPI_RTNETLINK_H__
- 
- #include <linux/rtnetlink.h>
- 
-@@ -10,4 +10,4 @@
- # define IFA_FLAGS 8
- #endif
- 
--#endif	/* LAPI_IF_ADDR_H__ */
-+#endif	/* LAPI_RTNETLINK_H__ */
--- 
-2.33.0
-

package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted +0 ~~-58~~

58 lines not on this page · raw message

package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted +0 ~~-60~~

60 lines not on this page · raw message

package/ltp-testsuite/ltp-testsuite.hash +3 -3

index a9f3cfdfe1..bd648cbfdd 100644
@@ -1,5 +1,5 @@
-# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1
-sha1 dad7737f609e358c4060cb446b9cae5c026fc137  ltp-full-20210927.tar.xz
+# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1
+sha1 211935e901afea1010ec4f70369b782fbee93ed4  ltp-full-20220121.tar.xz
 # Locally computed
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
-sha256  779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15  ltp-full-20210927.tar.xz
+sha256  ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a  ltp-full-20220121.tar.xz

package/ltp-testsuite/ltp-testsuite.mk +5 -1

index cc6d3c63b6..d9b7133b07 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTP_TESTSUITE_VERSION = 20210927
+LTP_TESTSUITE_VERSION = 20220121
 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)

@@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \
 	LIBS="$(LTP_TESTSUITE_LIBS)" \
 	SYSROOT="$(STAGING_DIR)"
 
+LTP_TESTSUITE_MAKE_ENV += \
+	HOST_CFLAGS="$(HOST_CFLAGS)" \
+	HOST_LDFLAGS="$(HOST_LDFLAGS)"
+
 # uclibc: bessel support normally not enabled
 LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \
 	testcases/misc/math/float/bessel/ \

Signature · 6 lines

2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Baruch Siach via buildroot

2022-01-27 05:46 UTC #1 lore raw

Hi Petr,

Quoted 15 lines · Petr Vorel

LTP now builds metadata directory as host target.
It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc).
Drop patches from this release.
Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it).
Signed-off-by Petr Vorel <[email protected]>
---
Changes v1->v2:
* Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc when compiling host target)

[...]

Quoted 27 lines

package/ltp-testsuite/ltp-testsuite.hash +3 -3

index a9f3cfdfe1..bd648cbfdd 100644
@@ -1,5 +1,5 @@
-# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1
-sha1 dad7737f609e358c4060cb446b9cae5c026fc137  ltp-full-20210927.tar.xz
+# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1
+sha1 211935e901afea1010ec4f70369b782fbee93ed4  ltp-full-20220121.tar.xz
 # Locally computed
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
-sha256  779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15  ltp-full-20210927.tar.xz
+sha256  ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a  ltp-full-20220121.tar.xz

package/ltp-testsuite/ltp-testsuite.mk +1 -1

index cc6d3c63b6..d9b7133b07 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTP_TESTSUITE_VERSION = 20210927
+LTP_TESTSUITE_VERSION = 20220121
 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)

package/ltp-testsuite/ltp-testsuite.mk LTP_TESTSUITE_CONF_ENV += \ · line 75

Quoted 6 lines

package/ltp-testsuite/ltp-testsuite.mk +3 -0

@@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \
 	LIBS="$(LTP_TESTSUITE_LIBS)" \
 	SYSROOT="$(STAGING_DIR)"
 
+LTP_TESTSUITE_MAKE_ENV += \
+	HOST_CFLAGS="$(HOST_CFLAGS)" \
+	HOST_LDFLAGS="$(HOST_LDFLAGS)"

I think you should have TARGET_* on the right side of the assignment, since this is a target package.

baruch

Quoted 4 lines

package/ltp-testsuite/ltp-testsuite.mk +1 -0

+
 # uclibc: bessel support normally not enabled
 LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \
 	testcases/misc/math/float/bessel/ \

Signature · 7 lines

                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Petr Vorel

author

2022-01-27 17:33 UTC #2 lore raw

Hi Baruch,

Quoted 20 lines

Hi Petr,
Quoted 15 lines · Petr Vorel
LTP now builds metadata directory as host target.
It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc).
Drop patches from this release.
Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it).
Signed-off-by Petr Vorel <[email protected]>
---
Changes v1->v2:
* Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc when compiling host target)
[...]

...

Quoted 10 lines

package/ltp-testsuite/ltp-testsuite.mk LTP_TESTSUITE_CONF_ENV += \ · line 75
Quoted 7 lines
package/ltp-testsuite/ltp-testsuite.mk +3 -0
@@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \
 	LIBS="$(LTP_TESTSUITE_LIBS)" \
 	SYSROOT="$(STAGING_DIR)"
 
+LTP_TESTSUITE_MAKE_ENV += \
+	HOST_CFLAGS="$(HOST_CFLAGS)" \
+	HOST_LDFLAGS="$(HOST_LDFLAGS)"
I think you should have TARGET_* on the right side of the assignment, since this is a target package.

No, it must be HOST_* because the whole exercise is needed to allow one bit of LTP code built for as host target. I tried to explain this in the commit message, but clearly I wasn't clear :).

I've tested it on complete build that it's working like this. But using TARGET_* as you suggest HOST_CFLAGS would have the same options as CFLAGS, which I'm trying to avoid (that's the default if we don't set anything [1]).

With TARGET_* (or nothing set at all) it fails at least on these 2 builds:

                      br-arm-full-static [5/6]: FAILED
                   bootlin-xtensa-uclibc [24/45]: FAILED
* br-arm-full-static
make -C "metadata" \
	-f "br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata/Makefile" all

make[1]: Entering directory 'br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata'
/usr/bin/gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Os -g0 -static -Ibr-test-pkg/br-arm-full-static/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -static metaparse.c -o metaparse /usr/lib64/gcc/x86_64-suse-linux/11/../../../../x86_64-suse-linux/bin/ld: cannot find -lc
collect2: error: ld returned 1 exit status
make[1]: *** [../include/mk/rules.mk:27: metaparse] Error 1
make[1]: Leaving directory 'br-test-pkg/br-arm-full-static/build/ltp-testsuite-20220121/metadata'
make: *** [Makefile:106: metadata-all] Error 2

* bootlin-xtensa-uclibc
make -C "metadata" \
-f "br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata/Makefile" all
make[1]: Entering directory 'br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata'
/usr/bin/gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -mlongcalls -mauto-litpools -Os -g0 -Ibr-test-pkg/bootlin-xtensa-uclibc/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition metaparse.c -o metaparse
gcc: error: unrecognized command-line option ‘-mlongcalls’
gcc: error: unrecognized command-line option ‘-mauto-litpools’
make[1]: *** [../include/mk/rules.mk:27: metaparse] Error 1
make[1]: Leaving directory 'br-test-pkg/bootlin-xtensa-uclibc/build/ltp-testsuite-20220121/metadata'

Kind regards,
Petr

[1] https://lore.kernel.org/ltp/YfJ6fIbFvN7rD0SR@pevik/

Quoted 1 line

baruch

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Petr Vorel

author

2022-01-28 01:46 UTC #3 lore raw

In reply to Baruch Siach via buildroot

Hi,

FYI tested:

                    bootlin-armv5-uclibc [1/6]: OK
                     bootlin-armv7-glibc [2/6]: OK
                   bootlin-armv7m-uclibc [3/6]: SKIPPED
                     bootlin-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: OK
                            sourcery-arm [6/6]: OK

6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed

                             andes-nds32 [ 1/45]: OK
                             arm-aarch64 [ 2/45]: OK
                   bootlin-aarch64-glibc [ 3/45]: OK
               bootlin-arcle-hs38-uclibc [ 4/45]: OK
                    bootlin-armv5-uclibc [ 5/45]: OK
                     bootlin-armv7-glibc [ 6/45]: OK
                   bootlin-armv7m-uclibc [ 7/45]: SKIPPED
                      bootlin-armv7-musl [ 8/45]: OK
             bootlin-microblazeel-uclibc [ 9/45]: OK
                   bootlin-mipsel-uclibc [10/45]: OK
                bootlin-mipsel32r6-glibc [11/45]: OK
                bootlin-m68k-5208-uclibc [12/45]: SKIPPED
               bootlin-m68k-68040-uclibc [13/45]: OK
                     bootlin-nios2-glibc [14/45]: SKIPPED
                 bootlin-openrisc-uclibc [15/45]: OK
           bootlin-powerpc-e500mc-uclibc [16/45]: OK
        bootlin-powerpc64le-power8-glibc [17/45]: OK
                   bootlin-riscv32-glibc [18/45]: OK
                   bootlin-riscv64-glibc [19/45]: OK
                    bootlin-riscv64-musl [20/45]: OK
                      bootlin-sh4-uclibc [21/45]: OK
                    bootlin-sparc-uclibc [22/45]: SKIPPED
                   bootlin-sparc64-glibc [23/45]: OK
                   bootlin-xtensa-uclibc [24/45]: OK
                    bootlin-x86-64-glibc [25/45]: OK
                     bootlin-x86-64-musl [26/45]: OK
                   bootlin-x86-64-uclibc [27/45]: OK
                            br-arm-basic [28/45]: OK
                    br-arm-full-nothread [29/45]: SKIPPED
                      br-arm-full-static [30/45]: OK
                br-i386-pentium-mmx-musl [31/45]: OK
                   br-i386-pentium4-full [32/45]: OK
                      br-mips64-n64-full [33/45]: OK
                 br-mips64r6-el-hf-glibc [34/45]: OK
               br-powerpc-603e-basic-cpp [35/45]: OK
               br-powerpc64-power7-glibc [36/45]: OK
                       linaro-aarch64-be [37/45]: OK
                          linaro-aarch64 [38/45]: OK
                              linaro-arm [39/45]: OK
                     sourcery-arm-armv4t [40/45]: OK
                            sourcery-arm [41/45]: OK
                     sourcery-arm-thumb2 [42/45]: OK
                           sourcery-mips [43/45]: OK
                         sourcery-mips64 [44/45]: OK
                          sourcery-nios2 [45/45]: SKIPPED

45 builds, 6 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed

Kind regards,
Petr
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Petr Vorel

author

2022-02-02 18:25 UTC #4 lore raw

In reply to Petr Vorel

Hi,

gentle ping for a review.

Kind regards,
Petr

Quoted 159 lines

Drop patches from this release.

Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it).

Signed-off-by Petr Vorel <[email protected]>

---
Changes v1->v2:
* Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc when compiling host target)

Kind regards,
Petr

 ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++--------
 .../0002-lib-fix-MemAvailable-parsing.patch   | 36 -----------
 ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------
 ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------
 ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 -------------------
 package/ltp-testsuite/ltp-testsuite.hash      |  6 +-
 package/ltp-testsuite/ltp-testsuite.mk        |  6 +-
 7 files changed, 25 insertions(+), 223 deletions(-)
 delete mode 100644 package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch
 delete mode 100644 package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch
 delete mode 100644 package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
 delete mode 100644 package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch

package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +16 ~~-27~~

index a167d938e1..2ceba64ed5 100644
@@ -1,4 +1,4 @@
-From bee452dfa2a34ba7df7db677e5673cbdcd23f61e Mon Sep 17 00:00:00 2001
+From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001
 From: Petr Vorel <[email protected]>
 Date: Thu, 1 Oct 2020 23:28:39 +0200
 Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc

@@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel <[email protected]>
 
 diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h
 new file mode 100644
-index 000000000..d0e0e93d7
+index 0000000000..d0e0e93d7f
 --- /dev/null
 +++ b/include/lapi/sysinfo.h
 @@ -0,0 +1,22 @@

@@ -83,7 +83,7 @@ index 000000000..d0e0e93d7
 +
 +#endif /* SYSINFO_H__ */
 diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
-index d99441c86..0d26e9d45 100644
+index d99441c86f..0d26e9d455 100644
 --- a/include/tst_safe_macros.h
 +++ b/include/tst_safe_macros.h
 @@ -12,7 +12,7 @@

@@ -96,44 +96,33 @@ index d99441c86..0d26e9d45 100644
  #include <libgen.h>
  #include <signal.h>
 diff --git a/lib/safe_macros.c b/lib/safe_macros.c
-index a5b6bc504..20d01d304 100644
+index a5b6bc5047..87d922a928 100644
 --- a/lib/safe_macros.c
 +++ b/lib/safe_macros.c
-@@ -11,7 +11,6 @@
+@@ -11,7 +11,7 @@
  #include <sys/wait.h>
  #include <sys/mount.h>
  #include <sys/xattr.h>
 -#include <sys/sysinfo.h>
++#include "lapi/sysinfo.h"
  #include <errno.h>
  #include <fcntl.h>
  #include <libgen.h>
-@@ -23,6 +22,7 @@
- #include <malloc.h>
- #include "test.h"
- #include "safe_macros.h"
-+#include "lapi/sysinfo.h"
- 
- char *safe_basename(const char *file, const int lineno,
- 		    void (*cleanup_fn) (void), char *path)
 diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c
-index 69077861f..ae1cad29b 100644
+index 4a49747613..000688f5a3 100644
 --- a/lib/tst_memutils.c
 +++ b/lib/tst_memutils.c
-@@ -5,11 +5,11 @@
- 
+@@ -6,7 +6,7 @@
+ #include <stdio.h>
  #include <unistd.h>
  #include <limits.h>
 -#include <sys/sysinfo.h>
++#include "lapi/sysinfo.h"
  #include <stdlib.h>
 
  #define TST_NO_DEFAULT_MAIN
- #include "tst_test.h"
-+#include "lapi/sysinfo.h"
- 
- #define BLOCKSIZE (16 * 1024 * 1024)
- 
 diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c
-index 9676ea4b5..33b2ac822 100644
+index 20cb95191d..3462dc3f82 100644
 --- a/testcases/kernel/mem/mtest01/mtest01.c
 +++ b/testcases/kernel/mem/mtest01/mtest01.c
 @@ -20,7 +20,6 @@

@@ -153,7 +142,7 @@ index 9676ea4b5..33b2ac822 100644
 
  #define FIVE_HUNDRED_MB         (500ULL*1024*1024)
 diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c
-index 263b8e78b..4fa52e6ea 100644
+index 263b8e78bf..4fa52e6eae 100644
 --- a/testcases/kernel/syscalls/madvise/madvise06.c
 +++ b/testcases/kernel/syscalls/madvise/madvise06.c
 @@ -46,7 +46,7 @@

@@ -166,7 +155,7 @@ index 263b8e78b..4fa52e6ea 100644
  #include "tst_cgroup.h"
 
 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
-index 2ea44a2be..a237345ef 100644
+index 2ea44a2beb..a237345ef7 100644
 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c
 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
 @@ -69,7 +69,7 @@

@@ -179,7 +168,7 @@ index 2ea44a2be..a237345ef 100644
  #include "test.h"
 
 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
-index 7ad0e8bdc..61fa1ab75 100644
+index 7ad0e8bdcf..61fa1ab757 100644
 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c
 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
 @@ -65,7 +65,7 @@

@@ -192,7 +181,7 @@ index 7ad0e8bdc..61fa1ab75 100644
 
  #include "test.h"
 diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c
-index af7cb6421..dc5ae65e3 100644
+index af7cb6421e..dc5ae65e35 100644
 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c
 +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c
 @@ -13,7 +13,7 @@

@@ -205,7 +194,7 @@ index af7cb6421..dc5ae65e3 100644
  #include "lapi/posix_clocks.h"
  #include "tst_test.h"
 diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
-index 22e7c3638..572701f9f 100644
+index 22e7c36386..572701f9fd 100644
 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
 +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
 @@ -43,7 +43,7 @@

package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch index 22e7c3638..572701f9f 100644 · line 208

Quoted 2 lines

package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +0 -0
@@ -218,5 +207,5 @@ index 22e7c3638..572701f9f 100644
 
  #include "../testfrmw/testfrmw.h"

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Arnout Vandecappelle

Applied

2022-02-05 22:59 UTC #5 lore raw

In reply to Petr Vorel

Quoted 4 lines · Petr Vorel

LTP now builds metadata directory as host target.
It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc).

Since it apparently wasn't clear enough (cfr. Baruch's comment), I've tried to
explain a bit better. Hopefully it indeed is better :-)

Applied to master, thanks.

Regards,
Arnout

Quoted 403 lines

Drop patches from this release.

Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still safe to carry it).

Signed-off-by Petr Vorel <[email protected]>

---
Changes v1->v2:
* Add missin g HOST_LDFLAGS to fix br-arm-full-static (cannot find -lc when compiling host target)

Kind regards,
Petr

  ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 45 ++++++--------
  .../0002-lib-fix-MemAvailable-parsing.patch   | 36 -----------
  ...-lapi-rtnetlink.h-Fix-include-guards.patch | 37 ------------
  ...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ------------------
  ...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 -------------------
  package/ltp-testsuite/ltp-testsuite.hash      |  6 +-
  package/ltp-testsuite/ltp-testsuite.mk        |  6 +-
  7 files changed, 25 insertions(+), 223 deletions(-)

delete mode 100644 package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch delete mode 100644 package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch delete mode 100644 package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch delete mode 100644 package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch

package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +17 ~~-28~~

index a167d938e1..2ceba64ed5 100644
@@ -1,4 +1,4 @@
-From bee452dfa2a34ba7df7db677e5673cbdcd23f61e Mon Sep 17 00:00:00 2001
+From f34c6ca3d543968e900d6327d8b5900db63f08ad Mon Sep 17 00:00:00 2001
  From: Petr Vorel <[email protected]>
  Date: Thu, 1 Oct 2020 23:28:39 +0200
  Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc

@@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel <[email protected]>
 
  diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h
  new file mode 100644
-index 000000000..d0e0e93d7
+index 0000000000..d0e0e93d7f
  --- /dev/null
  +++ b/include/lapi/sysinfo.h
  @@ -0,0 +1,22 @@

@@ -83,7 +83,7 @@ index 000000000..d0e0e93d7
  +
  +#endif /* SYSINFO_H__ */
  diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h
-index d99441c86..0d26e9d45 100644
+index d99441c86f..0d26e9d455 100644
  --- a/include/tst_safe_macros.h
  +++ b/include/tst_safe_macros.h
  @@ -12,7 +12,7 @@

@@ -96,44 +96,33 @@ index d99441c86..0d26e9d45 100644
   #include <libgen.h>
   #include <signal.h>
  diff --git a/lib/safe_macros.c b/lib/safe_macros.c
-index a5b6bc504..20d01d304 100644
+index a5b6bc5047..87d922a928 100644
  --- a/lib/safe_macros.c
  +++ b/lib/safe_macros.c
-@@ -11,7 +11,6 @@
+@@ -11,7 +11,7 @@
   #include <sys/wait.h>
   #include <sys/mount.h>
   #include <sys/xattr.h>
  -#include <sys/sysinfo.h>
++#include "lapi/sysinfo.h"
   #include <errno.h>
   #include <fcntl.h>
   #include <libgen.h>
-@@ -23,6 +22,7 @@
- #include <malloc.h>
- #include "test.h"
- #include "safe_macros.h"
-+#include "lapi/sysinfo.h"
-
- char *safe_basename(const char *file, const int lineno,
- 		    void (*cleanup_fn) (void), char *path)
  diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c
-index 69077861f..ae1cad29b 100644
+index 4a49747613..000688f5a3 100644
  --- a/lib/tst_memutils.c
  +++ b/lib/tst_memutils.c
-@@ -5,11 +5,11 @@
-
+@@ -6,7 +6,7 @@
+ #include <stdio.h>
   #include <unistd.h>
   #include <limits.h>
  -#include <sys/sysinfo.h>
++#include "lapi/sysinfo.h"
   #include <stdlib.h>
 
   #define TST_NO_DEFAULT_MAIN
- #include "tst_test.h"
-+#include "lapi/sysinfo.h"
-
- #define BLOCKSIZE (16 * 1024 * 1024)
-
  diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c
-index 9676ea4b5..33b2ac822 100644
+index 20cb95191d..3462dc3f82 100644
  --- a/testcases/kernel/mem/mtest01/mtest01.c
  +++ b/testcases/kernel/mem/mtest01/mtest01.c
  @@ -20,7 +20,6 @@

@@ -153,7 +142,7 @@ index 9676ea4b5..33b2ac822 100644
 
   #define FIVE_HUNDRED_MB         (500ULL*1024*1024)
  diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c
-index 263b8e78b..4fa52e6ea 100644
+index 263b8e78bf..4fa52e6eae 100644
  --- a/testcases/kernel/syscalls/madvise/madvise06.c
  +++ b/testcases/kernel/syscalls/madvise/madvise06.c
  @@ -46,7 +46,7 @@

@@ -166,7 +155,7 @@ index 263b8e78b..4fa52e6ea 100644
   #include "tst_cgroup.h"
 
  diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
-index 2ea44a2be..a237345ef 100644
+index 2ea44a2beb..a237345ef7 100644
  --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c
  +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
  @@ -69,7 +69,7 @@

@@ -179,7 +168,7 @@ index 2ea44a2be..a237345ef 100644
   #include "test.h"
 
  diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
-index 7ad0e8bdc..61fa1ab75 100644
+index 7ad0e8bdcf..61fa1ab757 100644
  --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c
  +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
  @@ -65,7 +65,7 @@

@@ -192,7 +181,7 @@ index 7ad0e8bdc..61fa1ab75 100644
 
   #include "test.h"
  diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c
-index af7cb6421..dc5ae65e3 100644
+index af7cb6421e..dc5ae65e35 100644
  --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c
  +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c
  @@ -13,7 +13,7 @@

@@ -205,7 +194,7 @@ index af7cb6421..dc5ae65e3 100644
   #include "lapi/posix_clocks.h"
   #include "tst_test.h"
  diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
-index 22e7c3638..572701f9f 100644
+index 22e7c36386..572701f9fd 100644
  --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
  +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c
  @@ -43,7 +43,7 @@

@@ -218,5 +207,5 @@ index 22e7c3638..572701f9f 100644
 
   #include "../testfrmw/testfrmw.h"
  --
-2.33.0
+2.34.1

package/ltp-testsuite/0002-lib-fix-MemAvailable-parsing.patch deleted +0 ~~-36~~

deleted file mode 100644
index 4a9a5b2363..0000000000
@@ -1,36 +0,0 @@
-From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001
-From: Ralph Siemsen <[email protected]>
-Date: Mon, 27 Sep 2021 22:18:50 -0400
-Subject: [PATCH] lib: fix MemAvailable parsing
-
-The amount of available memory was not being returned correctly, which
-resulted in tests being executed when they should have been skipped.
-
-Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable")
-Signed-off-by: Ralph Siemsen <[email protected]>
-Signed-off-by: Li Wang <[email protected]>
-Signed-off-by: Petr Vorel <[email protected]>
-[ upstream status: e42149e28 ("lib: fix MemAvailable parsing") ]
----
- lib/tst_memutils.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c
-index ae1cad29b..a46de78f5 100644
---- a/lib/tst_memutils.c
-+++ b/lib/tst_memutils.c
-@@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar)
-
- long long tst_available_mem(void)
- {
--	long long mem_available;
-+	unsigned long long mem_available = 0;
-
--	if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld",
-+	if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu",
- 		&mem_available)) {
- 		mem_available = SAFE_READ_MEMINFO("MemFree:")
- 			+ SAFE_READ_MEMINFO("Cached:");
---
-2.33.0
-

package/ltp-testsuite/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted +0 ~~-37~~

deleted file mode 100644
index 056c769feb..0000000000
@@ -1,37 +0,0 @@
-From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <[email protected]>
-Date: Wed, 29 Sep 2021 19:38:42 +0200
-Subject: [PATCH] lapi/rtnetlink.h: Fix include guards
-
-Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS")
-
-Signed-off-by: Petr Vorel <[email protected]>
-[ upstream status: a2a212cf8 ("lapi/rtnetlink.h: Fix include guards") ]
----
- include/lapi/rtnetlink.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h
-index 8a1b5385b..04e9ad51a 100644
---- a/include/lapi/rtnetlink.h
-+++ b/include/lapi/rtnetlink.h
-@@ -1,8 +1,8 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- /* Copyright (c) 2021 Petr Vorel <[email protected]> */
-
--#ifndef LAPI_IF_ADDR_H__
--# define LAPI_IF_ADDR_H__
-+#ifndef LAPI_RTNETLINK_H__
-+# define LAPI_RTNETLINK_H__
-
- #include <linux/rtnetlink.h>
-
-@@ -10,4 +10,4 @@
- # define IFA_FLAGS 8
- #endif
-
--#endif	/* LAPI_IF_ADDR_H__ */
-+#endif	/* LAPI_RTNETLINK_H__ */
---
-2.33.0
-

package/ltp-testsuite/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted +0 ~~-58~~

deleted file mode 100644
index 4044636e63..0000000000
@@ -1,58 +0,0 @@
-From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001
-From: Petr Vorel <[email protected]>
-Date: Wed, 29 Sep 2021 19:37:19 +0200
-Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h
-
-There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which
-requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h,
-as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just
-like <linux/rtnetlink.h> includes <linux/if_addr.h>.
-
-Signed-off-by: Petr Vorel <[email protected]>
-[ upstream status: https://lore.kernel.org/ltp/[email protected]/T/#u ]
----
- include/lapi/if_addr.h   | 16 ++++++++++++++++
- include/lapi/rtnetlink.h |  5 +----
- 2 files changed, 17 insertions(+), 4 deletions(-)
- create mode 100644 include/lapi/if_addr.h
-
-diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h
-new file mode 100644
-index 000000000..4e50a0a4e
---- /dev/null
-+++ b/include/lapi/if_addr.h
-@@ -0,0 +1,16 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * Copyright (c) 2021 Petr Vorel <[email protected]>
-+ */
-+
-+#ifndef LAPI_IF_ADDR_H__
-+#define LAPI_IF_ADDR_H__
-+
-+#include <linux/if_addr.h>
-+
-+#ifndef IFA_FLAGS
-+# define IFA_FLAGS 8
-+#endif
-+
-+
-+#endif /* LAPI_IF_ADDR_H__ */
-diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h
-index 04e9ad51a..089bf1a0d 100644
---- a/include/lapi/rtnetlink.h
-+++ b/include/lapi/rtnetlink.h
-@@ -5,9 +5,6 @@
- # define LAPI_RTNETLINK_H__
-
- #include <linux/rtnetlink.h>
--
--#ifndef IFA_FLAGS
--# define IFA_FLAGS 8
--#endif
-+#include "lapi/if_addr.h"
-
- #endif	/* LAPI_RTNETLINK_H__ */
---
-2.33.0
-

package/ltp-testsuite/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted +0 ~~-60~~

deleted file mode 100644
index b54e052992..0000000000
@@ -1,60 +0,0 @@
-From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <[email protected]>
-Date: Wed, 29 Sep 2021 19:56:29 +0200
-Subject: [PATCH] lapi/if_addr.h: Define IFA_FLAGS
-
-and use it in icmp_rate_limit01.c.
-
-This fixes error on toolchains with very old kernel headers, e.g.
-Buildroot sourcery-arm:
-
-icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function)
-   IFA_F_NOPREFIXROUTE);
-
-Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest
-system we still support is Cent0S 7 with 3.10 kernel.
-
-NOTE: Cent0S 7 is obviously heavily patched thus it contains
-IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error.
-
-Signed-off-by: Petr Vorel <[email protected]>
-[ upstream status: https://lore.kernel.org/ltp/[email protected]/T/#u ]
----
- include/lapi/if_addr.h            | 3 +++
- testcases/cve/icmp_rate_limit01.c | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h
-index 4e50a0a4e..0f7e44784 100644
---- a/include/lapi/if_addr.h
-+++ b/include/lapi/if_addr.h
-@@ -12,5 +12,8 @@
- # define IFA_FLAGS 8
- #endif
-
-+#ifndef IFA_F_NOPREFIXROUTE
-+# define IFA_F_NOPREFIXROUTE	0x200
-+#endif
-
- #endif /* LAPI_IF_ADDR_H__ */
-diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c
-index b3a237b30..3ada32675 100644
---- a/testcases/cve/icmp_rate_limit01.c
-+++ b/testcases/cve/icmp_rate_limit01.c
-@@ -27,11 +27,12 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--#include <linux/if_addr.h>
- #include <linux/errqueue.h>
-
- #include <sched.h>
- #include <limits.h>
-+
-+#include "lapi/if_addr.h"
- #include "tst_test.h"
- #include "tst_netdevice.h"
-
---
-2.33.0
-

package/ltp-testsuite/ltp-testsuite.hash +3 -3

index a9f3cfdfe1..bd648cbfdd 100644
@@ -1,5 +1,5 @@
-# From: https://github.com/linux-test-project/ltp/releases/download/20210927/ltp-full-20210927.tar.xz.sha1
-sha1 dad7737f609e358c4060cb446b9cae5c026fc137  ltp-full-20210927.tar.xz
+# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1
+sha1 211935e901afea1010ec4f70369b782fbee93ed4  ltp-full-20220121.tar.xz
  # Locally computed
  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
-sha256  779e9e5cc9af4f2b3d4cb32f5439ebd635504d2c4591bf900f0942dac290ed15  ltp-full-20210927.tar.xz
+sha256  ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a  ltp-full-20220121.tar.xz

package/ltp-testsuite/ltp-testsuite.mk +1 -1

index cc6d3c63b6..d9b7133b07 100644
@@ -4,7 +4,7 @@
  #
  ################################################################################
 
-LTP_TESTSUITE_VERSION = 20210927
+LTP_TESTSUITE_VERSION = 20220121
  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)

package/ltp-testsuite/ltp-testsuite.mk LTP_TESTSUITE_CONF_ENV += \ · line 79

Quoted 10 lines

package/ltp-testsuite/ltp-testsuite.mk +4 -0

@@ -70,6 +70,10 @@ LTP_TESTSUITE_CONF_ENV += \
  	LIBS="$(LTP_TESTSUITE_LIBS)" \
  	SYSROOT="$(STAGING_DIR)"
 
+LTP_TESTSUITE_MAKE_ENV += \
+	HOST_CFLAGS="$(HOST_CFLAGS)" \
+	HOST_LDFLAGS="$(HOST_LDFLAGS)"
+
  # uclibc: bessel support normally not enabled
  LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \
  	testcases/misc/math/float/bessel/ \

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Petr Vorel

author

2022-02-06 12:31 UTC #6 lore raw

Hi Arnout,

Quoted 8 lines · Petr Vorel

Quoted 4 lines
LTP now builds metadata directory as host target.
It's mandatory, therefore adding HOST_CFLAGS and HOST_LDFLAGS to make (adding to configure does not work) to avoid adding -mlongcalls -mauto-litpools for some targets (e.g. bootlin-xtensa-uclibc).
Since it apparently wasn't clear enough (cfr. Baruch's comment), I've tried
to explain a bit better. Hopefully it indeed is better :-)

Thanks a lot!

Kind regards,
Petr

Quoted 4 lines

Applied to master, thanks.
Regards,
Arnout

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot