systemd: add usrmerge to REQUIRED_DISTRO_FEATURES
PATCH 1/1 systemd: add usrmerge to REQUIRED_DISTRO_FEATURES
From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.
---
Time to resurrect this. Support for unmerged-usr has been removed and will no longer be available starting with v255. Better to get started now with the enforcement, so that things can be worked out while it is still possible to override it.
meta/recipes-core/systemd/systemd-compat-units.bb | 2 +- meta/recipes-core/systemd/systemd-serialgetty.bb | 2 +- meta/recipes-core/systemd/systemd.inc | 5 +++++ meta/recipes-core/systemd/systemd_254.bb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)
meta/recipes-core/systemd/systemd-compat-units.bb +1 -1
@@ -14,7 +14,7 @@ INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY:${PN} = "1" -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" SYSTEMD_DISABLED_SYSV_SERVICES = " \ busybox-udhcpc \
meta/recipes-core/systemd/systemd-serialgetty.bb +1 -1
@@ -14,7 +14,7 @@ S = "${WORKDIR}" # As this package is tied to systemd, only build it when we're also building systemd. inherit features_check -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" do_install() { if [ ! -z "${SERIAL_CONSOLES}" ] ; then
meta/recipes-core/systemd/systemd.inc +5 -0
@@ -20,3 +20,8 @@ SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${S " S = "${WORKDIR}/git" + +# unmerged-usr support is deprecated upstream, taints the system and will be +# removed in the near future. Fail the build if it is not enabled. +inherit features_check +REQUIRED_DISTRO_FEATURES = "usrmerge"
meta/recipes-core/systemd/systemd_254.bb +1 -1
@@ -12,7 +12,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so # that we don't build both udev and systemd in world builds. -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" SRC_URI += " \ file://touchscreen.rules \
Signature · 1 line
2.39.2
Em sáb., 5 de ago. de 2023 às 08:06, Luca Bocassi
<[email protected]> escreveu:
Quoted 9 lines
From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.Signed-off-by Luca Boccassi <[email protected]>
This makes sense. I also prefer to add this sooner than later.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
Quoted 15 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.Signed-off-by Luca Boccassi <[email protected]>---
Time to resurrect this. Support for unmerged-usr has been removed and will no longer be available starting with v255. Better to get started now with the enforcement, so that things can be worked out while it is still possible to override it.
Quoted 5 lines
meta/recipes-core/systemd/systemd-compat-units.bb | 2 +- meta/recipes-core/systemd/systemd-serialgetty.bb | 2 +- meta/recipes-core/systemd/systemd.inc | 5 +++++ meta/recipes-core/systemd/systemd_254.bb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)
Thanks for sending the patch. I did put this in for testing and because it makes usrmerge required for the systemd-boot recipe, even sysvinit based images fail builds with errors like:
https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/7580/steps/12/logs/stdio
Is usrmerge needed to systemd-boot as well?
Cheers,
Richard
Quoted 23 lines · Richard Purdie
Quoted 15 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.Signed-off-by Luca Boccassi <[email protected]>---
Time to resurrect this. Support for unmerged-usr has been removed and will no longer be available starting with v255. Better to get started now with the enforcement, so that things can be worked out while it is still possible to override it.Quoted 5 lines
meta/recipes-core/systemd/systemd-compat-units.bb | 2 +- meta/recipes-core/systemd/systemd-serialgetty.bb | 2 +- meta/recipes-core/systemd/systemd.inc | 5 +++++ meta/recipes-core/systemd/systemd_254.bb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)
Quoted 7 lines
Thanks for sending the patch. I did put this in for testing and because it makes usrmerge required for the systemd-boot recipe, even sysvinit based images fail builds with errors like:
https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/7580/steps/12/logs/stdio
Is usrmerge needed to systemd-boot as well?
I don't think so, that's a uefi binary, sent v2 to avoid it for now
PATCH v2 1/1 systemd: add usrmerge to REQUIRED_DISTRO_FEATURES
In reply to [email protected]From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.
---
v2: rearrange so systemd-boot.bb is left as-is for now
meta/recipes-core/systemd/systemd-compat-units.bb | 3 ++- meta/recipes-core/systemd/systemd-conf_1.0.bb | 3 +++ meta/recipes-core/systemd/systemd-machine-units_1.0.bb | 3 ++- meta/recipes-core/systemd/systemd-serialgetty.bb | 3 ++- meta/recipes-core/systemd/systemd_254.bb | 6 +++++- 5 files changed, 14 insertions(+), 4 deletions(-)
meta/recipes-core/systemd/systemd-compat-units.bb +2 -1
@@ -14,7 +14,8 @@ INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY:${PN} = "1" -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_DISABLED_SYSV_SERVICES = " \ busybox-udhcpc \
meta/recipes-core/systemd/systemd-conf_1.0.bb +3 -0
@@ -5,6 +5,9 @@ DefaultTimeoutStartSec setting." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" + PE = "1" PACKAGECONFIG ??= "dhcp-ethernet"
meta/recipes-core/systemd/systemd-machine-units_1.0.bb +2 -1
@@ -7,7 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PR = "r19" -inherit systemd +inherit systemd features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_SERVICE:${PN} = "" ALLOW_EMPTY:${PN} = "1"
meta/recipes-core/systemd/systemd-serialgetty.bb +2 -1
@@ -14,7 +14,8 @@ S = "${WORKDIR}" # As this package is tied to systemd, only build it when we're also building systemd. inherit features_check -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" do_install() { if [ ! -z "${SERIAL_CONSOLES}" ] ; then
meta/recipes-core/systemd/systemd_254.bb +5 -1
@@ -10,9 +10,13 @@ SECTION = "base/shell" inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check +# unmerged-usr support is deprecated upstream, taints the system and will be +# removed in the near future. Fail the build if it is not enabled. +REQUIRED_DISTRO_FEATURES += "usrmerge" + # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so # that we don't build both udev and systemd in world builds. -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" SRC_URI += " \ file://touchscreen.rules \
Signature · 1 line
2.39.2
Hello,
This breaks most of the tests on the autobuilders, I guess you will have to also update the distribution configuration.
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/3326/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/5581/steps/14/logs/stdio
ERROR: Nothing PROVIDES 'udev' (but /home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/wayland/weston_12.0.1.bb DEPENDS on or otherwise requires it)
systemd PROVIDES udev but was skipped: missing required distro feature 'usrmerge' (not in DISTRO_FEATURES)
eudev PROVIDES udev but was skipped: conflicting distro feature 'systemd' (in DISTRO_FEATURES)
ERROR: Nothing PROVIDES 'systemd' (but /home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/wayland/weston_12.0.1.bb, /home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/psplash/psplash_git.bb, /home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/dbus/dbus_1.14.8.bb, /home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/seatd/seatd_0.7.0.bb DEPENDS on or otherwise requires it) systemd was skipped: missing required distro feature 'usrmerge' (not in DISTRO_FEATURES)
ERROR: Nothing RPROVIDES 'systemd' (but /home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/packagegroups/packagegroup-core-boot.bb RDEPENDS on or otherwise requires it)
systemd was skipped: missing required distro feature 'usrmerge' (not in DISTRO_FEATURES)
Quoted 107 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.Signed-off-by Luca Boccassi <[email protected]>---
v2: rearrange so systemd-boot.bb is left as-is for nowmeta/recipes-core/systemd/systemd-compat-units.bb | 3 ++- meta/recipes-core/systemd/systemd-conf_1.0.bb | 3 +++ meta/recipes-core/systemd/systemd-machine-units_1.0.bb | 3 ++- meta/recipes-core/systemd/systemd-serialgetty.bb | 3 ++- meta/recipes-core/systemd/systemd_254.bb | 6 +++++- 5 files changed, 14 insertions(+), 4 deletions(-)meta/recipes-core/systemd/systemd-compat-units.bb +2
-1@@ -14,7 +14,8 @@ INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY:${PN} = "1" -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_DISABLED_SYSV_SERVICES = " \ busybox-udhcpc \meta/recipes-core/systemd/systemd-conf_1.0.bb +3
-0@@ -5,6 +5,9 @@ DefaultTimeoutStartSec setting." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" + PE = "1" PACKAGECONFIG ??= "dhcp-ethernet"meta/recipes-core/systemd/systemd-machine-units_1.0.bb +2
-1@@ -7,7 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PR = "r19" -inherit systemd +inherit systemd features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_SERVICE:${PN} = "" ALLOW_EMPTY:${PN} = "1"meta/recipes-core/systemd/systemd-serialgetty.bb +2
-1@@ -14,7 +14,8 @@ S = "${WORKDIR}" # As this package is tied to systemd, only build it when we're also building systemd. inherit features_check -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" do_install() { if [ ! -z "${SERIAL_CONSOLES}" ] ; thenmeta/recipes-core/systemd/systemd_254.bb +5
-1@@ -10,9 +10,13 @@ SECTION = "base/shell" inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check +# unmerged-usr support is deprecated upstream, taints the system and will be +# removed in the near future. Fail the build if it is not enabled. +REQUIRED_DISTRO_FEATURES += "usrmerge" + # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so # that we don't build both udev and systemd in world builds. -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" SRC_URI += " \ file://touchscreen.rules \Signature · 11 lines
2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185557): https://lists.openembedded.org/g/openembedded-core/message/185557 Mute This Topic: https://lists.openembedded.org/mt/100572063/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 9 lines · Alexandre Belloni via lists.openembedded.org
Hello,
This breaks most of the tests on the autobuilders, I guess you will have to also update the distribution configuration.
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/3326/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/5581/steps/14/logs/stdio
Quoted 7 lines
ERROR: Nothing PROVIDES 'udev' (but
/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/wayland/weston_12.0.1.bbDEPENDS on or otherwise requires it)
systemd PROVIDES udev but was skipped: missing required distro feature 'usrmerge' (not inDISTRO_FEATURES)
eudev PROVIDES udev but was skipped: conflicting distro feature 'systemd' (inDISTRO_FEATURES)
ERROR: Nothing PROVIDES 'systemd' (but/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/wayland/weston_12.0.1.bb,/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/psplash/psplash_git.bb,/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/dbus/dbus_1.14.8.bb,/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/seatd/seatd_0.7.0.bbDEPENDS on or otherwise requires it) systemd was skipped: missing required distro feature 'usrmerge' (not inDISTRO_FEATURES)
ERROR: Nothing RPROVIDES 'systemd' (but/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/packagegroups/packagegroup-core-boot.bbRDEPENDS on or otherwise requires it)
systemd was skipped: missing required distro feature 'usrmerge' (not inDISTRO_FEATURES)
The poky-altcfg distro uses usrmerge, so the challenge will be adapting the QA so that all of the tests that involve systemd are using poky-altcfg.
Ross
Quoted 18 lines · Ross Burton
Quoted 9 lines · Alexandre Belloni via lists.openembedded.org
Hello,
This breaks most of the tests on the autobuilders, I guess you will have to also update the distribution configuration.
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/3326/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/5581/steps/14/logs/stdioQuoted 7 lines
ERROR: Nothing PROVIDES 'udev' (but
/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/wayland/weston_12.0.1.bbDEPENDS on or otherwise requires it)
systemd PROVIDES udev but was skipped: missing required distro feature 'usrmerge' (not inDISTRO_FEATURES)
eudev PROVIDES udev but was skipped: conflicting distro feature 'systemd' (inDISTRO_FEATURES)
ERROR: Nothing PROVIDES 'systemd' (but/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-graphics/wayland/weston_12.0.1.bb,/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/psplash/psplash_git.bb,/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/dbus/dbus_1.14.8.bb,/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/seatd/seatd_0.7.0.bbDEPENDS on or otherwise requires it) systemd was skipped: missing required distro feature 'usrmerge' (not inDISTRO_FEATURES)
ERROR: Nothing RPROVIDES 'systemd' (but/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-core/packagegroups/packagegroup-core-boot.bbRDEPENDS on or otherwise requires it)
systemd was skipped: missing required distro feature 'usrmerge' (not inDISTRO_FEATURES)
Quoted 1 line
The poky-altcfg distro uses usrmerge, so the challenge will be adapting the QA so that all of the tests that involve systemd are using poky-altcfg.
The challenge here is reproducibile testing specific since that is messing with configs to try and get the best coverage.
Since we don't want usrmerge in the reproducibility testing config, I'll suggest we drop systemd from there. There are some other bits of config like INHIBIT_PACKAGE_STRIP being set which are also questionable.
Cheers,
Richard
Quoted 84 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.Signed-off-by Luca Boccassi <[email protected]>---
v2: rearrange so systemd-boot.bb is left as-is for nowmeta/recipes-core/systemd/systemd-compat-units.bb | 3 ++- meta/recipes-core/systemd/systemd-conf_1.0.bb | 3 +++ meta/recipes-core/systemd/systemd-machine-units_1.0.bb | 3 ++- meta/recipes-core/systemd/systemd-serialgetty.bb | 3 ++- meta/recipes-core/systemd/systemd_254.bb | 6 +++++- 5 files changed, 14 insertions(+), 4 deletions(-)meta/recipes-core/systemd/systemd-compat-units.bb +2
-1@@ -14,7 +14,8 @@ INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY:${PN} = "1" -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_DISABLED_SYSV_SERVICES = " \ busybox-udhcpc \meta/recipes-core/systemd/systemd-conf_1.0.bb +3
-0@@ -5,6 +5,9 @@ DefaultTimeoutStartSec setting." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" + PE = "1" PACKAGECONFIG ??= "dhcp-ethernet"meta/recipes-core/systemd/systemd-machine-units_1.0.bb +2
-1@@ -7,7 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PR = "r19" -inherit systemd +inherit systemd features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_SERVICE:${PN} = "" ALLOW_EMPTY:${PN} = "1"meta/recipes-core/systemd/systemd-serialgetty.bb +2
-1@@ -14,7 +14,8 @@ S = "${WORKDIR}" # As this package is tied to systemd, only build it when we're also building systemd. inherit features_check -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" do_install() { if [ ! -z "${SERIAL_CONSOLES}" ] ; thenmeta/recipes-core/systemd/systemd_254.bb +1
-0@@ -10,9 +10,13 @@ SECTION = "base/shell" inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check +# unmerged-usr support is deprecated upstream, taints the system and will be
meta/recipes-core/systemd/systemd_254.bb SECTION = "base/shell" · line 22
Quoted 10 lines
meta/recipes-core/systemd/systemd_254.bb +4
-1+# removed in the near future. Fail the build if it is not enabled. +REQUIRED_DISTRO_FEATURES += "usrmerge" + # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so # that we don't build both udev and systemd in world builds. -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" SRC_URI += " \ file://touchscreen.rules \
FWIW I tried multiple runs of this through the autobuilder and tracked down all the places this needed fixing so the test work. Once those fixes merged, I was able to merge this.
Cheers,
Richard
Quoted 94 lines · Richard Purdie
Quoted 92 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely.Signed-off-by Luca Boccassi <[email protected]>---
v2: rearrange so systemd-boot.bb is left as-is for nowmeta/recipes-core/systemd/systemd-compat-units.bb | 3 ++- meta/recipes-core/systemd/systemd-conf_1.0.bb | 3 +++ meta/recipes-core/systemd/systemd-machine-units_1.0.bb | 3 ++- meta/recipes-core/systemd/systemd-serialgetty.bb | 3 ++- meta/recipes-core/systemd/systemd_254.bb | 6 +++++- 5 files changed, 14 insertions(+), 4 deletions(-)meta/recipes-core/systemd/systemd-compat-units.bb +2
-1@@ -14,7 +14,8 @@ INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY:${PN} = "1" -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_DISABLED_SYSV_SERVICES = " \ busybox-udhcpc \meta/recipes-core/systemd/systemd-conf_1.0.bb +3
-0@@ -5,6 +5,9 @@ DefaultTimeoutStartSec setting." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +inherit features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" + PE = "1" PACKAGECONFIG ??= "dhcp-ethernet"meta/recipes-core/systemd/systemd-machine-units_1.0.bb +2
-1@@ -7,7 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PR = "r19" -inherit systemd +inherit systemd features_check +REQUIRED_DISTRO_FEATURES += "usrmerge" SYSTEMD_SERVICE:${PN} = "" ALLOW_EMPTY:${PN} = "1"meta/recipes-core/systemd/systemd-serialgetty.bb +2
-1@@ -14,7 +14,8 @@ S = "${WORKDIR}" # As this package is tied to systemd, only build it when we're also building systemd. inherit features_check -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" +REQUIRED_DISTRO_FEATURES += "usrmerge" do_install() { if [ ! -z "${SERIAL_CONSOLES}" ] ; thenmeta/recipes-core/systemd/systemd_254.bb +5
-1@@ -10,9 +10,13 @@ SECTION = "base/shell" inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check +# unmerged-usr support is deprecated upstream, taints the system and will be +# removed in the near future. Fail the build if it is not enabled. +REQUIRED_DISTRO_FEATURES += "usrmerge" + # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so # that we don't build both udev and systemd in world builds. -REQUIRED_DISTRO_FEATURES = "systemd" +REQUIRED_DISTRO_FEATURES += "systemd"
Quoted 6 lines
meta/recipes-core/systemd/systemd_254.bb SECTION = "base/shell" · line 22
Quoted 2 lines
meta/recipes-core/systemd/systemd_254.bb +0
-0SRC_URI += " \ file://touchscreen.rules \FWIW I tried multiple runs of this through the autobuilder and tracked down all the places this needed fixing so the test work. Once those fixes merged, I was able to merge this.
Very nice, thank you!
Kind regards,
Luca Boccassi