[PATCH] poky.conf: move pam DISTRO_FEATURE from altcfg to default poky

[PATCH] poky.conf: move pam DISTRO_FEATURE from altcfg to default poky

[Alexander Kanavin]

This is needed to run libpam-ptest and also for running weston under
systemd which is an increasingly common configuration.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 4 ++--
 meta-poky/conf/distro/poky.conf                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
index 273ebfdfef..4c377b4deb 100644
--- a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
+++ b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
@@ -1,5 +1,5 @@
-# Add an extra DISTRO_FEATURE
-DISTRO_FEATURES_append = " pam"
+# Remove an extra DISTRO_FEATURE
+DISTRO_FEATURES_remove = "pam"
 
 # Use the LTSI Kernel
 PREFERRED_VERSION_linux-yocto = "5.4%"
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 522cc92f74..03abc6c55a 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -13,7 +13,7 @@ TARGET_VENDOR = "-poky"
 LOCALCONF_VERSION = "1"
 
 # Override these in poky based distros
-POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan"
+POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl pam ptest multiarch wayland vulkan"
 POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
 POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
 
-- 
2.31.1

Re: [poky] [PATCH] poky.conf: move pam DISTRO_FEATURE from altcfg to default poky

[Richard Purdie]

On Fri, 2021-05-07 at 20:47 +0200, Alexander Kanavin wrote:
> This is needed to run libpam-ptest and also for running weston under
> systemd which is an increasingly common configuration.
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 4 ++--
>  meta-poky/conf/distro/poky.conf                               | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
> index 273ebfdfef..4c377b4deb 100644
> --- a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
> +++ b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
> @@ -1,5 +1,5 @@
> -# Add an extra DISTRO_FEATURE
> -DISTRO_FEATURES_append = " pam"
> +# Remove an extra DISTRO_FEATURE
> +DISTRO_FEATURES_remove = "pam"

Red flag number one is a remove in our own configuration flags. We should
never really be doing that. I know we do in some cases, I still hate it
every time I see it and we need to minimise it.

>  # Use the LTSI Kernel
>  PREFERRED_VERSION_linux-yocto = "5.4%"
> diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
> index 522cc92f74..03abc6c55a 100644
> --- a/meta-poky/conf/distro/poky.conf
> +++ b/meta-poky/conf/distro/poky.conf
> @@ -13,7 +13,7 @@ TARGET_VENDOR = "-poky"
>  LOCALCONF_VERSION = "1"
>   # Override these in poky based distros
> -POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan"
> +POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl pam ptest multiarch wayland vulkan"
>  POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
>  POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"

This change moves pam away from our systemd configuration which I suspect will 
break your wayland changes.

I also would like to maintain the pam distro feature in testing and I suspect this
way around, we have more users testing it and the other way around we'd see a lot
of bitrot and breakage.

I've commented elsewhere there is a perception pam is heavy, both through extra
dependencies and also in more convoluted codepaths for things like logins. Some
users need/want the simpler option.

The reason driving the change is being able to test libpam-ptest and I suspect adding
that on its own to one of our altcfg images and triggering the ptest runner may
be a better way to resolve the issue.

Cheers,

Richard