diff options
| author | Petr Vorel <petr.vorel@gmail.com> | 2021-10-02 19:25:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 11:27:12 +0100 |
| commit | 7a17e14be9bfa2ed8ff179b95e6b51b2e387e2ac (patch) | |
| tree | 4e7795f4d757ec994041146b932e3af7898f839c | |
| parent | 04d9b25833f9f36a06f4285cb7dcddd80e92da47 (diff) | |
| download | poky-7a17e14be9bfa2ed8ff179b95e6b51b2e387e2ac.tar.gz | |
ltp: Update to 20210927
New patches to fix functionality:
* 0002-lib-fix-MemAvailable-parsing.patch
* 0003-lapi-rtnetlink.h-Fix-include-guards.patch
* 0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
* 0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
Removed patch from this release
* 0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
Rebased patch
* 0001-Remove-OOM-tests-from-runtest-mm.patch
* Updated copying (reduced files in 5eff445d4 ("Reduce LICENCE/COPYING files"))
* Updated removed musl incompatible files in
remove_broken_musl_sources() (process.c was removed in 926d3b906
("sched: Remove process.c")), also update link to CI file.
[RP: Fixed Upstream-Status lines in patches]
(From OE-Core rev: c227daf3c40666ea8f2b28bd1006633f5efb4692)
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch | 12 | ||||
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch | 59 | ||||
| -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_20210927.bb (renamed from meta/recipes-extended/ltp/ltp_20210524.bb) | 17 |
7 files changed, 206 insertions, 73 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch index e51950f153..6d945700be 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001 | 1 | From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> | 2 | From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> |
| 3 | Date: Wed, 29 Jul 2020 08:47:09 -0400 | 3 | Date: Wed, 29 Jul 2020 08:47:09 -0400 |
| 4 | Subject: [PATCH] Remove OOM tests from runtest/mm | 4 | Subject: [PATCH] Remove OOM tests from runtest/mm |
| @@ -7,16 +7,17 @@ Disable OOM tests, as they might cause oeqa ssh connection lost | |||
| 7 | 7 | ||
| 8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
| 9 | Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> | 9 | Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> |
| 10 | 10 | [ pvorel: rebased for 20210927 ] | |
| 11 | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> | ||
| 11 | --- | 12 | --- |
| 12 | runtest/mm | 6 ------ | 13 | runtest/mm | 6 ------ |
| 13 | 1 file changed, 6 deletions(-) | 14 | 1 file changed, 6 deletions(-) |
| 14 | 15 | ||
| 15 | diff --git a/runtest/mm b/runtest/mm | 16 | diff --git a/runtest/mm b/runtest/mm |
| 16 | index 481d39691..cf207d10e 100644 | 17 | index 6537666a9..e5a091a5a 100644 |
| 17 | --- a/runtest/mm | 18 | --- a/runtest/mm |
| 18 | +++ b/runtest/mm | 19 | +++ b/runtest/mm |
| 19 | @@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 10000 | 20 | @@ -73,12 +73,6 @@ ksm06_2 ksm06 -n 8000 |
| 20 | 21 | ||
| 21 | cpuset01 cpuset01 | 22 | cpuset01 cpuset01 |
| 22 | 23 | ||
| @@ -29,3 +30,6 @@ index 481d39691..cf207d10e 100644 | |||
| 29 | swapping01 swapping01 -i 5 | 30 | swapping01 swapping01 -i 5 |
| 30 | 31 | ||
| 31 | thp01 thp01 -I 120 | 32 | thp01 thp01 -I 120 |
| 33 | -- | ||
| 34 | 2.33.0 | ||
| 35 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch deleted file mode 100644 index 08b88a38f3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | From af2b6f5ee6b171078b18246dd73f71cf6e350859 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Marius Hillenbrand <mhillen@linux.ibm.com> | ||
| 3 | Date: Mon, 19 Jul 2021 13:58:35 +0800 | ||
| 4 | Subject: [PATCH] syscalls/ioctl_ns05.c, ioctl_ns06.c: Fix too small buffer for | ||
| 5 | path | ||
| 6 | |||
| 7 | commit af2b6f5ee6b171078b18246dd73f71cf6e350859 upstream. | ||
| 8 | |||
| 9 | Resize the buffer used for paths into /proc/ to grant enough space | ||
| 10 | for long PIDs. While at it, replace sprintf with snprintf to avoid | ||
| 11 | buffer overflows if we ever ran out of space again. | ||
| 12 | |||
| 13 | Fixes: #847 | ||
| 14 | Signed-off-by: Marius Hillenbrand <mhillen@linux.ibm.com> | ||
| 15 | Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com> | ||
| 16 | Upstream-Status: Backport | ||
| 17 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
| 18 | |||
| 19 | diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c | ||
| 20 | index a67ddbe2c66f..52613810c7ce 100644 | ||
| 21 | --- a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c | ||
| 22 | +++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c | ||
| 23 | @@ -59,10 +59,10 @@ static void run(void) | ||
| 24 | if (pid == -1) | ||
| 25 | tst_brk(TBROK | TERRNO, "ltp_clone failed"); | ||
| 26 | |||
| 27 | - char child_namespace[20]; | ||
| 28 | + char child_namespace[30]; | ||
| 29 | int my_fd, child_fd, parent_fd; | ||
| 30 | |||
| 31 | - sprintf(child_namespace, "/proc/%i/ns/pid", pid); | ||
| 32 | + snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/pid", pid); | ||
| 33 | my_fd = SAFE_OPEN("/proc/self/ns/pid", O_RDONLY); | ||
| 34 | child_fd = SAFE_OPEN(child_namespace, O_RDONLY); | ||
| 35 | parent_fd = ioctl(child_fd, NS_GET_PARENT); | ||
| 36 | diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c | ||
| 37 | index b6ac80208d02..c30f7de91e09 100644 | ||
| 38 | --- a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c | ||
| 39 | +++ b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c | ||
| 40 | @@ -51,14 +51,14 @@ static int child(void *arg LTP_ATTRIBUTE_UNUSED) | ||
| 41 | |||
| 42 | static void run(void) | ||
| 43 | { | ||
| 44 | - char child_namespace[20]; | ||
| 45 | + char child_namespace[30]; | ||
| 46 | |||
| 47 | pid_t pid = ltp_clone(CLONE_NEWUSER | SIGCHLD, &child, 0, | ||
| 48 | STACK_SIZE, child_stack); | ||
| 49 | if (pid == -1) | ||
| 50 | tst_brk(TBROK | TERRNO, "ltp_clone failed"); | ||
| 51 | |||
| 52 | - sprintf(child_namespace, "/proc/%i/ns/user", pid); | ||
| 53 | + snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/user", pid); | ||
| 54 | int my_fd, child_fd, parent_fd; | ||
| 55 | |||
| 56 | my_fd = SAFE_OPEN("/proc/self/ns/user", O_RDONLY); | ||
| 57 | -- | ||
| 58 | 2.32.0 | ||
| 59 | |||
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 new file mode 100644 index 0000000000..1860b95ce9 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 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 new file mode 100644 index 0000000000..6fcafaff1c --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 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 new file mode 100644 index 0000000000..19ac3ba046 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch | |||
| @@ -0,0 +1,58 @@ | |||
| 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 new file mode 100644 index 0000000000..f510fda8c9 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | |||
| @@ -0,0 +1,60 @@ | |||
| 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_20210524.bb b/meta/recipes-extended/ltp/ltp_20210927.bb index 20e2deffa5..359a00132e 100644 --- a/meta/recipes-extended/ltp/ltp_20210524.bb +++ b/meta/recipes-extended/ltp/ltp_20210927.bb | |||
| @@ -5,13 +5,8 @@ SECTION = "console/utils" | |||
| 5 | LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" | 5 | LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" |
| 6 | LIC_FILES_CHKSUM = "\ | 6 | LIC_FILES_CHKSUM = "\ |
| 7 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 7 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 8 | file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | ||
| 9 | file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ | ||
| 10 | file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ | ||
| 11 | file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ | ||
| 12 | file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ | 8 | file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ |
| 13 | file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | 9 | file://testcases/network/can/filter-tests/COPYING;md5=5b155ea7d7f86eae8e8832955d8b70bc \ |
| 14 | file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
| 15 | " | 10 | " |
| 16 | 11 | ||
| 17 | DEPENDS = "attr libaio libcap acl openssl zip-native" | 12 | DEPENDS = "attr libaio libcap acl openssl zip-native" |
| @@ -27,11 +22,14 @@ CFLAGS:append:x86-64 = " -fomit-frame-pointer" | |||
| 27 | 22 | ||
| 28 | CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" | 23 | CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" |
| 29 | CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" | 24 | CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" |
| 30 | SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd" | 25 | SRCREV = "12beeda351b5d758a729aaf695b836ccc9eb5304" |
| 31 | 26 | ||
| 32 | SRC_URI = "git://github.com/linux-test-project/ltp.git \ | 27 | SRC_URI = "git://github.com/linux-test-project/ltp.git \ |
| 33 | file://0001-Remove-OOM-tests-from-runtest-mm.patch \ | 28 | file://0001-Remove-OOM-tests-from-runtest-mm.patch \ |
| 34 | file://0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch \ | 29 | file://0002-lib-fix-MemAvailable-parsing.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 \ | ||
| 35 | " | 33 | " |
| 36 | 34 | ||
| 37 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |
| @@ -119,9 +117,8 @@ remove_broken_musl_sources() { | |||
| 119 | echo "WARNING: remove unsupported tests (until they're fixed)" | 117 | echo "WARNING: remove unsupported tests (until they're fixed)" |
| 120 | 118 | ||
| 121 | # sync with upstream | 119 | # sync with upstream |
| 122 | # https://github.com/linux-test-project/ltp/blob/master/travis/alpine.sh#L33 | 120 | # https://github.com/linux-test-project/ltp/blob/master/ci/alpine.sh#L33 |
| 123 | rm -rfv \ | 121 | rm -rfv \ |
| 124 | testcases/kernel/sched/process_stress/process.c \ | ||
| 125 | testcases/kernel/syscalls/confstr/confstr01.c \ | 122 | testcases/kernel/syscalls/confstr/confstr01.c \ |
| 126 | testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ | 123 | testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ |
| 127 | testcases/kernel/syscalls/getcontext/getcontext01.c \ | 124 | testcases/kernel/syscalls/getcontext/getcontext01.c \ |
