On Wed, 13 Jul 2022 at 17:26, Richard Purdie
<richard.pur...@linuxfoundation.org> wrote:
>
> On Wed, 2022-07-13 at 16:41 +0100, Luca Bocassi wrote:
> > From: Luca Boccassi <luca.bocca...@microsoft.com>
> >
> > 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 <luca.bocca...@microsoft.com>
> > ---
> > 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
> > "
> >
> > 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"
> >
>
> We shouldn't need :append here, just go with += "systemd".
Mh I could swear with that I was getting:
missing required distro feature 'usrmergesystemd' (not in DISTRO_FEATURES)
It's in the scrollback, but now it doesn't happen anymore, so I
probably had borken it in a different way. One day I'll get the
appends right on first try, one day...
Kind regards,
Luca Boccassi
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167977):
https://lists.openembedded.org/g/openembedded-core/message/167977
Mute This Topic: https://lists.openembedded.org/mt/92360228/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
