summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-03-27 17:25:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-30 12:33:29 +0100
commitb60ff67b4e73824b57bc265f5f2271dc1177c060 (patch)
treee06b094614bc4e95bdd07d23ca5b34e422de8e0b
parented8d13bf60fa4825c6831eac11d8a110d0d689f0 (diff)
downloadpoky-b60ff67b4e73824b57bc265f5f2271dc1177c060.tar.gz
systemd: Enable smack based on DISTRO_FEATURES
(From OE-Core rev: 15c3aa93eaa41f4dca326c37f0a1fd9bf6054c3c) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_244.3.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb
index 2b3dad602f..070f1b66d3 100644
--- a/meta/recipes-core/systemd/systemd_244.3.bb
+++ b/meta/recipes-core/systemd/systemd_244.3.bb
@@ -56,7 +56,7 @@ PAM_PLUGINS = " \
56" 56"
57 57
58PACKAGECONFIG ??= " \ 58PACKAGECONFIG ??= " \
59 ${@bb.utils.filter('DISTRO_FEATURES', 'efi ldconfig pam selinux usrmerge polkit', d)} \ 59 ${@bb.utils.filter('DISTRO_FEATURES', 'efi ldconfig pam selinux smack usrmerge polkit', d)} \
60 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ 60 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
61 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 61 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
62 acl \ 62 acl \
@@ -80,7 +80,6 @@ PACKAGECONFIG ??= " \
80 randomseed \ 80 randomseed \
81 resolved \ 81 resolved \
82 set-time-epoch \ 82 set-time-epoch \
83 smack \
84 sysusers \ 83 sysusers \
85 sysvinit \ 84 sysvinit \
86 timedated \ 85 timedated \
@@ -98,7 +97,6 @@ PACKAGECONFIG_remove_libc-musl = " \
98 nss \ 97 nss \
99 nss-mymachines \ 98 nss-mymachines \
100 nss-resolve \ 99 nss-resolve \
101 smack \
102 sysusers \ 100 sysusers \
103 utmp \ 101 utmp \
104" 102"