diff options
Diffstat (limited to 'meta/recipes-extended/ltp')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch | 36 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch | 37 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp_20220121.bb (renamed from meta/recipes-extended/ltp/ltp_20210927.bb) | 11 |
6 files changed, 34 insertions, 196 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch new file mode 100644 index 0000000000..e8d9f212a9 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 4aad23f208cc7725cd61bbe5aaadb9994c794cd0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 26 Jan 2022 20:58:46 +0100 | ||
4 | Subject: [PATCH] metadata/parse.sh: sort filelist for reproducibility | ||
5 | |||
6 | find does not guarantee the order of the files. | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/907] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | --- | ||
11 | metadata/parse.sh | 2 +- | ||
12 | |||
13 | diff --git a/metadata/parse.sh b/metadata/parse.sh | ||
14 | index b43d024c68..1811665bfe 100755 | ||
15 | --- a/metadata/parse.sh | ||
16 | +++ b/metadata/parse.sh | ||
17 | @@ -29,7 +29,7 @@ echo ' "tests": {' | ||
18 | |||
19 | first=1 | ||
20 | |||
21 | -for test in `find testcases/ -name '*.c'`; do | ||
22 | +for test in `find testcases/ -name '*.c'|sort`; do | ||
23 | a=$($top_builddir/metadata/metaparse -Iinclude -Itestcases/kernel/syscalls/utils/ "$test") | ||
24 | if [ -n "$a" ]; then | ||
25 | if [ -z "$first" ]; then | ||
26 | -- | ||
27 | 2.20.1 | ||
28 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch b/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch deleted file mode 100644 index 1860b95ce9..0000000000 --- a/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 29a096fe2bd356f419bd8a8404d5b652c996b92f Mon Sep 17 00:00:00 2001 | ||
2 | From: Ralph Siemsen <ralph.siemsen@linaro.org> | ||
3 | Date: Mon, 27 Sep 2021 22:18:50 -0400 | ||
4 | Subject: [PATCH] lib: fix MemAvailable parsing | ||
5 | |||
6 | The amount of available memory was not being returned correctly, which | ||
7 | resulted in tests being executed when they should have been skipped. | ||
8 | |||
9 | Fixes: 8759f4 ("lib: adjust the tmpfs size according to .dev_min_size and MemAvailable") | ||
10 | Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> | ||
11 | Signed-off-by: Li Wang <liwang@redhat.com> | ||
12 | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> | ||
13 | Upstream-Status: Backport [e42149e28 ("lib: fix MemAvailable parsing")] | ||
14 | --- | ||
15 | lib/tst_memutils.c | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c | ||
19 | index ae1cad29b..a46de78f5 100644 | ||
20 | --- a/lib/tst_memutils.c | ||
21 | +++ b/lib/tst_memutils.c | ||
22 | @@ -65,9 +65,9 @@ void tst_pollute_memory(size_t maxsize, int fillchar) | ||
23 | |||
24 | long long tst_available_mem(void) | ||
25 | { | ||
26 | - long long mem_available; | ||
27 | + unsigned long long mem_available = 0; | ||
28 | |||
29 | - if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld", | ||
30 | + if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %llu", | ||
31 | &mem_available)) { | ||
32 | mem_available = SAFE_READ_MEMINFO("MemFree:") | ||
33 | + SAFE_READ_MEMINFO("Cached:"); | ||
34 | -- | ||
35 | 2.33.0 | ||
36 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch b/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch deleted file mode 100644 index 6fcafaff1c..0000000000 --- a/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 881709d1e4d1bba5bf8ca365bc058f338bd72dc2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Petr Vorel <petr.vorel@gmail.com> | ||
3 | Date: Wed, 29 Sep 2021 19:38:42 +0200 | ||
4 | Subject: [PATCH] lapi/rtnetlink.h: Fix include guards | ||
5 | |||
6 | Fixes: 5fea0638a ("lapi: Add missing IFA_FLAGS") | ||
7 | |||
8 | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> | ||
9 | Upstream-Status: Backport [a2a212cf8 ("lapi/rtnetlink.h: Fix include guards")] | ||
10 | --- | ||
11 | include/lapi/rtnetlink.h | 6 +++--- | ||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h | ||
15 | index 8a1b5385b..04e9ad51a 100644 | ||
16 | --- a/include/lapi/rtnetlink.h | ||
17 | +++ b/include/lapi/rtnetlink.h | ||
18 | @@ -1,8 +1,8 @@ | ||
19 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
20 | /* Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> */ | ||
21 | |||
22 | -#ifndef LAPI_IF_ADDR_H__ | ||
23 | -# define LAPI_IF_ADDR_H__ | ||
24 | +#ifndef LAPI_RTNETLINK_H__ | ||
25 | +# define LAPI_RTNETLINK_H__ | ||
26 | |||
27 | #include <linux/rtnetlink.h> | ||
28 | |||
29 | @@ -10,4 +10,4 @@ | ||
30 | # define IFA_FLAGS 8 | ||
31 | #endif | ||
32 | |||
33 | -#endif /* LAPI_IF_ADDR_H__ */ | ||
34 | +#endif /* LAPI_RTNETLINK_H__ */ | ||
35 | -- | ||
36 | 2.33.0 | ||
37 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch b/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch deleted file mode 100644 index 19ac3ba046..0000000000 --- a/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From b13440627bd4a9f060a33d400a47a40daa2bc12e Mon Sep 17 00:00:00 2001 | ||
2 | From: Petr Vorel <petr.vorel@gmail.com> | ||
3 | Date: Wed, 29 Sep 2021 19:37:19 +0200 | ||
4 | Subject: [PATCH] lapi: Create if_addr.h and reuse it in rtnetlink.h | ||
5 | |||
6 | There will be fix in next commit for missing IFA_F_NOPREFIXROUTE which | ||
7 | requires creating lapi/if_addr.h. Thus move IFA_FLAGS to lapi/if_addr.h, | ||
8 | as it belongs there and reuse lapi/if_addr.h in lapi/rtnetlink.h just | ||
9 | like <linux/rtnetlink.h> includes <linux/if_addr.h>. | ||
10 | |||
11 | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> | ||
12 | Upstream-Status: Submitted [https://lore.kernel.org/ltp/20210930183058.5240-3-petr.vorel@gmail.com/T/#u] | ||
13 | --- | ||
14 | include/lapi/if_addr.h | 16 ++++++++++++++++ | ||
15 | include/lapi/rtnetlink.h | 5 +---- | ||
16 | 2 files changed, 17 insertions(+), 4 deletions(-) | ||
17 | create mode 100644 include/lapi/if_addr.h | ||
18 | |||
19 | diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h | ||
20 | new file mode 100644 | ||
21 | index 000000000..4e50a0a4e | ||
22 | --- /dev/null | ||
23 | +++ b/include/lapi/if_addr.h | ||
24 | @@ -0,0 +1,16 @@ | ||
25 | +// SPDX-License-Identifier: GPL-2.0-or-later | ||
26 | +/* | ||
27 | + * Copyright (c) 2021 Petr Vorel <petr.vorel@gmail.com> | ||
28 | + */ | ||
29 | + | ||
30 | +#ifndef LAPI_IF_ADDR_H__ | ||
31 | +#define LAPI_IF_ADDR_H__ | ||
32 | + | ||
33 | +#include <linux/if_addr.h> | ||
34 | + | ||
35 | +#ifndef IFA_FLAGS | ||
36 | +# define IFA_FLAGS 8 | ||
37 | +#endif | ||
38 | + | ||
39 | + | ||
40 | +#endif /* LAPI_IF_ADDR_H__ */ | ||
41 | diff --git a/include/lapi/rtnetlink.h b/include/lapi/rtnetlink.h | ||
42 | index 04e9ad51a..089bf1a0d 100644 | ||
43 | --- a/include/lapi/rtnetlink.h | ||
44 | +++ b/include/lapi/rtnetlink.h | ||
45 | @@ -5,9 +5,6 @@ | ||
46 | # define LAPI_RTNETLINK_H__ | ||
47 | |||
48 | #include <linux/rtnetlink.h> | ||
49 | - | ||
50 | -#ifndef IFA_FLAGS | ||
51 | -# define IFA_FLAGS 8 | ||
52 | -#endif | ||
53 | +#include "lapi/if_addr.h" | ||
54 | |||
55 | #endif /* LAPI_RTNETLINK_H__ */ | ||
56 | -- | ||
57 | 2.33.0 | ||
58 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch b/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch deleted file mode 100644 index f510fda8c9..0000000000 --- a/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 9e357fb4fc00ab9c303e314b85b9ae3836141f81 Mon Sep 17 00:00:00 2001 | ||
2 | From: Petr Vorel <petr.vorel@gmail.com> | ||
3 | Date: Wed, 29 Sep 2021 19:56:29 +0200 | ||
4 | Subject: [PATCH] lapi/if_addr.h: Define IFA_F_NOPREFIXROUTE | ||
5 | |||
6 | and use it in icmp_rate_limit01.c. | ||
7 | |||
8 | This fixes error on toolchains with very old kernel headers, e.g. | ||
9 | Buildroot sourcery-arm: | ||
10 | |||
11 | icmp_rate_limit01.c:82:3: error: 'IFA_F_NOPREFIXROUTE' undeclared (first use in this function) | ||
12 | IFA_F_NOPREFIXROUTE); | ||
13 | |||
14 | Fixed because IFA_F_NOPREFIXROUTE was added in 3.14 and the oldest | ||
15 | system we still support is Cent0S 7 with 3.10 kernel. | ||
16 | |||
17 | NOTE: Cent0S 7 is obviously heavily patched thus it contains | ||
18 | IFA_F_NOPREFIXROUTE and therefore CI build didn't catch this error. | ||
19 | |||
20 | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> | ||
21 | Upstream-Status: Submitted [https://lore.kernel.org/ltp/20210930183058.5240-4-petr.vorel@gmail.com/T/#u] | ||
22 | --- | ||
23 | include/lapi/if_addr.h | 3 +++ | ||
24 | testcases/cve/icmp_rate_limit01.c | 3 ++- | ||
25 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/include/lapi/if_addr.h b/include/lapi/if_addr.h | ||
28 | index 4e50a0a4e..0f7e44784 100644 | ||
29 | --- a/include/lapi/if_addr.h | ||
30 | +++ b/include/lapi/if_addr.h | ||
31 | @@ -12,5 +12,8 @@ | ||
32 | # define IFA_FLAGS 8 | ||
33 | #endif | ||
34 | |||
35 | +#ifndef IFA_F_NOPREFIXROUTE | ||
36 | +# define IFA_F_NOPREFIXROUTE 0x200 | ||
37 | +#endif | ||
38 | |||
39 | #endif /* LAPI_IF_ADDR_H__ */ | ||
40 | diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c | ||
41 | index b3a237b30..3ada32675 100644 | ||
42 | --- a/testcases/cve/icmp_rate_limit01.c | ||
43 | +++ b/testcases/cve/icmp_rate_limit01.c | ||
44 | @@ -27,11 +27,12 @@ | ||
45 | #include <sys/socket.h> | ||
46 | #include <netinet/in.h> | ||
47 | #include <arpa/inet.h> | ||
48 | -#include <linux/if_addr.h> | ||
49 | #include <linux/errqueue.h> | ||
50 | |||
51 | #include <sched.h> | ||
52 | #include <limits.h> | ||
53 | + | ||
54 | +#include "lapi/if_addr.h" | ||
55 | #include "tst_test.h" | ||
56 | #include "tst_netdevice.h" | ||
57 | |||
58 | -- | ||
59 | 2.33.0 | ||
60 | |||
diff --git a/meta/recipes-extended/ltp/ltp_20210927.bb b/meta/recipes-extended/ltp/ltp_20220121.bb index b5dfd8bb69..bf567c6fb8 100644 --- a/meta/recipes-extended/ltp/ltp_20210927.bb +++ b/meta/recipes-extended/ltp/ltp_20220121.bb | |||
@@ -22,14 +22,11 @@ CFLAGS:append:x86-64 = " -fomit-frame-pointer" | |||
22 | 22 | ||
23 | CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" | 23 | CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" |
24 | CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" | 24 | CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" |
25 | SRCREV = "12beeda351b5d758a729aaf695b836ccc9eb5304" | 25 | SRCREV = "b0561ad8d9ee9fe1244b5385e941eb65a21e91a1" |
26 | 26 | ||
27 | SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ | 27 | SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ |
28 | file://0001-Remove-OOM-tests-from-runtest-mm.patch \ | 28 | file://0001-Remove-OOM-tests-from-runtest-mm.patch \ |
29 | file://0002-lib-fix-MemAvailable-parsing.patch \ | 29 | file://0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch \ |
30 | file://0003-lapi-rtnetlink.h-Fix-include-guards.patch \ | ||
31 | file://0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch \ | ||
32 | file://0005-lapi-if_addr.h-Define-IFA_FLAGS.patch \ | ||
33 | " | 30 | " |
34 | 31 | ||
35 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
@@ -47,6 +44,10 @@ EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite " | |||
47 | # ltp network/rpc test cases ftbfs when libtirpc is found | 44 | # ltp network/rpc test cases ftbfs when libtirpc is found |
48 | EXTRA_OECONF += " --without-tirpc " | 45 | EXTRA_OECONF += " --without-tirpc " |
49 | 46 | ||
47 | do_compile() { | ||
48 | oe_runmake HOSTCC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_LDFLAGS="${LDFLAGS_FOR_BUILD}" | ||
49 | } | ||
50 | |||
50 | do_install(){ | 51 | do_install(){ |
51 | install -d ${D}${prefix}/ | 52 | install -d ${D}${prefix}/ |
52 | oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install include-install | 53 | oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install include-install |