summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd-compat-units.bb
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2023-08-05 22:35:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-11 13:21:31 +0100
commit802e853eeddf16d73db1900546cc5f045d1fb7ed (patch)
treeee8566144b84460b000f417ab9db9abbf094e1a4 /meta/recipes-core/systemd/systemd-compat-units.bb
parentfa8c59c49940af4cb03df49f5b6a2a53d50fbefb (diff)
downloadopenembedded-core-802e853eeddf16d73db1900546cc5f045d1fb7ed.tar.gz
systemd: add usrmerge to REQUIRED_DISTRO_FEATURES
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release). Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely. Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-compat-units.bb')
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
index 55ebf99117..75b1045728 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta/recipes-core/systemd/systemd-compat-units.bb
@@ -14,7 +14,8 @@ INHIBIT_DEFAULT_DEPS = "1"
ALLOW_EMPTY:${PN} = "1"
-REQUIRED_DISTRO_FEATURES = "systemd"
+REQUIRED_DISTRO_FEATURES += "systemd"
+REQUIRED_DISTRO_FEATURES += "usrmerge"
SYSTEMD_DISABLED_SYSV_SERVICES = " \
busybox-udhcpc \