On Mon, 2022-07-11 at 21:29 +0100, Luca Bocassi 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]> > --- > We intend to deprecate unmerged-usr at some point, and we are doing the > rounds ensuring distros are moving along so that there are no surprises > when the time comes. > > See: > https://lists.freedesktop.org/archives/systemd-devel/2022-April/047673.html > > meta/recipes-core/systemd/systemd.inc | 5 +++++ > 1 file changed, 5 insertions(+) > > 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"
Given none of our systemd testing on the autobuilder is done under usrmerge and we've never mentioned this requirement to any of our userbase before, this is going to come as a bit of a surprise to people. The above change will break the autobuilder as things stand :(. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#167884): https://lists.openembedded.org/g/openembedded-core/message/167884 Mute This Topic: https://lists.openembedded.org/mt/92319509/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
