summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-06-14 14:57:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-15 08:01:08 +0100
commitdc03dac76911975b486769185b482a07b60613c8 (patch)
treeee487f20bff20418250018f95fd1cee09a04cefa /meta-poky/conf
parent4a70c556bf5f75b2e11d691308c3c101fa026675 (diff)
downloadpoky-dc03dac76911975b486769185b482a07b60613c8.tar.gz
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 <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf')
-rw-r--r--meta-poky/conf/distro/include/poky-distro-alt-test-config.inc4
1 files changed, 2 insertions, 2 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 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 @@
1# Add an extra DISTRO_FEATURE 1# Add extra DISTRO_FEATUREs
2DISTRO_FEATURES:append = " pam" 2DISTRO_FEATURES:append = " pam usrmerge"
3 3
4# Use the LTSI Kernel 4# Use the LTSI Kernel
5PREFERRED_VERSION_linux-yocto = "6.1%" 5PREFERRED_VERSION_linux-yocto = "6.1%"