[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: Re: [OE-core] [PATCH 2/8] systemd: update 248.3 -> 249.1
From: "Martin Jansa" <Martin.Jansa () gmail ! com>
Date: 2021-07-29 13:37:33
Message-ID: CA+chaQeGNy_8NQfcwA+Qn1ZFfWXPbL9_+pts64oeet4rSw0WcQ () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
FYI: This introduces new build failure with ld-is-gold in DISTRO_FEATURES:
> [17/21] Generating linuxx64.elf.stub with a custom command
> FAILED: src/boot/efi/linuxx64.elf.stub
>
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-ld
-o src/boot/efi/linuxx64.elf.stub -T
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/elf_x86_64_efi.lds
-shared -Bsymbolic -nostdlib -znocombreloc --build-id=sha1 -L
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/crt0-efi-x86_64.o
src/boot/efi/string-util-fundamental.c.o src/boot/efi/disk.c.o
src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o
src/boot/efi/secure-boot.c.o src/boot/efi/util.c.o src/boot/efi/linux.c.o
src/boot/efi/splash.c.o src/boot/efi/stub.c.o -lefi -lgnuefi
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/../lib/x86_64-oe-linux/11.1.1/libgcc.a
|
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-ld:
internal error in segment_precedes, at ../../gold/layout.cc:3721
> [18/21] Generating boot.c.o with a custom command
On Fri, Jul 23, 2021 at 12:45 AM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> jinja is now required:
>
> https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704
>
> Drop 0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch as it is a
> backport.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...md-boot_248.3.bb => systemd-boot_249.1.bb} | 2 +-
> meta/recipes-core/systemd/systemd.inc | 4 +-
> ...tall-dependency-links-at-install-tim.patch | 38 +++++++++---------
> ...comp-Check-for-__NR_ppoll-before-use.patch | 39 -------------------
> .../{systemd_248.3.bb => systemd_249.1.bb} | 7 ++--
> 5 files changed, 25 insertions(+), 65 deletions(-)
> rename meta/recipes-core/systemd/{systemd-boot_248.3.bb =>
> systemd-boot_249.1.bb} (98%)
> delete mode 100644
> meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch
> rename meta/recipes-core/systemd/{systemd_248.3.bb => systemd_249.1.bb}
> (99%)
>
> diff --git a/meta/recipes-core/systemd/systemd-boot_248.3.bb
> b/meta/recipes-core/systemd/systemd-boot_249.1.bb
> similarity index 98%
> rename from meta/recipes-core/systemd/systemd-boot_248.3.bb
> rename to meta/recipes-core/systemd/systemd-boot_249.1.bb
> index 249e620f4e..2c0bec4eda 100644
> --- a/meta/recipes-core/systemd/systemd-boot_248.3.bb
> +++ b/meta/recipes-core/systemd/systemd-boot_249.1.bb
> @@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
>
> require conf/image-uefi.conf
>
> -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
> +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native
> python3-jinja2-native"
>
> inherit meson pkgconfig gettext
> inherit deploy
> diff --git a/meta/recipes-core/systemd/systemd.inc
> b/meta/recipes-core/systemd/systemd.inc
> index 0524a25008..0e92a72bb7 100644
> --- a/meta/recipes-core/systemd/systemd.inc
> +++ b/meta/recipes-core/systemd/systemd.inc
> @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
> LIC_FILES_CHKSUM =
> "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
>
> file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
>
> -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"
> -SRCBRANCH = "v248-stable"
> +SRCREV = "764b74113e36ac5219a4b82a05f311b5a92136ce"
> +SRCBRANCH = "v249-stable"
> SRC_URI = "git://
> github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}
> <http://github.com/systemd/systemd-stable.git;protocol=git;branch=$%7BSRCBRANCH%7D>
> \
> "
>
> diff --git
> a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> index 8dd22eeb7b..d3af734e06 100644
> ---
> a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> +++
> b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> @@ -1,4 +1,4 @@
> -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001
> +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001
> From: Chen Qi <Qi.Chen@windriver.com>
> Date: Thu, 21 Feb 2019 16:23:24 +0800
> Subject: [PATCH] binfmt: Don't install dependency links at install time
> for
> @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com
> >
> units/systemd-binfmt.service.in | 4 ++++
> 3 files changed, 9 insertions(+), 4 deletions(-)
>
> -Index: systemd-stable/units/meson.build
> -===================================================================
> ---- systemd-stable.orig/units/meson.build
> -+++ systemd-stable/units/meson.build
> -@@ -55,8 +55,7 @@ units = [
> +diff --git a/units/meson.build b/units/meson.build
> +index 17e9ead9c1..e5502be620 100644
> +--- a/units/meson.build
> ++++ b/units/meson.build
> +@@ -59,8 +59,7 @@ units = [
> ['poweroff.target', '',
> (with_runlevels ? 'runlevel0.target' : '')],
> ['printer.target', ''],
> @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build
> ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
> ['reboot.target', '',
> 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' :
> '')],
> -@@ -166,8 +165,7 @@ in_units = [
> - ['rc-local.service', 'HAVE_SYSV_COMPAT'],
> +@@ -178,8 +177,7 @@ in_units = [
> ['rescue.service', ''],
> + ['serial-getty@.service', ''],
> ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
> - ['systemd-binfmt.service', 'ENABLE_BINFMT',
> - 'sysinit.target.wants/'],
> @@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build
> ['systemd-bless-boot.service', 'ENABLE_EFI
> HAVE_BLKID'],
> ['systemd-boot-check-no-failures.service', ''],
> ['systemd-coredump@.service', 'ENABLE_COREDUMP'],
> -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> -===================================================================
> ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
> -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
> -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
> +diff --git a/units/proc-sys-fs-binfmt_misc.automount
> b/units/proc-sys-fs-binfmt_misc.automount
> +index 172c8757ab..f65d8930c6 100644
> +--- a/units/proc-sys-fs-binfmt_misc.automount
> ++++ b/units/proc-sys-fs-binfmt_misc.automount
> +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/
>
> [Automount]
> Where=/proc/sys/fs/binfmt_misc
> +
> +[Install]
> +WantedBy=sysinit.target
> -Index: systemd-stable/units/systemd-binfmt.service.in
> -===================================================================
> ---- systemd-stable.orig/units/systemd-binfmt.service.in
> -+++ systemd-stable/units/systemd-binfmt.service.in
> +diff --git a/units/systemd-binfmt.service.in b/units/
> systemd-binfmt.service.in
> +index fdafce7ff7..4efc05e495 100644
> +--- a/units/systemd-binfmt.service.in
> ++++ b/units/systemd-binfmt.service.in
> @@ -14,6 +14,7 @@ Documentation=
> https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
> Documentation=
> https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
> DefaultDependencies=no
> @@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in
> After=proc-sys-fs-binfmt_misc.mount
> Before=sysinit.target shutdown.target
> @@ -30,3 +31,6 @@ RemainAfterExit=yes
> - ExecStart=@rootlibexecdir@/systemd-binfmt
> - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister
> + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt
> + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
> TimeoutSec=90s
> +
> +[Install]
> 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
> deleted file mode 100644
> index 0ba5fa2547..0000000000
> ---
> a/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch
>
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -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_249.1.bb
> similarity index 99%
> rename from meta/recipes-core/systemd/systemd_248.3.bb
> rename to meta/recipes-core/systemd/systemd_249.1.bb
> index f5022a99c2..9bfb12249c 100644
> --- a/meta/recipes-core/systemd/systemd_248.3.bb
> +++ b/meta/recipes-core/systemd/systemd_249.1.bb
> @@ -4,7 +4,7 @@ PROVIDES = "udev"
>
> PE = "1"
>
> -DEPENDS = "intltool-native gperf-native libcap util-linux"
> +DEPENDS = "intltool-native gperf-native libcap util-linux
> python3-jinja2-native"
>
> SECTION = "base/shell"
>
> @@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d
> update-alternatives qemu
> # that we don't build both udev and systemd in world builds.
> REQUIRED_DISTRO_FEATURES = "systemd"
>
> -SRC_URI += " \
> - file://touchscreen.rules \
> +SRC_URI += "file://touchscreen.rules \
> file://00-create-volatile.conf \
> ${@bb.utils.contains('PACKAGECONFIG',
> 'polkit_hostnamed_fallback',
> 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \
> ${@bb.utils.contains('PACKAGECONFIG',
> 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '',
> d)} \
> @@ -26,7 +25,6 @@ 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
> @@ -687,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \
> ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \
> ${rootlibexecdir}/udev/rules.d/80-drivers.rules \
> ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \
> + ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \
> ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \
> ${rootlibexecdir}/udev/rules.d/README \
> ${sysconfdir}/udev \
> --
> 2.31.1
>
>
>
>
>
[Attachment #5 (text/html)]
<div dir="ltr">FYI: This introduces new build failure with ld-is-gold in \
DISTRO_FEATURES:<div><br></div><div>| [17/21] Generating linuxx64.elf.stub with a \
custom command<br>| FAILED: src/boot/efi/linuxx64.elf.stub<br>| \
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-ld \
-o src/boot/efi/linuxx64.elf.stub -T \
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/elf_x86_64_efi.lds \
-shared -Bsymbolic -nostdlib -znocombreloc --build-id=sha1 -L \
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib \
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/crt0-efi-x86_64.o \
src/boot/efi/string-util-fundamental.c.o src/boot/efi/disk.c.o \
src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o \
src/boot/efi/secure-boot.c.o src/boot/efi/util.c.o src/boot/efi/linux.c.o \
src/boot/efi/splash.c.o src/boot/efi/stub.c.o -lefi -lgnuefi \
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot/usr/lib/../lib/x86_64-oe-linux/11.1.1/libgcc.a<br>| \
/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-ld: \
internal error in segment_precedes, at ../../gold/layout.cc:3721<br>| [18/21] \
Generating boot.c.o with a custom command<br></div></div><br><div \
class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jul 23, 2021 at 12:45 \
AM Alexander Kanavin <<a \
href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>> \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">jinja is now \
required:<br> <a href="https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704" \
rel="noreferrer" target="_blank">https://github.com/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704</a><br>
<br>
Drop 0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch as it is a backport.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" \
target="_blank">alex.kanavin@gmail.com</a>><br>
---<br>
...<a href="http://md-boot_248.3.bb" rel="noreferrer" \
target="_blank">md-boot_248.3.bb</a> => <a href="http://systemd-boot_249.1.bb" \
rel="noreferrer" target="_blank">systemd-boot_249.1.bb</a>} | 2 +-<br> \
meta/recipes-core/systemd/systemd.inc | 4 +-<br>
...tall-dependency-links-at-install-tim.patch | 38 +++++++++---------<br>
...comp-Check-for-__NR_ppoll-before-use.patch | 39 -------------------<br>
.../{<a href="http://systemd_248.3.bb" rel="noreferrer" \
target="_blank">systemd_248.3.bb</a> => <a href="http://systemd_249.1.bb" \
rel="noreferrer" target="_blank">systemd_249.1.bb</a>} | 7 ++--<br> 5 files \
changed, 25 insertions(+), 65 deletions(-)<br> rename meta/recipes-core/systemd/{<a \
href="http://systemd-boot_248.3.bb" rel="noreferrer" \
target="_blank">systemd-boot_248.3.bb</a> => <a \
href="http://systemd-boot_249.1.bb" rel="noreferrer" \
target="_blank">systemd-boot_249.1.bb</a>} (98%)<br> delete mode 100644 \
meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch<br>
rename meta/recipes-core/systemd/{<a href="http://systemd_248.3.bb" \
rel="noreferrer" target="_blank">systemd_248.3.bb</a> => <a \
href="http://systemd_249.1.bb" rel="noreferrer" target="_blank">systemd_249.1.bb</a>} \
(99%)<br> <br>
diff --git a/meta/recipes-core/systemd/<a href="http://systemd-boot_248.3.bb" \
rel="noreferrer" target="_blank">systemd-boot_248.3.bb</a> \
b/meta/recipes-core/systemd/<a href="http://systemd-boot_249.1.bb" rel="noreferrer" \
target="_blank">systemd-boot_249.1.bb</a><br> similarity index 98%<br>
rename from meta/recipes-core/systemd/<a href="http://systemd-boot_248.3.bb" \
rel="noreferrer" target="_blank">systemd-boot_248.3.bb</a><br> rename to \
meta/recipes-core/systemd/<a href="http://systemd-boot_249.1.bb" rel="noreferrer" \
target="_blank">systemd-boot_249.1.bb</a><br> index 249e620f4e..2c0bec4eda 100644<br>
--- a/meta/recipes-core/systemd/<a href="http://systemd-boot_248.3.bb" \
rel="noreferrer" target="_blank">systemd-boot_248.3.bb</a><br>
+++ b/meta/recipes-core/systemd/<a href="http://systemd-boot_249.1.bb" \
rel="noreferrer" target="_blank">systemd-boot_249.1.bb</a><br> @@ -3,7 +3,7 @@ \
FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"<br> <br>
require conf/image-uefi.conf<br>
<br>
-DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"<br>
+DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native \
python3-jinja2-native"<br> <br>
inherit meson pkgconfig gettext<br>
inherit deploy<br>
diff --git a/meta/recipes-core/systemd/systemd.inc \
b/meta/recipes-core/systemd/systemd.inc<br> index 0524a25008..0e92a72bb7 100644<br>
--- a/meta/recipes-core/systemd/systemd.inc<br>
+++ b/meta/recipes-core/systemd/systemd.inc<br>
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"<br>
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
\<br>
\
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"<br> <br>
-SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"<br>
-SRCBRANCH = "v248-stable"<br>
+SRCREV = "764b74113e36ac5219a4b82a05f311b5a92136ce"<br>
+SRCBRANCH = "v249-stable"<br>
SRC_URI = "git://<a \
href="http://github.com/systemd/systemd-stable.git;protocol=git;branch=$%7BSRCBRANCH%7D" \
rel="noreferrer" target="_blank">github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}</a> \
\<br> "<br>
<br>
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch<br>
index 8dd22eeb7b..d3af734e06 100644<br>
--- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch<br>
+++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch<br>
@@ -1,4 +1,4 @@<br>
-From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001<br>
+From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001<br>
From: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" \
target="_blank">Qi.Chen@windriver.com</a>><br> Date: Thu, 21 Feb 2019 16:23:24 \
+0800<br> Subject: [PATCH] binfmt: Don't install dependency links at install \
time for<br> @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <<a \
href="mailto:scott.murray@konsulko.com" \
target="_blank">scott.murray@konsulko.com</a>><br> units/<a \
href="http://systemd-binfmt.service.in" rel="noreferrer" \
target="_blank">systemd-binfmt.service.in</a> | 4 ++++<br> 3 files \
changed, 9 insertions(+), 4 deletions(-)<br> <br>
-Index: systemd-stable/units/meson.build<br>
-===================================================================<br>
---- systemd-stable.orig/units/meson.build<br>
-+++ systemd-stable/units/meson.build<br>
-@@ -55,8 +55,7 @@ units = [<br>
+diff --git a/units/meson.build b/units/meson.build<br>
+index 17e9ead9c1..e5502be620 100644<br>
+--- a/units/meson.build<br>
++++ b/units/meson.build<br>
+@@ -59,8 +59,7 @@ units = [<br>
['poweroff.target', \
'',<br>
(with_runlevels ? 'runlevel0.target' : '')],<br>
['printer.target', \
''],<br> @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build<br>
['proc-sys-fs-binfmt_misc.mount', \
'ENABLE_BINFMT'],<br>
['reboot.target', \
'',<br>
'ctrl-alt-del.target' + (with_runlevels ? ' \
runlevel6.target' : '')],<br>
-@@ -166,8 +165,7 @@ in_units = [<br>
- ['rc-local.service', \
'HAVE_SYSV_COMPAT'],<br> +@@ -178,8 +177,7 @@ in_units = [<br>
['rescue.service', \
''],<br> + ['serial-getty@.service', \
''],<br>
['systemd-backlight@.service', \
'ENABLE_BACKLIGHT'],<br>
- ['systemd-binfmt.service', \
'ENABLE_BINFMT',<br>
- 'sysinit.target.wants/'],<br>
@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build<br>
['systemd-bless-boot.service', 'ENABLE_EFI \
HAVE_BLKID'],<br>
['systemd-boot-check-no-failures.service', ''],<br>
['systemd-coredump@.service', \
'ENABLE_COREDUMP'],<br>
-Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount<br>
-===================================================================<br>
---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount<br>
-+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount<br>
-@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/<br>
+diff --git a/units/proc-sys-fs-binfmt_misc.automount \
b/units/proc-sys-fs-binfmt_misc.automount<br> +index 172c8757ab..f65d8930c6 \
100644<br> +--- a/units/proc-sys-fs-binfmt_misc.automount<br>
++++ b/units/proc-sys-fs-binfmt_misc.automount<br>
+@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/<br>
<br>
[Automount]<br>
Where=/proc/sys/fs/binfmt_misc<br>
+<br>
+[Install]<br>
+WantedBy=sysinit.target<br>
-Index: systemd-stable/units/<a href="http://systemd-binfmt.service.in" \
rel="noreferrer" target="_blank">systemd-binfmt.service.in</a><br>
-===================================================================<br>
---- systemd-stable.orig/units/<a href="http://systemd-binfmt.service.in" \
rel="noreferrer" target="_blank">systemd-binfmt.service.in</a><br>
-+++ systemd-stable/units/<a href="http://systemd-binfmt.service.in" rel="noreferrer" \
target="_blank">systemd-binfmt.service.in</a><br> +diff --git a/units/<a \
href="http://systemd-binfmt.service.in" rel="noreferrer" \
target="_blank">systemd-binfmt.service.in</a> b/units/<a \
href="http://systemd-binfmt.service.in" rel="noreferrer" \
target="_blank">systemd-binfmt.service.in</a><br> +index fdafce7ff7..4efc05e495 \
100644<br> +--- a/units/<a href="http://systemd-binfmt.service.in" rel="noreferrer" \
target="_blank">systemd-binfmt.service.in</a><br> ++++ b/units/<a \
href="http://systemd-binfmt.service.in" rel="noreferrer" \
target="_blank">systemd-binfmt.service.in</a><br> @@ -14,6 +14,7 @@ Documentation=<a \
href="https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm" \
rel="noreferrer" target="_blank">https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm</a><br>
Documentation=<a href="https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems" \
rel="noreferrer" target="_blank">https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems</a><br>
DefaultDependencies=no<br>
@@ -73,8 +73,8 @@ Index: systemd-stable/units/<a \
href="http://systemd-binfmt.service.in" rel="noreferrer" \
target="_blank">systemd-binfmt.service.in</a><br> \
After=proc-sys-fs-binfmt_misc.mount<br> Before=sysinit.target shutdown.target<br>
@@ -30,3 +31,6 @@ RemainAfterExit=yes<br>
- ExecStart=@rootlibexecdir@/systemd-binfmt<br>
- ExecStop=@rootlibexecdir@/systemd-binfmt --unregister<br>
+ ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt<br>
+ ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister<br>
TimeoutSec=90s<br>
+<br>
+[Install]<br>
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<br>
deleted file mode 100644<br>
index 0ba5fa2547..0000000000<br>
--- a/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch<br>
+++ /dev/null<br>
@@ -1,39 +0,0 @@<br>
-From 027ac2ad0695bb506460f9dd7e57149b71055887 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com" \
target="_blank">raj.khem@gmail.com</a>><br>
-Date: Tue, 8 Jun 2021 23:21:01 -0700<br>
-Subject: [PATCH] test-seccomp: Check for __NR_ppoll before use<br>
-<br>
-some newer architectures like riscv32 do not have __NR_ppoll from get go<br>
-<br>
-Upstream-Status: Submitted [<a href="https://github.com/systemd/systemd/pull/19858" \
rel="noreferrer" target="_blank">https://github.com/systemd/systemd/pull/19858</a>]<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" \
target="_blank">raj.khem@gmail.com</a>><br>
----<br>
- src/test/test-seccomp.c | 5 +++--<br>
- 1 file changed, 3 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c<br>
-index b1f917eb54..daac0fcea8 100644<br>
---- a/src/test/test-seccomp.c<br>
-+++ b/src/test/test-seccomp.c<br>
-@@ -832,7 +832,7 @@ static void test_load_syscall_filter_set_raw(void) {<br>
- assert_se(s = hashmap_new(NULL));<br>
- #if defined __NR_poll && __NR_poll >= 0<br>
- assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), \
INT_TO_PTR(-1)) >= 0);<br>
--#else<br>
-+#elif defined __NR_ppoll<br>
- assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), \
INT_TO_PTR(-1)) >= 0);<br>
- #endif<br>
- <br>
-@@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) {<br>
- assert_se(s = hashmap_new(NULL));<br>
- #if defined __NR_poll && __NR_poll >= 0<br>
- assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), \
INT_TO_PTR(EILSEQ)) >= 0);<br>
--#else<br>
-+#elif defined __NR_ppoll<br>
-+ assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), \
INT_TO_PTR(-1)) >= 0);<br>
- assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), \
INT_TO_PTR(EILSEQ)) >= 0);<br>
- #endif<br>
- <br>
--- <br>
-2.32.0<br>
-<br>
diff --git a/meta/recipes-core/systemd/<a href="http://systemd_248.3.bb" \
rel="noreferrer" target="_blank">systemd_248.3.bb</a> b/meta/recipes-core/systemd/<a \
href="http://systemd_249.1.bb" rel="noreferrer" \
target="_blank">systemd_249.1.bb</a><br> similarity index 99%<br>
rename from meta/recipes-core/systemd/<a href="http://systemd_248.3.bb" \
rel="noreferrer" target="_blank">systemd_248.3.bb</a><br> rename to \
meta/recipes-core/systemd/<a href="http://systemd_249.1.bb" rel="noreferrer" \
target="_blank">systemd_249.1.bb</a><br> index f5022a99c2..9bfb12249c 100644<br>
--- a/meta/recipes-core/systemd/<a href="http://systemd_248.3.bb" rel="noreferrer" \
target="_blank">systemd_248.3.bb</a><br>
+++ b/meta/recipes-core/systemd/<a href="http://systemd_249.1.bb" rel="noreferrer" \
target="_blank">systemd_249.1.bb</a><br> @@ -4,7 +4,7 @@ PROVIDES = \
"udev"<br> <br>
PE = "1"<br>
<br>
-DEPENDS = "intltool-native gperf-native libcap util-linux"<br>
+DEPENDS = "intltool-native gperf-native libcap util-linux \
python3-jinja2-native"<br> <br>
SECTION = "base/shell"<br>
<br>
@@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d \
update-alternatives qemu<br> # that we don't build both udev and systemd in \
world builds.<br> REQUIRED_DISTRO_FEATURES = "systemd"<br>
<br>
-SRC_URI += " \<br>
- file://touchscreen.rules \<br>
+SRC_URI += "file://touchscreen.rules \<br>
file://00-create-volatile.conf \<br>
${@bb.utils.contains('PACKAGECONFIG', \
'polkit_hostnamed_fallback', \
'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \<br> \
${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', \
'file://00-hostnamed-network-user.conf', '', d)} \<br> @@ -26,7 +25,6 \
@@ SRC_URI += " \<br>
file://0003-implment-systemd-sysv-install-for-OE.patch \<br>
file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \
\<br>
file://0001-test-parse-argument-Include-signal.h.patch \<br>
- file://0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch \
\<br> "<br>
<br>
# patches needed by musl<br>
@@ -687,6 +685,7 @@ FILES_udev += "${base_sbindir}/udevd \<br>
${rootlibexecdir}/udev/rules.d/78-sound-card.rules \<br>
${rootlibexecdir}/udev/rules.d/80-drivers.rules \<br>
${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \<br>
+ ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \<br>
${rootlibexecdir}/udev/rules.d/90-vconsole.rules \<br>
${rootlibexecdir}/udev/rules.d/README \<br>
${sysconfdir}/udev \<br>
-- <br>
2.31.1<br>
<br>
<br>
<br>
<br>
</blockquote></div>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154246): https://lists.openembedded.org/g/openembedded-core/message/154246
Mute This Topic: https://lists.openembedded.org/mt/84390484/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic