From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web10.9502.1627565865726291010 for ; Thu, 29 Jul 2021 06:37:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=qDDfIcNx; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id nd39so10785074ejc.5 for ; Thu, 29 Jul 2021 06:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tUa5DdK4JWMyFyxlHjfBBtgBUqkx2Ptmaeb/5aTw0hM=; b=qDDfIcNx3q1eZvsDQjgncI4iwHF+gFzfz2Qj9snfWRGdSTPHGRaDB584qm1ASOe64n Pjoh803I/8/SRlmHJaa/S8MWPCoO+UBBy3z1Pjzz4WGeKtt/pv8acyyom7WpT/8IftBB pxne4+KlXGzwmO8LFjhfP2v0C7+V1tcjRXJhVZx/YfKkC8MSuNjQXv6ivE7seSAZh6pI v6ZlGEQEK2l3jgzd4BwovEpD3JJcieBtAdnUIEJ/daCTlRBJp4zVef589+trU7dkxMYk 8VrWXT35OmbI0dVeQTZGFcZVn4xP8OZqXU1yRnTjhbnjBHt1Oyy7Elf4t6W5C+mfB3+e +p3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tUa5DdK4JWMyFyxlHjfBBtgBUqkx2Ptmaeb/5aTw0hM=; b=iFD1ympkzfHfTfzDQzyZ8SvC6wxSzpEygtXcQGuXaFsB2tMke+UdfiBld1YVJ2EtWe GtVXU2dsiQx+Mj3XKlIYUcl9wVOJEIWCO1OS7Mzr1C6lft03yPdG6o/7Ilqo5wjoJl31 8G4RDEXl8qbJLKkJXfMtGZOFk94IgTTMa+yGvvmTQkCda22Hc2+5D5MKJJK7uLH5J/R0 aAW+kuocnPGatHyeVRo17m4dAZ2MmXWFYbied8jEoMnuOjcAOxWj0bGBK09QghM2uMHp 75YhQTjR4RbQHbIMzYz2Cwfw1/+dHLfEPTD3MCyBrppoIRUxtWt9X7aD6TTqsB7xHeo6 wxVA== X-Gm-Message-State: AOAM533lF5aQvcpLW7VZWqB+QZfbnkBZ/EN97DTaDm322JrPRKKqAKhc L0SCP6ztsk93vQeHE+1aS5J+amPsZrvtnq4H75Y= X-Google-Smtp-Source: ABdhPJyZcF5bKg5EdOZ1j1/hWZfMigL7FZXqqhwfv6flHtyJloIfqMyY1yQY1dJ5gyDt8Sg2A70jjtDBgn9H+i2+PxE= X-Received: by 2002:a17:906:d7b2:: with SMTP id pk18mr3144626ejb.541.1627565864016; Thu, 29 Jul 2021 06:37:44 -0700 (PDT) MIME-Version: 1.0 References: <20210722224508.51967-1-alex.kanavin@gmail.com> <20210722224508.51967-2-alex.kanavin@gmail.com> In-Reply-To: <20210722224508.51967-2-alex.kanavin@gmail.com> From: "Martin Jansa" Date: Thu, 29 Jul 2021 15:37:33 +0200 Message-ID: Subject: Re: [OE-core] [PATCH 2/8] systemd: update 248.3 -> 249.1 To: Alexander Kanavin Cc: Patches and discussions about the oe-core layer Content-Type: multipart/alternative; boundary="0000000000002c5e2e05c84335f3" --0000000000002c5e2e05c84335f3 Content-Type: text/plain; charset="UTF-8" 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 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 > --- > ...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} > > \ > " > > 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 > 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 > > 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 > -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 > ---- > - 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 > > > > > --0000000000002c5e2e05c84335f3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
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/sys= temd-boot/249.1-r0/recipe-sysroot/usr/lib/elf_x86_64_efi.lds -shared -Bsymb= olic -nostdlib -znocombreloc --build-id=3Dsha1 -L /OE/build/oe-core/tmp-gli= bc/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 s= rc/boot/efi/pe.c.o src/boot/efi/secure-boot.c.o src/boot/efi/util.c.o src/b= oot/efi/linux.c.o src/boot/efi/splash.c.o src/boot/efi/stub.c.o -lefi -lgnu= efi /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r= 0/recipe-sysroot/usr/lib/../lib/x86_64-oe-linux/11.1.1/libgcc.a
| /OE/bu= ild/oe-core/tmp-glibc/work/core2-64-oe-linux/systemd-boot/249.1-r0/recipe-s= ysroot-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 boo= t.c.o with a custom command

<= div dir=3D"ltr" class=3D"gmail_attr">On Fri, Jul 23, 2021 at 12:45 AM Alexa= nder Kanavin <alex.kanavin@gma= il.com> wrote:
jinja is now required:
https://github.co= m/systemd/systemd/commit/e0698c66f4569c91e3fdd54ca77449698ae38704

Drop 0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch as it is a ba= ckport.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
=C2=A0...md-boot_248.3.bb =3D> systemd-boot_249.1.bb} |=C2=A0 = 2 +-
=C2=A0meta/recipes-core/systemd/systemd.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= = =A0|=C2=A0 4 +-
=C2=A0...tall-dependency-links-at-install-tim.patch | 38 +++++++++--------= -
=C2=A0...comp-Check-for-__NR_ppoll-before-use.patch | 39 -----------------= --
=C2=A0.../{systemd_248.3.bb =3D> systemd_249.1.bb}=C2=A0 =C2=A0 = |=C2=A0 7 ++--
=C2=A05 files changed, 25 insertions(+), 65 deletions(-)
=C2=A0rename meta/recipes-core/systemd/{systemd-boot_248.3.bb =3D&g= t; systemd-boot_249.1.bb} (98%)
=C2=A0delete mode 100644 meta/recipes-core/systemd/systemd/0001-test-secco= mp-Check-for-__NR_ppoll-before-use.patch
=C2=A0rename meta/recipes-core/systemd/{systemd_248.3.bb =3D> 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 =3D. "${FILE_DIRNAME}/systemd:"<= br>
=C2=A0require conf/image-uefi.conf

-DEPENDS =3D "intltool-native libcap util-linux gnu-efi gperf-native&= quot;
+DEPENDS =3D "intltool-native libcap util-linux gnu-efi gperf-native = python3-jinja2-native"

=C2=A0inherit meson pkgconfig gettext
=C2=A0inherit deploy
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/sys= temd/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 =3D "GPLv2 & LGPLv2.1"
=C2=A0LIC_FILES_CHKSUM =3D "file://LICENSE.GPL2;md5=3D751419260aa9544= 99f7abaabaa882bbe \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0file://LICENSE.LGPL2.1;md5=3D4fbd65380cdd255951079008b364516c"

-SRCREV =3D "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76"
-SRCBRANCH =3D "v248-stable"
+SRCREV =3D "764b74113e36ac5219a4b82a05f311b5a92136ce"
+SRCBRANCH =3D "v249-stable"
=C2=A0SRC_URI =3D "git://github.com/systemd/systemd-stable.git;protocol=3Dgit;branch= = =3D${SRCBRANCH} \
=C2=A0"

diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-d= ependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/00= 01-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-dependen= cy-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependen= cy-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 =C2=A0From: Chen Qi <Qi.Chen@windriver.com>
=C2=A0Date: Thu, 21 Feb 2019 16:23:24 +0800
=C2=A0Subject: [PATCH] binfmt: Don't install dependency links at insta= ll time for
@@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com><= br> =C2=A0 units/systemd-binfmt.service.in=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| 4 ++++
=C2=A0 3 files changed, 9 insertions(+), 4 deletions(-)

-Index: systemd-stable/units/meson.build
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
---- systemd-stable.orig/units/meson.build
-+++ systemd-stable/units/meson.build
-@@ -55,8 +55,7 @@ units =3D [
+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 =3D [
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['poweroff.target',=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'= 9;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(with_runlevels ? 'runlevel0.= target' : '')],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['printer.target',=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 '']= ,
@@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['proc-sys-fs-binfmt_misc.mount'= ;,=C2=A0 =C2=A0 =C2=A0 =C2=A0'ENABLE_BINFMT'],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['reboot.target',=C2=A0 =C2=A0 = = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'= ',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'ctrl-alt-del.target' + (= with_runlevels ? ' runlevel6.target' : '')],
-@@ -166,8 +165,7 @@ in_units =3D [
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0['rc-local.service',=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'HAV= E_SYSV_COMPAT'],
+@@ -178,8 +177,7 @@ in_units =3D [
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['rescue.service',=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'= '],
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0['serial-getty@.service',=C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ''],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['systemd-backlight@.service',= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'ENABLE_BACKLIGHT'],
=C2=A0-=C2=A0 =C2=A0 =C2=A0 =C2=A0 ['systemd-binfmt.service',=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'ENABLE_BINFMT'= ;,
=C2=A0-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'sysinit.target.wants/'],=
@@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['systemd-bless-boot.service',= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'ENABLE_EFI HAVE_BLKID'],=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['systemd-boot-check-no-failures.se= rvice', ''],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ['systemd-coredump@.service',= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'ENABLE_COREDUMP'],
-Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount
-+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount
-@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=3D/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=3D/proc/sys/

=C2=A0 [Automount]
=C2=A0 Where=3D/proc/sys/fs/binfmt_misc
=C2=A0+
=C2=A0+[Install]
=C2=A0+WantedBy=3Dsysinit.target
-Index: systemd-stable/units/systemd-binfmt.service.in
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
---- 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
=C2=A0@@ -14,6 +14,7 @@ Documentation=3Dhttps://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
=C2=A0 Documentation=3Dhttps://www.= freedesktop.org/wiki/Software/systemd/APIFileSystems
=C2=A0 DefaultDependencies=3Dno
@@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.servic= e.in
=C2=A0 After=3Dproc-sys-fs-binfmt_misc.mount
=C2=A0 Before=3Dsysinit.target shutdown.target
=C2=A0@@ -30,3 +31,6 @@ RemainAfterExit=3Dyes
- ExecStart=3D@rootlibexecdir@/systemd-binfmt
- ExecStop=3D@rootlibexecdir@/systemd-binfmt --unregister
+ ExecStart=3D{{ROOTLIBEXECDIR}}/systemd-binfmt
+ ExecStop=3D{{ROOTLIBEXECDIR}}/systemd-binfmt --unregister
=C2=A0 TimeoutSec=3D90s
=C2=A0+
=C2=A0+[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_p= poll-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<= br> -
-Upstream-Status: Submitted [https://github.com/system= d/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) {<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assert_se(s= =3D hashmap_new(NULL));
- #if defined __NR_poll && __NR_poll >=3D 0
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assert_se(h= ashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >=3D 0);
--#else
-+#elif defined __NR_ppoll
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assert_se(h= ashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >=3D 0); - #endif
-
-@@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) {<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assert_se(s= =3D hashmap_new(NULL));
- #if defined __NR_poll && __NR_poll >=3D 0
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assert_se(h= ashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >=3D 0);=
--#else
-+#elif defined __NR_ppoll
-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 assert_se(hashma= p_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >=3D 0);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assert_se(h= ashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >=3D 0)= ;
- #endif
-
---
-2.32.0
-
diff --git a/meta/recipes-core/systemd/systemd_248.3.bb b/meta/recipes-c= ore/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 =3D "udev"

=C2=A0PE =3D "1"

-DEPENDS =3D "intltool-native gperf-native libcap util-linux" +DEPENDS =3D "intltool-native gperf-native libcap util-linux python3-= jinja2-native"

=C2=A0SECTION =3D "base/shell"

@@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d u= pdate-alternatives qemu
=C2=A0# that we don't build both udev and systemd in world builds.
=C2=A0REQUIRED_DISTRO_FEATURES =3D "systemd"

-SRC_URI +=3D " \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://touchscreen.rules \
+SRC_URI +=3D "file://touchscreen.rules \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://00-create-volatile.conf \=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${@bb.utils.contains('PACKAG= ECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesk= top.hostname1_no_polkit.conf', '', d)} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${@bb.utils.contains('PACKAG= ECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed= -network-user.conf', '', d)} \
@@ -26,7 +25,6 @@ SRC_URI +=3D " \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0003-implment-systemd-sys= v-install-for-OE.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0001-systemd.pc.in-use-RO= OTPREFIX-without-suffixed-slash.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0001-test-parse-argument-= Include-signal.h.patch \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-test-seccomp-Check-f= or-__NR_ppoll-before-use.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "

=C2=A0# patches needed by musl
@@ -687,6 +685,7 @@ FILES_udev +=3D "${base_sbindir}/udevd \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${rootlibexecdir}/= udev/rules.d/78-sound-card.rules \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${rootlibexecdir}/= udev/rules.d/80-drivers.rules \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${rootlibexecdir}/= udev/rules.d/80-net-setup-link.rules \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${rootlibexecdir}/= udev/rules.d/81-net-dhcp.rules \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${rootlibexecdir}/= udev/rules.d/90-vconsole.rules \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${rootlibexecdir}/= udev/rules.d/README \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${sysconfdir}/udev= \
--
2.31.1




--0000000000002c5e2e05c84335f3--