diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-11 11:42:53 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-11 13:22:01 +0100 |
| commit | d4933d100673ba1203151018647d359aa622931d (patch) | |
| tree | 81f130a12825d13eefd6bb9fc804b352a23f8925 /meta/conf/distro/include/init-manager-systemd.inc | |
| parent | 67a8dcabda44560e66b3daeb68f185356694a2db (diff) | |
| download | poky-d4933d100673ba1203151018647d359aa622931d.tar.gz | |
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.
(From OE-Core rev: fa8c59c49940af4cb03df49f5b6a2a53d50fbefb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include/init-manager-systemd.inc')
| -rw-r--r-- | meta/conf/distro/include/init-manager-systemd.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/init-manager-systemd.inc b/meta/conf/distro/include/init-manager-systemd.inc index 7867d90028..595d1f2644 100644 --- a/meta/conf/distro/include/init-manager-systemd.inc +++ b/meta/conf/distro/include/init-manager-systemd.inc | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Use systemd for system initialization | 1 | # Use systemd for system initialization |
| 2 | DISTRO_FEATURES:append = " systemd" | 2 | DISTRO_FEATURES:append = " systemd usrmerge" |
| 3 | DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" | 3 | DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" |
| 4 | VIRTUAL-RUNTIME_init_manager ??= "systemd" | 4 | VIRTUAL-RUNTIME_init_manager ??= "systemd" |
| 5 | VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units" | 5 | VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units" |