diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2023-08-05 22:35:51 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-11 13:22:01 +0100 |
| commit | c4e6a67a8aea01e25d372f209b4214d41bb293da (patch) | |
| tree | 4e0f12a41d07103807882740b43a19573d77056d /meta/recipes-core/systemd/systemd-compat-units.bb | |
| parent | d4933d100673ba1203151018647d359aa622931d (diff) | |
| download | poky-c4e6a67a8aea01e25d372f209b4214d41bb293da.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.
(From OE-Core rev: 802e853eeddf16d73db1900546cc5f045d1fb7ed)
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.bb | 3 |
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" | |||
| 14 | 14 | ||
| 15 | ALLOW_EMPTY:${PN} = "1" | 15 | ALLOW_EMPTY:${PN} = "1" |
| 16 | 16 | ||
| 17 | REQUIRED_DISTRO_FEATURES = "systemd" | 17 | REQUIRED_DISTRO_FEATURES += "systemd" |
| 18 | REQUIRED_DISTRO_FEATURES += "usrmerge" | ||
| 18 | 19 | ||
| 19 | SYSTEMD_DISABLED_SYSV_SERVICES = " \ | 20 | SYSTEMD_DISABLED_SYSV_SERVICES = " \ |
| 20 | busybox-udhcpc \ | 21 | busybox-udhcpc \ |