From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 11 Aug 2023 10:42:53 +0000 (+0100)
Subject: conf/init-mamager-systemd: Add usrmerge to DISTRO_FEATURES
X-Git-Tag: uninative-4.2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8c59c49940af4cb03df49f5b6a2a53d50fbefb;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

conf/init-mamager-systemd: Add usrmerge to DISTRO_FEATURES

usrmerge is now required by systemd, ensure this is also added to DISTRO_FEATURES
when systemd is selected.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/distro/include/init-manager-systemd.inc b/meta/conf/distro/include/init-manager-systemd.inc
index 7867d900283..595d1f2644b 100644
--- a/meta/conf/distro/include/init-manager-systemd.inc
+++ b/meta/conf/distro/include/init-manager-systemd.inc
@@ -1,5 +1,5 @@
 # Use systemd for system initialization
-DISTRO_FEATURES:append = " systemd"
+DISTRO_FEATURES:append = " systemd usrmerge"
 DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
 VIRTUAL-RUNTIME_init_manager ??= "systemd"
 VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units"