On Sat, 2023-08-05 at 22:35 +0100, Luca Bocassi wrote: > 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 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(-) > > diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb > b/meta/recipes-core/systemd/systemd-compat-units.bb > index 55ebf99117f..75b1045728a 100644 > --- a/meta/recipes-core/systemd/systemd-compat-units.bb > +++ b/meta/recipes-core/systemd/systemd-compat-units.bb > @@ -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 \ > diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb > b/meta/recipes-core/systemd/systemd-conf_1.0.bb > index 61ce7939d3a..2355936631e 100644 > --- a/meta/recipes-core/systemd/systemd-conf_1.0.bb > +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb > @@ -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" > diff --git a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb > b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb > index 12f27d6ae30..7e59e86f9be 100644 > --- a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb > +++ b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb > @@ -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" > diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb > b/meta/recipes-core/systemd/systemd-serialgetty.bb > index fd888bb8340..c2c67e6fe08 100644 > --- a/meta/recipes-core/systemd/systemd-serialgetty.bb > +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb > @@ -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 > diff --git a/meta/recipes-core/systemd/systemd_254.bb > b/meta/recipes-core/systemd/systemd_254.bb > index 7ba4233f6a2..3fa49122cd6 100644 > --- a/meta/recipes-core/systemd/systemd_254.bb > +++ b/meta/recipes-core/systemd/systemd_254.bb > @@ -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 \
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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185836): https://lists.openembedded.org/g/openembedded-core/message/185836 Mute This Topic: https://lists.openembedded.org/mt/100572063/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
