On Wed, 13 Jul 2022 at 18:53, Richard Purdie <richard.pur...@linuxfoundation.org> wrote: > > On Wed, 2022-07-13 at 17:55 +0100, Luca Bocassi wrote: > > From: Luca Boccassi <luca.bocca...@microsoft.com> > > > > Ensure it gets tested by the CI > > > > Signed-off-by: Luca Boccassi <luca.bocca...@microsoft.com> > > --- > > meta-poky/conf/distro/poky-altcfg.conf | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/meta-poky/conf/distro/poky-altcfg.conf > > b/meta-poky/conf/distro/poky-altcfg.conf > > index f03306e798..57a76e8bb9 100644 > > --- a/meta-poky/conf/distro/poky-altcfg.conf > > +++ b/meta-poky/conf/distro/poky-altcfg.conf > > @@ -9,6 +9,8 @@ DISTROOVERRIDES = "poky:poky-altcfg" > > #DISTROOVERRIDES = "poky:linuxstdbase" > > > > INIT_MANAGER:poky-altcfg = "systemd" > > +# systemd will soon require usrmerge > > +DISTRO_FEATURES:poky-altcfg += "usrmerge" > > # systemd isn't suitable with musl > > INIT_MANAGER:poky-altcfg:libc-musl = "sysvinit" > > > > This blew up builds since it clears everything else out of > DISTRO_FEATURES which isn't what was intended. I've tweaked the patch > and re-queued.
Sorry, did I get something wrong? The diff between my local branch and the master-next branch is empty, can't quite see it: $ git diff upstream/master-next meta-poky/conf/distro/poky-altcfg.conf $ Kind regards, Luca Boccassi
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#167980): https://lists.openembedded.org/g/openembedded-core/message/167980 Mute This Topic: https://lists.openembedded.org/mt/92361983/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
