* [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK
@ 2020-03-01 16:26 Romain Naour
2020-03-01 16:26 ` [Buildroot] [PATCH 2/2] support/testing: test_systemd.py: add linux fragment to enable CONFIG_BINFMT_MISC Romain Naour
2020-03-01 16:52 ` [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK Yann E. MORIN
0 siblings, 2 replies; 4+ messages in thread
From: Romain Naour @ 2020-03-01 16:26 UTC (permalink / raw)
To: buildroot
GRND_NONBLOCK has been introduced with the 3.17 kernel version [1]
while adding getrandom(2) system call.
The header missing_random.h is needed for random-seed.c when building
with old toolchain, such Sourcery CodeBench ARM 2014.05 (kernel headers
3.13).
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/454255917
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=c6e9d6f38894798696f23c8084ca7edbf16ee895
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
...add-missing-header-for-GRND_NONBLOCK.patch | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch
diff --git a/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch b/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch
new file mode 100644
index 0000000000..e74df10e9d
--- /dev/null
+++ b/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch
@@ -0,0 +1,39 @@
+From 806e2011a0ea684b10a07b74c4ee0f817437e8c6 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@smile.fr>
+Date: Sun, 1 Mar 2020 15:19:01 +0100
+Subject: [PATCH] random-seed: add missing header for GRND_NONBLOCK
+
+GRND_NONBLOCK has been introduced with the 3.17 kernel version [1]
+while adding getrandom(2) system call.
+
+The header missing_random.h is needed for random-seed.c when building
+with old toolchain, such Sourcery CodeBench ARM 2014.05.
+
+Fixes:
+https://gitlab.com/buildroot.org/buildroot/-/jobs/454255917
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=c6e9d6f38894798696f23c8084ca7edbf16ee895
+
+Upstream status:
+https://github.com/systemd/systemd/pull/14988
+
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+---
+ src/random-seed/random-seed.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
+index 2fcbcb281a..596bff98f1 100644
+--- a/src/random-seed/random-seed.c
++++ b/src/random-seed/random-seed.c
+@@ -19,6 +19,7 @@
+ #include "io-util.h"
+ #include "log.h"
+ #include "main-func.h"
++#include "missing_random.h"
+ #include "missing_syscall.h"
+ #include "mkdir.h"
+ #include "parse-util.h"
+--
+2.24.1
+
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] support/testing: test_systemd.py: add linux fragment to enable CONFIG_BINFMT_MISC
2020-03-01 16:26 [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK Romain Naour
@ 2020-03-01 16:26 ` Romain Naour
2020-03-01 17:48 ` Yann E. MORIN
2020-03-01 16:52 ` [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK Yann E. MORIN
1 sibling, 1 reply; 4+ messages in thread
From: Romain Naour @ 2020-03-01 16:26 UTC (permalink / raw)
To: buildroot
While investigating [1] one units failed due to missing kernel option
CONFIG_BINFMT_MISC needed by "proc-sys-fs-binfmt_misc.mount" service.
It's because the kernel support autofs4 but not MISC binaries.
Since the systemd test infra use the default defconfig (vexpress),
we need to provide a linux fragment to enable CONFIG_BINFMT_MISC.
[1] https://gitlab.com/buildroot.org/buildroot/-/jobs/454255917
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
support/testing/tests/init/systemd-linux/linux.fragment | 2 ++
support/testing/tests/init/test_systemd.py | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 support/testing/tests/init/systemd-linux/linux.fragment
diff --git a/support/testing/tests/init/systemd-linux/linux.fragment b/support/testing/tests/init/systemd-linux/linux.fragment
new file mode 100644
index 0000000000..7c992ff71b
--- /dev/null
+++ b/support/testing/tests/init/systemd-linux/linux.fragment
@@ -0,0 +1,2 @@
+# Needed for binfmt_misc service: "Arbitrary Executable File Formats File System"
+CONFIG_BINFMT_MISC=y
diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py
index a324ba8569..0300b58be8 100644
--- a/support/testing/tests/init/test_systemd.py
+++ b/support/testing/tests/init/test_systemd.py
@@ -13,10 +13,11 @@ class InitSystemSystemdBase(InitSystemBase):
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
# BR2_TARGET_ROOTFS_TAR is not set
- """
+ """.format(infra.filepath("tests/init/systemd-linux/linux.fragment"))
def check_init(self):
super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd")
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/2] support/testing: test_systemd.py: add linux fragment to enable CONFIG_BINFMT_MISC
2020-03-01 16:26 ` [Buildroot] [PATCH 2/2] support/testing: test_systemd.py: add linux fragment to enable CONFIG_BINFMT_MISC Romain Naour
@ 2020-03-01 17:48 ` Yann E. MORIN
0 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2020-03-01 17:48 UTC (permalink / raw)
To: buildroot
Applied to master, thanks.
I just moved the kernel fragment with the others in the conf/ sub-dir of
the test infra. Yeah, the lxc fragment is not there, though, but that's
the outlier now.
Regards,
Yann E. MORIN.
On 2020-03-01 17:26 +0100, Romain Naour spake thusly:
> While investigating [1] one units failed due to missing kernel option
> CONFIG_BINFMT_MISC needed by "proc-sys-fs-binfmt_misc.mount" service.
>
> It's because the kernel support autofs4 but not MISC binaries.
>
> Since the systemd test infra use the default defconfig (vexpress),
> we need to provide a linux fragment to enable CONFIG_BINFMT_MISC.
>
> [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/454255917
>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> support/testing/tests/init/systemd-linux/linux.fragment | 2 ++
> support/testing/tests/init/test_systemd.py | 3 ++-
> 2 files changed, 4 insertions(+), 1 deletion(-)
> create mode 100644 support/testing/tests/init/systemd-linux/linux.fragment
>
> diff --git a/support/testing/tests/init/systemd-linux/linux.fragment b/support/testing/tests/init/systemd-linux/linux.fragment
> new file mode 100644
> index 0000000000..7c992ff71b
> --- /dev/null
> +++ b/support/testing/tests/init/systemd-linux/linux.fragment
> @@ -0,0 +1,2 @@
> +# Needed for binfmt_misc service: "Arbitrary Executable File Formats File System"
> +CONFIG_BINFMT_MISC=y
> diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py
> index a324ba8569..0300b58be8 100644
> --- a/support/testing/tests/init/test_systemd.py
> +++ b/support/testing/tests/init/test_systemd.py
> @@ -13,10 +13,11 @@ class InitSystemSystemdBase(InitSystemBase):
> BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
> BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
> + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
> # BR2_TARGET_ROOTFS_TAR is not set
> - """
> + """.format(infra.filepath("tests/init/systemd-linux/linux.fragment"))
>
> def check_init(self):
> super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd")
> --
> 2.24.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK
2020-03-01 16:26 [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK Romain Naour
2020-03-01 16:26 ` [Buildroot] [PATCH 2/2] support/testing: test_systemd.py: add linux fragment to enable CONFIG_BINFMT_MISC Romain Naour
@ 2020-03-01 16:52 ` Yann E. MORIN
1 sibling, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2020-03-01 16:52 UTC (permalink / raw)
To: buildroot
Romain, All,
On 2020-03-01 17:26 +0100, Romain Naour spake thusly:
> GRND_NONBLOCK has been introduced with the 3.17 kernel version [1]
> while adding getrandom(2) system call.
>
> The header missing_random.h is needed for random-seed.c when building
> with old toolchain, such Sourcery CodeBench ARM 2014.05 (kernel headers
> 3.13).
>
> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/454255917
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=c6e9d6f38894798696f23c8084ca7edbf16ee895
>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...add-missing-header-for-GRND_NONBLOCK.patch | 39 +++++++++++++++++++
> 1 file changed, 39 insertions(+)
> create mode 100644 package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch
>
> diff --git a/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch b/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch
> new file mode 100644
> index 0000000000..e74df10e9d
> --- /dev/null
> +++ b/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch
> @@ -0,0 +1,39 @@
> +From 806e2011a0ea684b10a07b74c4ee0f817437e8c6 Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@smile.fr>
> +Date: Sun, 1 Mar 2020 15:19:01 +0100
> +Subject: [PATCH] random-seed: add missing header for GRND_NONBLOCK
> +
> +GRND_NONBLOCK has been introduced with the 3.17 kernel version [1]
> +while adding getrandom(2) system call.
> +
> +The header missing_random.h is needed for random-seed.c when building
> +with old toolchain, such Sourcery CodeBench ARM 2014.05.
> +
> +Fixes:
> +https://gitlab.com/buildroot.org/buildroot/-/jobs/454255917
> +
> +[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=c6e9d6f38894798696f23c8084ca7edbf16ee895
> +
> +Upstream status:
> +https://github.com/systemd/systemd/pull/14988
> +
> +Signed-off-by: Romain Naour <romain.naour@smile.fr>
> +---
> + src/random-seed/random-seed.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
> +index 2fcbcb281a..596bff98f1 100644
> +--- a/src/random-seed/random-seed.c
> ++++ b/src/random-seed/random-seed.c
> +@@ -19,6 +19,7 @@
> + #include "io-util.h"
> + #include "log.h"
> + #include "main-func.h"
> ++#include "missing_random.h"
> + #include "missing_syscall.h"
> + #include "mkdir.h"
> + #include "parse-util.h"
> +--
> +2.24.1
> +
> --
> 2.24.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-01 17:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-01 16:26 [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK Romain Naour
2020-03-01 16:26 ` [Buildroot] [PATCH 2/2] support/testing: test_systemd.py: add linux fragment to enable CONFIG_BINFMT_MISC Romain Naour
2020-03-01 17:48 ` Yann E. MORIN
2020-03-01 16:52 ` [Buildroot] [PATCH 1/2] package/systemd: random-seed: add missing header for GRND_NONBLOCK Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox