From c4e6a67a8aea01e25d372f209b4214d41bb293da Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 5 Aug 2023 22:35:51 +0100 Subject: 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. (From OE-Core rev: 802e853eeddf16d73db1900546cc5f045d1fb7ed) Signed-off-by: Luca Boccassi Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd-compat-units.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/systemd/systemd-compat-units.bb') 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 \ -- cgit v1.2.3-54-g00ecf