[PATCH 1/2] libseccomp: Update to main branch

[PATCH 1/2] libseccomp: Update to main branch

[Khem Raj]

Get RV32 imlementation

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-configure.ac-Bump-version-to-2.5.99.patch | 26 +++++++++++++++++++
 .../libseccomp/libseccomp_2.5.1.bb            |  7 +++--
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch

diff --git a/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
new file mode 100644
index 0000000000..f30ca77465
--- /dev/null
+++ b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
@@ -0,0 +1,26 @@
+From 00b6bc440a75443f9bea431bbb41df50469b5093 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Jun 2021 23:13:20 -0700
+Subject: [PATCH] configure.ac: Bump version to 2.5.99
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3e87734..48e796f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@ dnl #
+ dnl ####
+ dnl libseccomp defines
+ dnl ####
+-AC_INIT([libseccomp], [0.0.0])
++AC_INIT([libseccomp], [2.5.99])
+ 
+ dnl ####
+ dnl autoconf configuration
+-- 
+2.32.0
+
diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
index 8fe1023901..5f79f3dbcb 100644
--- a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
+++ b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
@@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c
 
 DEPENDS += "gperf-native"
 
-SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
+SRCREV = "${AUTOREV}"
 
-SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
+SRC_URI = "git://github.com/kraj/libseccomp.git;branch=riscv32 \
+           file://0001-configure.ac-Bump-version-to-2.5.99.patch \
            file://run-ptest \
            "
 
-COMPATIBLE_HOST_riscv32 = "null"
-
 S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig ptest features_check
-- 
2.32.0

[PATCH 2/2] systemd: Fix libseccomp testcase involving __NR_ppoll

[Khem Raj]

Some architectures may not have this syscall

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...comp-Check-for-__NR_ppoll-before-use.patch | 39 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_248.3.bb    |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch

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
-- 
2.32.0

Re: [OE-core] [PATCH 1/2] libseccomp: Update to main branch

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2577 bytes --]

Did you forget to replace AUTOREV with new SRCREV when you were done?

On Wed, Jul 14, 2021 at 4:13 AM Khem Raj <raj.khem@gmail.com> wrote:

> Get RV32 imlementation
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...-configure.ac-Bump-version-to-2.5.99.patch | 26 +++++++++++++++++++
>  .../libseccomp/libseccomp_2.5.1.bb            |  7 +++--
>  2 files changed, 29 insertions(+), 4 deletions(-)
>  create mode 100644
> meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
>
> diff --git
> a/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> new file mode 100644
> index 0000000000..f30ca77465
> --- /dev/null
> +++
> b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> @@ -0,0 +1,26 @@
> +From 00b6bc440a75443f9bea431bbb41df50469b5093 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Tue, 8 Jun 2021 23:13:20 -0700
> +Subject: [PATCH] configure.ac: Bump version to 2.5.99
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 3e87734..48e796f 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -19,7 +19,7 @@ dnl #
> + dnl ####
> + dnl libseccomp defines
> + dnl ####
> +-AC_INIT([libseccomp], [0.0.0])
> ++AC_INIT([libseccomp], [2.5.99])
> +
> + dnl ####
> + dnl autoconf configuration
> +--
> +2.32.0
> +
> diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> index 8fe1023901..5f79f3dbcb 100644
> --- a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c
>
>  DEPENDS += "gperf-native"
>
> -SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
> +SRCREV = "${AUTOREV}"
>
> -SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
> +SRC_URI = "git://github.com/kraj/libseccomp.git;branch=riscv32 \
> +           file://0001-configure.ac-Bump-version-to-2.5.99.patch \
>             file://run-ptest \
>             "
>
> -COMPATIBLE_HOST_riscv32 = "null"
> -
>  S = "${WORKDIR}/git"
>
>  inherit autotools-brokensep pkgconfig ptest features_check
> --
> 2.32.0
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 4248 bytes --]

Re: [OE-core] [PATCH 1/2] libseccomp: Update to main branch

[Khem Raj]

On Tue, Jul 13, 2021 at 10:46 PM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> Did you forget to replace AUTOREV with new SRCREV when you were done?
>

hmm yes i did

> On Wed, Jul 14, 2021 at 4:13 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Get RV32 imlementation
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  ...-configure.ac-Bump-version-to-2.5.99.patch | 26 +++++++++++++++++++
>>  .../libseccomp/libseccomp_2.5.1.bb            |  7 +++--
>>  2 files changed, 29 insertions(+), 4 deletions(-)
>>  create mode 100644 meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
>>
>> diff --git a/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
>> new file mode 100644
>> index 0000000000..f30ca77465
>> --- /dev/null
>> +++ b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
>> @@ -0,0 +1,26 @@
>> +From 00b6bc440a75443f9bea431bbb41df50469b5093 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Tue, 8 Jun 2021 23:13:20 -0700
>> +Subject: [PATCH] configure.ac: Bump version to 2.5.99
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +---
>> + configure.ac | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/configure.ac b/configure.ac
>> +index 3e87734..48e796f 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -19,7 +19,7 @@ dnl #
>> + dnl ####
>> + dnl libseccomp defines
>> + dnl ####
>> +-AC_INIT([libseccomp], [0.0.0])
>> ++AC_INIT([libseccomp], [2.5.99])
>> +
>> + dnl ####
>> + dnl autoconf configuration
>> +--
>> +2.32.0
>> +
>> diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
>> index 8fe1023901..5f79f3dbcb 100644
>> --- a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
>> +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
>> @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c
>>
>>  DEPENDS += "gperf-native"
>>
>> -SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
>> +SRCREV = "${AUTOREV}"
>>
>> -SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
>> +SRC_URI = "git://github.com/kraj/libseccomp.git;branch=riscv32 \
>> +           file://0001-configure.ac-Bump-version-to-2.5.99.patch \
>>             file://run-ptest \
>>             "
>>
>> -COMPATIBLE_HOST_riscv32 = "null"
>> -
>>  S = "${WORKDIR}/git"
>>
>>  inherit autotools-brokensep pkgconfig ptest features_check
>> --
>> 2.32.0
>>
>>
>> 
>>

Re: [OE-core] [PATCH 1/2] libseccomp: Update to main branch

[Armin Kuster]

On 7/13/21 7:13 PM, Khem Raj wrote:
> Get RV32 imlementation

The subject is miss leading. You are replacing the upstream url with
your github version to make riscv easier. Is this the preferred method
of supporting new Architectures?

-armin
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...-configure.ac-Bump-version-to-2.5.99.patch | 26 +++++++++++++++++++
>  .../libseccomp/libseccomp_2.5.1.bb            |  7 +++--
>  2 files changed, 29 insertions(+), 4 deletions(-)
>  create mode 100644 meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
>
> diff --git a/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> new file mode 100644
> index 0000000000..f30ca77465
> --- /dev/null
> +++ b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> @@ -0,0 +1,26 @@
> +From 00b6bc440a75443f9bea431bbb41df50469b5093 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Tue, 8 Jun 2021 23:13:20 -0700
> +Subject: [PATCH] configure.ac: Bump version to 2.5.99
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 3e87734..48e796f 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -19,7 +19,7 @@ dnl #
> + dnl ####
> + dnl libseccomp defines
> + dnl ####
> +-AC_INIT([libseccomp], [0.0.0])
> ++AC_INIT([libseccomp], [2.5.99])
> + 
> + dnl ####
> + dnl autoconf configuration
> +-- 
> +2.32.0
> +
> diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> index 8fe1023901..5f79f3dbcb 100644
> --- a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c
>  
>  DEPENDS += "gperf-native"
>  
> -SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
> +SRCREV = "${AUTOREV}"
>  
> -SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
> +SRC_URI = "git://github.com/kraj/libseccomp.git;branch=riscv32 \
> +           file://0001-configure.ac-Bump-version-to-2.5.99.patch \
>             file://run-ptest \
>             "
>  
> -COMPATIBLE_HOST_riscv32 = "null"
> -
>  S = "${WORKDIR}/git"
>  
>  inherit autotools-brokensep pkgconfig ptest features_check
>
> 
>

Re: [OE-core] [PATCH 1/2] libseccomp: Update to main branch

[Richard Purdie]

On Sat, 2021-07-17 at 14:30 -0700, Armin Kuster wrote:
> 
> On 7/13/21 7:13 PM, Khem Raj wrote:
> > Get RV32 imlementation
> 
> The subject is miss leading. You are replacing the upstream url with
> your github version to make riscv easier. Is this the preferred method
> of supporting new Architectures?

Please don't do this :(

We need to reference the main upstream repo, not a fork of for some 
specific feature work.

Cheers,

Richard

Re: [OE-core] [PATCH 1/2] libseccomp: Update to main branch

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2987 bytes --]

On Sat, Jul 17, 2021 at 2:30 PM akuster808 <akuster808@gmail.com> wrote:

>
>
> On 7/13/21 7:13 PM, Khem Raj wrote:
> > Get RV32 imlementation
>
> The subject is miss leading. You are replacing the upstream url with
> your github version to make riscv easier. Is this the preferred method
> of supporting new Architectures?


No. You are looking at obsolete patch please review v2 and the patches are
already submitted upstream as well


>
> -armin
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  ...-configure.ac-Bump-version-to-2.5.99.patch | 26 +++++++++++++++++++
> >  .../libseccomp/libseccomp_2.5.1.bb            |  7 +++--
> >  2 files changed, 29 insertions(+), 4 deletions(-)
> >  create mode 100644
> meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> >
> > diff --git
> a/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> > new file mode 100644
> > index 0000000000..f30ca77465
> > --- /dev/null
> > +++
> b/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch
> > @@ -0,0 +1,26 @@
> > +From 00b6bc440a75443f9bea431bbb41df50469b5093 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Tue, 8 Jun 2021 23:13:20 -0700
> > +Subject: [PATCH] configure.ac: Bump version to 2.5.99
> > +
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > + configure.ac | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/configure.ac b/configure.ac
> > +index 3e87734..48e796f 100644
> > +--- a/configure.ac
> > ++++ b/configure.ac
> > +@@ -19,7 +19,7 @@ dnl #
> > + dnl ####
> > + dnl libseccomp defines
> > + dnl ####
> > +-AC_INIT([libseccomp], [0.0.0])
> > ++AC_INIT([libseccomp], [2.5.99])
> > +
> > + dnl ####
> > + dnl autoconf configuration
> > +--
> > +2.32.0
> > +
> > diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> > index 8fe1023901..5f79f3dbcb 100644
> > --- a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> > +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb
> > @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c
> >
> >  DEPENDS += "gperf-native"
> >
> > -SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7"
> > +SRCREV = "${AUTOREV}"
> >
> > -SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \
> > +SRC_URI = "git://github.com/kraj/libseccomp.git;branch=riscv32 \
> > +           file://0001-configure.ac-Bump-version-to-2.5.99.patch \
> >             file://run-ptest \
> >             "
> >
> > -COMPATIBLE_HOST_riscv32 = "null"
> > -
> >  S = "${WORKDIR}/git"
> >
> >  inherit autotools-brokensep pkgconfig ptest features_check
> >
> > 
> >
>
>

[-- Attachment #2: Type: text/html, Size: 5064 bytes --]