diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-07-13 19:13:22 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-16 21:21:13 +0100 |
| commit | 7eac0c1f59442532e39e0ec2ce031d9473925328 (patch) | |
| tree | fd25b4bbcbb2f60026dabcf0182e4992a221eb97 | |
| parent | 752eb3839a46c70f2a847854386e9929d0e6d680 (diff) | |
| download | openembedded-core-contrib-7eac0c1f59442532e39e0ec2ce031d9473925328.tar.gz | |
systemd: Fix libseccomp testcase involving __NR_ppoll
Some architectures may not have this syscall
Signed-off-by: Khem Raj <raj.khem@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-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_248.3.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch b/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch new file mode 100644 index 0000000000..0ba5fa2547 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch @@ -0,0 +1,39 @@ +From 027ac2ad0695bb506460f9dd7e57149b71055887 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Jun 2021 23:21:01 -0700 +Subject: [PATCH] test-seccomp: Check for __NR_ppoll before use + +some newer architectures like riscv32 do not have __NR_ppoll from get go + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19858] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/test/test-seccomp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c +index b1f917eb54..daac0fcea8 100644 +--- a/src/test/test-seccomp.c ++++ b/src/test/test-seccomp.c +@@ -832,7 +832,7 @@ static void test_load_syscall_filter_set_raw(void) { + assert_se(s = hashmap_new(NULL)); + #if defined __NR_poll && __NR_poll >= 0 + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); +-#else ++#elif defined __NR_ppoll + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); + #endif + +@@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) { + assert_se(s = hashmap_new(NULL)); + #if defined __NR_poll && __NR_poll >= 0 + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); +-#else ++#elif defined __NR_ppoll ++ assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); + #endif + +-- +2.32.0 + diff --git a/meta/recipes-core/systemd/systemd_248.3.bb b/meta/recipes-core/systemd/systemd_248.3.bb index 37607708f7..f5022a99c2 100644 --- a/meta/recipes-core/systemd/systemd_248.3.bb +++ b/meta/recipes-core/systemd/systemd_248.3.bb @@ -26,6 +26,7 @@ SRC_URI += " \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ file://0001-test-parse-argument-Include-signal.h.patch \ + file://0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch \ " # patches needed by musl |