Don't use :append together with +=, just add the leading space in the value.
Wasn't there a warning when these 2 are used together? On Wed, Jul 13, 2022 at 5:41 PM Luca Bocassi <[email protected]> wrote: > From: Luca Boccassi <[email protected]> > > Support for unmerged-usr is deprecated upstream, taints the system and > will be > removed in the near future. > Enforce building merged-usr images when using systemd. > > Signed-off-by: Luca Boccassi <[email protected]> > --- > v2: use :append in each recipe > > 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_251.2.bb | 2 +- > 4 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb > b/meta/recipes-core/systemd/systemd-compat-units.bb > index 55ebf99117..9085075a78 100644 > --- a/meta/recipes-core/systemd/systemd-compat-units.bb > +++ b/meta/recipes-core/systemd/systemd-compat-units.bb > @@ -14,7 +14,7 @@ INHIBIT_DEFAULT_DEPS = "1" > > ALLOW_EMPTY:${PN} = "1" > > -REQUIRED_DISTRO_FEATURES = "systemd" > +REQUIRED_DISTRO_FEATURES:append += "systemd" > > SYSTEMD_DISABLED_SYSV_SERVICES = " \ > busybox-udhcpc \ > diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb > b/meta/recipes-core/systemd/systemd-serialgetty.bb > index fd888bb834..60e18c4298 100644 > --- a/meta/recipes-core/systemd/systemd-serialgetty.bb > +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb > @@ -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:append += "systemd" > > do_install() { > if [ ! -z "${SERIAL_CONSOLES}" ] ; then > diff --git a/meta/recipes-core/systemd/systemd.inc > b/meta/recipes-core/systemd/systemd.inc > index b8dbe2263a..f9e109bba4 100644 > --- a/meta/recipes-core/systemd/systemd.inc > +++ b/meta/recipes-core/systemd/systemd.inc > @@ -21,3 +21,8 @@ SRC_URI = "git:// > github.com/systemd/systemd-stable.git;protocol=https;branch=${S > <http://github.com/systemd/systemd-stable.git;protocol=https;branch=$%7BS> > " > > 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" > diff --git a/meta/recipes-core/systemd/systemd_251.2.bb > b/meta/recipes-core/systemd/systemd_251.2.bb > index bb3c59f418..b1358420eb 100644 > --- a/meta/recipes-core/systemd/systemd_251.2.bb > +++ b/meta/recipes-core/systemd/systemd_251.2.bb > @@ -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:append += "systemd" > > SRC_URI += "file://touchscreen.rules \ > file://00-create-volatile.conf \ > -- > 2.34.1 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#167962): https://lists.openembedded.org/g/openembedded-core/message/167962 Mute This Topic: https://lists.openembedded.org/mt/92360228/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
