From dc03dac76911975b486769185b482a07b60613c8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 14 Jun 2023 14:57:19 +0100 Subject: poky-altconfig: enable usrmerge DISTRO_FEATURE The point of poky-altconfig is to exercise popular DISTRO_FEATURES which are not enabled in nodistro or poky out of the box. With the upcoming v254 release of systemd mandating usrmerge[1] this will become mandatory for anyone using systemd, so get ahead of the curve and enable it in poky-altconfig now to shake out any problems and ensure it is continually tested. [1] https://lists.freedesktop.org/archives/systemd-devel/2023-June/049173.html (From meta-yocto rev: 060021abc795cebbbf003265c2fcb976505333a8) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-poky/conf') 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 32797525fb..4c1eb552a3 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" +# Add extra DISTRO_FEATUREs +DISTRO_FEATURES:append = " pam usrmerge" # Use the LTSI Kernel PREFERRED_VERSION_linux-yocto = "6.1%" -- cgit v1.2.3-54-g00ecf