[PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[luca.boccassi]

From: Luca Boccassi <luca.boccassi@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.boccassi@microsoft.com>
---
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"
-- 
2.34.1

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Richard Purdie]

On Mon, 2022-07-11 at 21:29 +0100, Luca Bocassi wrote:
> From: Luca Boccassi <luca.boccassi@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.boccassi@microsoft.com>
> ---
> 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

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Luca Boccassi]

On Mon, 11 Jul 2022 at 23:06, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Mon, 2022-07-11 at 21:29 +0100, Luca Bocassi wrote:
> > From: Luca Boccassi <luca.boccassi@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.boccassi@microsoft.com>
> > ---
> > 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 :(.

Yes I was expecting there would be these kind of issues, the purpose
of sending this was mainly to find out about them.
So where are these configurations stored? How can we get them updated?
Also is a deprecation notification needed? How is it handled usually?

Aside from process details, I assume there's no problem with doing the
change in principle?

Thanks!

Kind regards,
Luca Boccassi

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Richard Purdie]

On Tue, 2022-07-12 at 18:16 +0100, Luca Boccassi wrote:
> On Mon, 11 Jul 2022 at 23:06, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 
> > On Mon, 2022-07-11 at 21:29 +0100, Luca Bocassi wrote:
> > > From: Luca Boccassi <luca.boccassi@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.boccassi@microsoft.com>
> > > ---
> > > 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 :(.
> 
> Yes I was expecting there would be these kind of issues, the purpose
> of sending this was mainly to find out about them.
> So where are these configurations stored? How can we get them updated?

The configuration is yocto-autobuilder-helper but the best place to
start is probably the poky-altcfg distro config.

Once we change that we'll have to run through the testing, see how much
breaks and then find someone to try and fix any issues if/as needed.
There is a lot of work just in pulling things together for testing and
triaging the result and I'm depressed it will probably end up on my
plate when I personally disagree with the decision. 

I was asked earlier today if we should just make the systemd include
files force usrmerge on. The challenge is that OE/YP give users choice
to configure their system how they wish, we don't just force
configurations upon them. Or only real option is therefore to throw
errors and have them decide what to do (which basically amounts to
submitting to the upstream decision).

> Also is a deprecation notification needed? How is it handled usually?

Do we have time for such a notification or are we in the situation
where we just throw errors to the user and let them agree to the
usrmerge change? The timescale is unclear but if the systems are
already throwing deprecation warnings at runtime, this isn't a good
experience for our users.

> Aside from process details, I assume there's no problem with doing the
> change in principle?

There is, but it appears a done deal which we just have to accept so
I'm trying not to start a discussion which I don't think can go
anywhere productive. If this isn't a done deal, then let me know as
that would be different.

Cheers,

Richard

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Luca Boccassi]

On Tue, 12 Jul 2022 at 22:55, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Tue, 2022-07-12 at 18:16 +0100, Luca Boccassi wrote:
> > On Mon, 11 Jul 2022 at 23:06, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > >
> > > On Mon, 2022-07-11 at 21:29 +0100, Luca Bocassi wrote:
> > > > From: Luca Boccassi <luca.boccassi@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.boccassi@microsoft.com>
> > > > ---
> > > > 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 :(.
> >
> > Yes I was expecting there would be these kind of issues, the purpose
> > of sending this was mainly to find out about them.
> > So where are these configurations stored? How can we get them updated?
>
> The configuration is yocto-autobuilder-helper but the best place to
> start is probably the poky-altcfg distro config.
>
> Once we change that we'll have to run through the testing, see how much
> breaks and then find someone to try and fix any issues if/as needed.
> There is a lot of work just in pulling things together for testing and
> triaging the result and I'm depressed it will probably end up on my
> plate when I personally disagree with the decision.

We've been running this configuration internally for ~3 years in our
Yocto downstream, never seen any issue, not even at the beginning, it
just worked.
Nowadays most major distros have switched over, Gentoo's the other one
left but it's planned for this year.
Any issues in upstream softwares should have been fixed years ago when
Fedora started the process.
So hopefully it shouldn't be too bad?

> I was asked earlier today if we should just make the systemd include
> files force usrmerge on. The challenge is that OE/YP give users choice
> to configure their system how they wish, we don't just force
> configurations upon them. Or only real option is therefore to throw
> errors and have them decide what to do (which basically amounts to
> submitting to the upstream decision).
>
> > Also is a deprecation notification needed? How is it handled usually?
>
> Do we have time for such a notification or are we in the situation
> where we just throw errors to the user and let them agree to the
> usrmerge change? The timescale is unclear but if the systems are
> already throwing deprecation warnings at runtime, this isn't a good
> experience for our users.

It's not urgent. But the build-time warning has been in place for a
couple of years now, you should have already seen it.
The runtime is a taint flag in 'systemctl status', and was introduced
in the most recent release.
There is no timeline as of now for dropping legacy compat code and
configuration, as the runtime taint was just added.
Certainly won't be this year. I've been doing the rounds ensuring
everyone who hasn't switched already is aware with plenty of time to
spare.

> > Aside from process details, I assume there's no problem with doing the
> > change in principle?
>
> There is, but it appears a done deal which we just have to accept so
> I'm trying not to start a discussion which I don't think can go
> anywhere productive. If this isn't a done deal, then let me know as
> that would be different.

It is a done deal as far as we are concerned upstream, matter of
'when' not 'if'.

Kind regards,
Luca Boccassi

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Richard Purdie]

On Wed, 2022-07-13 at 00:30 +0100, Luca Boccassi wrote:
> On Tue, 12 Jul 2022 at 22:55, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > The configuration is yocto-autobuilder-helper but the best place to
> > start is probably the poky-altcfg distro config.
> > 
> > Once we change that we'll have to run through the testing, see how much
> > breaks and then find someone to try and fix any issues if/as needed.
> > There is a lot of work just in pulling things together for testing and
> > triaging the result and I'm depressed it will probably end up on my
> > plate when I personally disagree with the decision.
> 
> We've been running this configuration internally for ~3 years in our
> Yocto downstream, never seen any issue, not even at the beginning, it
> just worked.
> Nowadays most major distros have switched over, Gentoo's the other one
> left but it's planned for this year.
> Any issues in upstream softwares should have been fixed years ago when
> Fedora started the process.
> So hopefully it shouldn't be too bad?

My worry is the QA framework and tests likely haven't been used with
it. It may be fine or it may not. I do know how much of my time this
stuff takes up with other issues.

> > I was asked earlier today if we should just make the systemd include
> > files force usrmerge on. The challenge is that OE/YP give users choice
> > to configure their system how they wish, we don't just force
> > configurations upon them. Or only real option is therefore to throw
> > errors and have them decide what to do (which basically amounts to
> > submitting to the upstream decision).
> > 
> > > Also is a deprecation notification needed? How is it handled usually?
> > 
> > Do we have time for such a notification or are we in the situation
> > where we just throw errors to the user and let them agree to the
> > usrmerge change? The timescale is unclear but if the systems are
> > already throwing deprecation warnings at runtime, this isn't a good
> > experience for our users.
> 
> It's not urgent. But the build-time warning has been in place for a
> couple of years now, you should have already seen it.

I haven't :(.

> The runtime is a taint flag in 'systemctl status', and was introduced
> in the most recent release.
> There is no timeline as of now for dropping legacy compat code and
> configuration, as the runtime taint was just added.
> Certainly won't be this year. I've been doing the rounds ensuring
> everyone who hasn't switched already is aware with plenty of time to
> spare.

Well, it is good to have the warning, thanks.

> 
> > > Aside from process details, I assume there's no problem with doing the
> > > change in principle?
> > 
> > There is, but it appears a done deal which we just have to accept so
> > I'm trying not to start a discussion which I don't think can go
> > anywhere productive. If this isn't a done deal, then let me know as
> > that would be different.
> 
> It is a done deal as far as we are concerned upstream, matter of
> 'when' not 'if'.

This is not going to help systemd's reputation. Basically, we have to
do what Fedora does and look as we're told to, which does go against
our configurability objective. We already have tensions around musl and
this will further demonstrate our direction and systemd's are not
aligned. I do understand why systemd is doing what it is doing and that
it really doesn't care about our use cases. That doesn't stop some
users wanting it (but also wanting other things we have like musl).

Cheers,

Richard

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Luca Boccassi]

On Wed, 13 Jul 2022 at 14:19, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Wed, 2022-07-13 at 00:30 +0100, Luca Boccassi wrote:
> > On Tue, 12 Jul 2022 at 22:55, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > > The configuration is yocto-autobuilder-helper but the best place to
> > > start is probably the poky-altcfg distro config.
> > >
> > > Once we change that we'll have to run through the testing, see how much
> > > breaks and then find someone to try and fix any issues if/as needed.
> > > There is a lot of work just in pulling things together for testing and
> > > triaging the result and I'm depressed it will probably end up on my
> > > plate when I personally disagree with the decision.
> >
> > We've been running this configuration internally for ~3 years in our
> > Yocto downstream, never seen any issue, not even at the beginning, it
> > just worked.
> > Nowadays most major distros have switched over, Gentoo's the other one
> > left but it's planned for this year.
> > Any issues in upstream softwares should have been fixed years ago when
> > Fedora started the process.
> > So hopefully it shouldn't be too bad?
>
> My worry is the QA framework and tests likely haven't been used with
> it. It may be fine or it may not. I do know how much of my time this
> stuff takes up with other issues.

I have sent v2 with the poky-altcfg configuration change.

> > > I was asked earlier today if we should just make the systemd include
> > > files force usrmerge on. The challenge is that OE/YP give users choice
> > > to configure their system how they wish, we don't just force
> > > configurations upon them. Or only real option is therefore to throw
> > > errors and have them decide what to do (which basically amounts to
> > > submitting to the upstream decision).
> > >
> > > > Also is a deprecation notification needed? How is it handled usually?
> > >
> > > Do we have time for such a notification or are we in the situation
> > > where we just throw errors to the user and let them agree to the
> > > usrmerge change? The timescale is unclear but if the systems are
> > > already throwing deprecation warnings at runtime, this isn't a good
> > > experience for our users.
> >
> > It's not urgent. But the build-time warning has been in place for a
> > couple of years now, you should have already seen it.
>
> I haven't :(.
>
> > The runtime is a taint flag in 'systemctl status', and was introduced
> > in the most recent release.
> > There is no timeline as of now for dropping legacy compat code and
> > configuration, as the runtime taint was just added.
> > Certainly won't be this year. I've been doing the rounds ensuring
> > everyone who hasn't switched already is aware with plenty of time to
> > spare.
>
> Well, it is good to have the warning, thanks.
>
> >
> > > > Aside from process details, I assume there's no problem with doing the
> > > > change in principle?
> > >
> > > There is, but it appears a done deal which we just have to accept so
> > > I'm trying not to start a discussion which I don't think can go
> > > anywhere productive. If this isn't a done deal, then let me know as
> > > that would be different.
> >
> > It is a done deal as far as we are concerned upstream, matter of
> > 'when' not 'if'.
>
> This is not going to help systemd's reputation. Basically, we have to
> do what Fedora does and look as we're told to, which does go against
> our configurability objective. We already have tensions around musl and
> this will further demonstrate our direction and systemd's are not
> aligned. I do understand why systemd is doing what it is doing and that
> it really doesn't care about our use cases. That doesn't stop some
> users wanting it (but also wanting other things we have like musl).

Well, it's not just Fedora nowadays, it's Fedora, RHEL, CentOS, Alma,
Rocky, SUSE, Archlinux, Debian, Ubuntu, Mint, PopOS, Endless,
OpenMandriva, Mariner... and Gentoo is planning it. There's probably
more, those are the ones I know off the top of my head. Whether to do
this change or not was discussed at length almost ten years ago. We
can't keep reopening the same things again and again, it's discussed
once (or twice...) and then the decision is documented and slowly
implemented, like any other project does. Every project has breaking
changes every now and then, Yocto included. We're doing our best to
document and notify and spread the word, and sending patches too in
some cases.

Kind regards,
Luca Boccassi

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 5629 bytes --]

It’s been in the news that lennart has left red hat and moved to Microsoft
recently and will continue with systemd there. Which is rather worrying, as
Microsoft by and large is only interested In linux on azure or wsl.

I can help iron out the issues once we have a list.

Alex

On Wed 13. Jul 2022 at 18.52, Luca Bocassi <luca.boccassi@gmail.com> wrote:

> On Wed, 13 Jul 2022 at 14:19, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > On Wed, 2022-07-13 at 00:30 +0100, Luca Boccassi wrote:
> > > On Tue, 12 Jul 2022 at 22:55, Richard Purdie
> > > <richard.purdie@linuxfoundation.org> wrote:
> > > > The configuration is yocto-autobuilder-helper but the best place to
> > > > start is probably the poky-altcfg distro config.
> > > >
> > > > Once we change that we'll have to run through the testing, see how
> much
> > > > breaks and then find someone to try and fix any issues if/as needed.
> > > > There is a lot of work just in pulling things together for testing
> and
> > > > triaging the result and I'm depressed it will probably end up on my
> > > > plate when I personally disagree with the decision.
> > >
> > > We've been running this configuration internally for ~3 years in our
> > > Yocto downstream, never seen any issue, not even at the beginning, it
> > > just worked.
> > > Nowadays most major distros have switched over, Gentoo's the other one
> > > left but it's planned for this year.
> > > Any issues in upstream softwares should have been fixed years ago when
> > > Fedora started the process.
> > > So hopefully it shouldn't be too bad?
> >
> > My worry is the QA framework and tests likely haven't been used with
> > it. It may be fine or it may not. I do know how much of my time this
> > stuff takes up with other issues.
>
> I have sent v2 with the poky-altcfg configuration change.
>
> > > > I was asked earlier today if we should just make the systemd include
> > > > files force usrmerge on. The challenge is that OE/YP give users
> choice
> > > > to configure their system how they wish, we don't just force
> > > > configurations upon them. Or only real option is therefore to throw
> > > > errors and have them decide what to do (which basically amounts to
> > > > submitting to the upstream decision).
> > > >
> > > > > Also is a deprecation notification needed? How is it handled
> usually?
> > > >
> > > > Do we have time for such a notification or are we in the situation
> > > > where we just throw errors to the user and let them agree to the
> > > > usrmerge change? The timescale is unclear but if the systems are
> > > > already throwing deprecation warnings at runtime, this isn't a good
> > > > experience for our users.
> > >
> > > It's not urgent. But the build-time warning has been in place for a
> > > couple of years now, you should have already seen it.
> >
> > I haven't :(.
> >
> > > The runtime is a taint flag in 'systemctl status', and was introduced
> > > in the most recent release.
> > > There is no timeline as of now for dropping legacy compat code and
> > > configuration, as the runtime taint was just added.
> > > Certainly won't be this year. I've been doing the rounds ensuring
> > > everyone who hasn't switched already is aware with plenty of time to
> > > spare.
> >
> > Well, it is good to have the warning, thanks.
> >
> > >
> > > > > Aside from process details, I assume there's no problem with doing
> the
> > > > > change in principle?
> > > >
> > > > There is, but it appears a done deal which we just have to accept so
> > > > I'm trying not to start a discussion which I don't think can go
> > > > anywhere productive. If this isn't a done deal, then let me know as
> > > > that would be different.
> > >
> > > It is a done deal as far as we are concerned upstream, matter of
> > > 'when' not 'if'.
> >
> > This is not going to help systemd's reputation. Basically, we have to
> > do what Fedora does and look as we're told to, which does go against
> > our configurability objective. We already have tensions around musl and
> > this will further demonstrate our direction and systemd's are not
> > aligned. I do understand why systemd is doing what it is doing and that
> > it really doesn't care about our use cases. That doesn't stop some
> > users wanting it (but also wanting other things we have like musl).
>
> Well, it's not just Fedora nowadays, it's Fedora, RHEL, CentOS, Alma,
> Rocky, SUSE, Archlinux, Debian, Ubuntu, Mint, PopOS, Endless,
> OpenMandriva, Mariner... and Gentoo is planning it. There's probably
> more, those are the ones I know off the top of my head. Whether to do
> this change or not was discussed at length almost ten years ago. We
> can't keep reopening the same things again and again, it's discussed
> once (or twice...) and then the decision is documented and slowly
> implemented, like any other project does. Every project has breaking
> changes every now and then, Yocto included. We're doing our best to
> document and notify and spread the word, and sending patches too in
> some cases.
>
> Kind regards,
> Luca Boccassi
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#167961):
> https://lists.openembedded.org/g/openembedded-core/message/167961
> Mute This Topic: https://lists.openembedded.org/mt/92319509/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 7483 bytes --]

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Luca Boccassi]

On Wed, 13 Jul 2022 at 00:30, Luca Boccassi <luca.boccassi@gmail.com> wrote:
>
> On Tue, 12 Jul 2022 at 22:55, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > On Tue, 2022-07-12 at 18:16 +0100, Luca Boccassi wrote:
> > > On Mon, 11 Jul 2022 at 23:06, Richard Purdie
> > > <richard.purdie@linuxfoundation.org> wrote:
> > > >
> > > > On Mon, 2022-07-11 at 21:29 +0100, Luca Bocassi wrote:
> > > > > From: Luca Boccassi <luca.boccassi@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.boccassi@microsoft.com>
> > > > > ---
> > > > > 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 :(.
> > >
> > > Yes I was expecting there would be these kind of issues, the purpose
> > > of sending this was mainly to find out about them.
> > > So where are these configurations stored? How can we get them updated?
> >
> > The configuration is yocto-autobuilder-helper but the best place to
> > start is probably the poky-altcfg distro config.
> >
> > Once we change that we'll have to run through the testing, see how much
> > breaks and then find someone to try and fix any issues if/as needed.
> > There is a lot of work just in pulling things together for testing and
> > triaging the result and I'm depressed it will probably end up on my
> > plate when I personally disagree with the decision.
>
> We've been running this configuration internally for ~3 years in our
> Yocto downstream, never seen any issue, not even at the beginning, it
> just worked.
> Nowadays most major distros have switched over, Gentoo's the other one
> left but it's planned for this year.
> Any issues in upstream softwares should have been fixed years ago when
> Fedora started the process.
> So hopefully it shouldn't be too bad?
>
> > I was asked earlier today if we should just make the systemd include
> > files force usrmerge on. The challenge is that OE/YP give users choice
> > to configure their system how they wish, we don't just force
> > configurations upon them. Or only real option is therefore to throw
> > errors and have them decide what to do (which basically amounts to
> > submitting to the upstream decision).
> >
> > > Also is a deprecation notification needed? How is it handled usually?
> >
> > Do we have time for such a notification or are we in the situation
> > where we just throw errors to the user and let them agree to the
> > usrmerge change? The timescale is unclear but if the systems are
> > already throwing deprecation warnings at runtime, this isn't a good
> > experience for our users.
>
> It's not urgent. But the build-time warning has been in place for a
> couple of years now, you should have already seen it.
> The runtime is a taint flag in 'systemctl status', and was introduced
> in the most recent release.
> There is no timeline as of now for dropping legacy compat code and
> configuration, as the runtime taint was just added.
> Certainly won't be this year. I've been doing the rounds ensuring
> everyone who hasn't switched already is aware with plenty of time to
> spare.

FYI, we now have a tentative timeline: first release of H2 2023 will
drop support for split-usr and unmerged-usr:

https://github.com/systemd/systemd/blob/v252-rc2/NEWS#L14

Kind regards,
Luca Boccassi

[PATCH v2 1/2] poky-altcfg: enable usrmerge

[luca.boccassi]

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"
 
-- 
2.34.1

[PATCH v2 2/2] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[luca.boccassi]

From: Luca Boccassi <luca.boccassi@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.boccassi@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"
 
 SRC_URI += "file://touchscreen.rules \
            file://00-create-volatile.conf \
-- 
2.34.1

Re: [OE-core] [PATCH v2 2/2] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3712 bytes --]

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 <luca.boccassi@gmail.com>
wrote:

> From: Luca Boccassi <luca.boccassi@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.boccassi@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
> <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 (#167960):
> https://lists.openembedded.org/g/openembedded-core/message/167960
> Mute This Topic: https://lists.openembedded.org/mt/92360228/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 6221 bytes --]

Re: [OE-core] [PATCH v2 2/2] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

On Wed, Jul 13, 2022 at 5:57 PM Martin Jansa via lists.openembedded.org
<Martin.Jansa=gmail.com@lists.openembedded.org> wrote:

> 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?
>

There should be a warning since:

https://git.openembedded.org/bitbake/commit/?id=8c31e75557dc6a8d8f407b5d24d6327889a3e3b1

[-- Attachment #2: Type: text/html, Size: 891 bytes --]

Re: [OE-core] [PATCH v2 2/2] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Richard Purdie]

On Wed, 2022-07-13 at 16:41 +0100, Luca Bocassi wrote:
> From: Luca Boccassi <luca.boccassi@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.boccassi@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".

Cheers,

Richard

Re: [OE-core] [PATCH v2 2/2] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Luca Boccassi]

On Wed, 13 Jul 2022 at 17:26, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Wed, 2022-07-13 at 16:41 +0100, Luca Bocassi wrote:
> > From: Luca Boccassi <luca.boccassi@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.boccassi@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

Re: [OE-core] [PATCH v2 2/2] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Richard Purdie]

There was one issue so far:

https://autobuilder.yoctoproject.org/typhoon/#/builders/101/builds/4303/steps/13/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/131/builds/882/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/131/builds/882

and probably more of that one occurring, the build is still in
progress.

The build does have other patches under test in it and those also have
issues but I'm pretty sure the ones above are usrmerge related.

Cheers,

Richard

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

[luca.boccassi]

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"
 
-- 
2.34.1

[PATCH v3 2/2] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[luca.boccassi]

From: Luca Boccassi <luca.boccassi@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.boccassi@microsoft.com>
---
v3: use += without :append

 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..8831578010 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 += "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..0987c3f416 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 += "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..ade2e61676 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 += "systemd"
 
 SRC_URI += "file://touchscreen.rules \
            file://00-create-volatile.conf \
-- 
2.34.1

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

[Richard Purdie]

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.

Cheers,

Richard

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

[Luca Boccassi]

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
$

Kind regards,
Luca Boccassi

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

[Richard Purdie]

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).

Cheers,

Richard

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

[Luca Boccassi]

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.

Kind regards,
Luca Boccassi

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

[Richard Purdie]

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

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

[Andre McCurdy]

On Wed, Jul 13, 2022 at 12:02 PM Luca Bocassi <luca.boccassi@gmail.com> 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.

Yeah... += with an over-ride is intuitive but 99.9% of the time is
completely wrong.

There was a discussion some time ago about having the parser reject it
with an error because it repeatedly trips up new (and some not so
new...) developers, but it never came to anything.

> Kind regards,
> Luca Boccassi
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#167984): https://lists.openembedded.org/g/openembedded-core/message/167984
> Mute This Topic: https://lists.openembedded.org/mt/92361983/3619030
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [armccurdy@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

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

[Jacob Kroon]

On 7/13/22 19:53, Richard Purdie 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.
> 

Maybe I'm missing something, but what is the benefit in introducing and 
using the "poky-altcfg" override in this file ? If DISTRO_FEATURES was 
just appended with

DISTRO_FEATURES += "usrmerge"

it would all be fine, since it is after the

require conf/distro/poky.conf

line, right ? And if someone wants to base a distro in 
"poky-altcfg.conf", they would include "poky-altcfg.conf" first in the 
same way, then do customizations.

Jacob

[PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[luca.boccassi]

From: Luca Boccassi <luca.boccassi@microsoft.com>

Support for unmerged-usr is deprecated upstream, taints the system and
has been removed for v255 (next release).
Enforce building merged-usr images when using systemd. This allows one
release cycle where it can be tested for any remaining issue, and can
still be overridden, before it stops working completely.

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
---
Time to resurrect this. Support for unmerged-usr has been removed and
will no longer be available starting with v255. Better to get started
now with the enforcement, so that things can be worked out while it is
still possible to override it.

 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_254.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 55ebf99117f..88315780108 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 += "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 fd888bb8340..0987c3f4162 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 += "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 b00a49884be..f70b420e120 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -20,3 +20,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_254.bb b/meta/recipes-core/systemd/systemd_254.bb
index 7ba4233f6a2..188151a769c 100644
--- a/meta/recipes-core/systemd/systemd_254.bb
+++ b/meta/recipes-core/systemd/systemd_254.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 += "systemd"
 
 SRC_URI += " \
            file://touchscreen.rules \
-- 
2.39.2

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Otavio Salvador]

Em sáb., 5 de ago. de 2023 às 08:06, Luca Bocassi
<luca.boccassi@gmail.com> escreveu:
> From: Luca Boccassi <luca.boccassi@microsoft.com>
>
> Support for unmerged-usr is deprecated upstream, taints the system and
> has been removed for v255 (next release).
> Enforce building merged-usr images when using systemd. This allows one
> release cycle where it can be tested for any remaining issue, and can
> still be overridden, before it stops working completely.
>
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>

This makes sense. I also prefer to add this sooner than later.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Richard Purdie]

On Sat, 2023-08-05 at 12:06 +0100, Luca Bocassi wrote:
> From: Luca Boccassi <luca.boccassi@microsoft.com>
> 
> Support for unmerged-usr is deprecated upstream, taints the system and
> has been removed for v255 (next release).
> Enforce building merged-usr images when using systemd. This allows one
> release cycle where it can be tested for any remaining issue, and can
> still be overridden, before it stops working completely.
> 
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> ---
> Time to resurrect this. Support for unmerged-usr has been removed and
> will no longer be available starting with v255. Better to get started
> now with the enforcement, so that things can be worked out while it is
> still possible to override it.
> 
>  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_254.bb          | 2 +-
>  4 files changed, 8 insertions(+), 3 deletions(-)

Thanks for sending the patch. I did put this in for testing and because
it makes usrmerge required for the systemd-boot recipe, even sysvinit
based images fail builds with errors like:

https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/7580/steps/12/logs/stdio

Is usrmerge needed to systemd-boot as well?

Cheers,

Richard

Re: [OE-core] [PATCH] systemd: add usrmerge to REQUIRED_DISTRO_FEATURES

[Luca Boccassi]

On Sat, 5 Aug 2023 at 14:09, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Sat, 2023-08-05 at 12:06 +0100, Luca Bocassi wrote:
> > From: Luca Boccassi <luca.boccassi@microsoft.com>
> >
> > Support for unmerged-usr is deprecated upstream, taints the system and
> > has been removed for v255 (next release).
> > Enforce building merged-usr images when using systemd. This allows one
> > release cycle where it can be tested for any remaining issue, and can
> > still be overridden, before it stops working completely.
> >
> > Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> > ---
> > Time to resurrect this. Support for unmerged-usr has been removed and
> > will no longer be available starting with v255. Better to get started
> > now with the enforcement, so that things can be worked out while it is
> > still possible to override it.
> >
> >  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_254.bb          | 2 +-
> >  4 files changed, 8 insertions(+), 3 deletions(-)
>
> Thanks for sending the patch. I did put this in for testing and because
> it makes usrmerge required for the systemd-boot recipe, even sysvinit
> based images fail builds with errors like:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/7580/steps/12/logs/stdio
>
> Is usrmerge needed to systemd-boot as well?

I don't think so, that's a uefi binary, sent v2 to avoid it for now