Re: [OE-core] [PATCH v3 1/2] poky-altcfg: enable usrmerge

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Wed, 2022-07-13 at 20:02 +0100, Luca Boccassi wrote:
> On Wed, 13 Jul 2022 at 19:36, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 
> > On Wed, 2022-07-13 at 19:09 +0100, Luca Boccassi wrote:
> > > On Wed, 13 Jul 2022 at 18:53, Richard Purdie
> > > <richard.purdie@linuxfoundation.org> wrote:
> > > > 
> > > > On Wed, 2022-07-13 at 17:55 +0100, Luca Bocassi wrote:
> > > > > From: Luca Boccassi <luca.boccassi@microsoft.com>
> > > > > 
> > > > > Ensure it gets tested by the CI
> > > > > 
> > > > > Signed-off-by: Luca Boccassi <luca.boccassi@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
> > > $
> > 
> > My fault, I'm trying to restart the build from a different environment
> > to usual and I messed up the change. It should be there now (and build
> > restarted).
> 
> No worries - I see, in this case the append was the right thing. One
> day I'll get these right on the first try. One day! Thanks for the
> fix.

It really depends how complex the variable is and how you're making the
assignment. In this case you're using an override to make the
assignment and you want to add to the existing values so append is the
only way.

Cheers,

Richard