[master] poky-tiny: fix PACKAGE_EXCLUDE

From: Ross Burton <ross.burton@arm.com>

poky-tiny does a PACKAGE_EXCLUDE on shadow-base as the kernel doesn't
support multiple users.  However it does this by assigning to an
override, which makes it impossible for images or machines to extend
PACKAGE_INCLUDE with their own exclusions.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-poky/conf/distro/poky-tiny.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

On Mon, 2023-11-06 at 10:35 +0000, Ross Burton wrote:
> From: Ross Burton <ross.burton@arm.com>
> 
> poky-tiny does a PACKAGE_EXCLUDE on shadow-base as the kernel doesn't
> support multiple users.  However it does this by assigning to an
> override, which makes it impossible for images or machines to extend
> PACKAGE_INCLUDE with their own exclusions.

PACKAGE_INCLUDE?

> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta-poky/conf/distro/poky-tiny.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf
> index 32c2ec3e1fa..24bcbee9bb6 100644
> --- a/meta-poky/conf/distro/poky-tiny.conf
> +++ b/meta-poky/conf/distro/poky-tiny.conf
> @@ -125,4 +125,4 @@ PACKAGECONFIG:remove:pn-opkg-utils = "python"
>  
>  # If shadow-base is brought into the image, logins will fail because it
>  # doesn't have the heuristics to work when CONFIG_MULTIUSER is unset.
> -PACKAGE_EXCLUDE:poky-tiny = "shadow-base"
> +PACKAGE_EXCLUDE += "shadow-base"

Does yocto-check-layer still pass?

Cheers,

Richard

On 6 Nov 2023, at 10:44, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> 
> On Mon, 2023-11-06 at 10:35 +0000, Ross Burton wrote:
>> From: Ross Burton <ross.burton@arm.com>
>> 
>> poky-tiny does a PACKAGE_EXCLUDE on shadow-base as the kernel doesn't
>> support multiple users.  However it does this by assigning to an
>> override, which makes it impossible for images or machines to extend
>> PACKAGE_INCLUDE with their own exclusions.
> 
> PACKAGE_INCLUDE?

More coffee needed. V2 incoming.

>> # If shadow-base is brought into the image, logins will fail because it
>> # doesn't have the heuristics to work when CONFIG_MULTIUSER is unset.
>> -PACKAGE_EXCLUDE:poky-tiny = "shadow-base"
>> +PACKAGE_EXCLUDE += "shadow-base"
> 
> Does yocto-check-layer still pass?

This is in the distro configuration so it still does nothing when not included, but:

INFO: meta-poky … PASS

Ross

On Mon, 2023-11-06 at 10:55 +0000, Ross Burton wrote:
> On 6 Nov 2023, at 10:44, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> > 
> > On Mon, 2023-11-06 at 10:35 +0000, Ross Burton wrote:
> > > From: Ross Burton <ross.burton@arm.com>
> > > 
> > > poky-tiny does a PACKAGE_EXCLUDE on shadow-base as the kernel doesn't
> > > support multiple users.  However it does this by assigning to an
> > > override, which makes it impossible for images or machines to extend
> > > PACKAGE_INCLUDE with their own exclusions.
> > 
> > PACKAGE_INCLUDE?
> 
> More coffee needed. V2 incoming.
> 
> > > # If shadow-base is brought into the image, logins will fail because it
> > > # doesn't have the heuristics to work when CONFIG_MULTIUSER is unset.
> > > -PACKAGE_EXCLUDE:poky-tiny = "shadow-base"
> > > +PACKAGE_EXCLUDE += "shadow-base"
> > 
> > Does yocto-check-layer still pass?
> 
> This is in the distro configuration so it still does nothing when not included, but:
> 
> INFO: meta-poky … PASS

Of course, that was the detail I was overlooking, thanks :)

Cheers,

Richard