summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-11-14 11:39:21 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-30 10:49:21 +0000
commit654cbd4cc8a22b477a529bf25318586d4ccf29c6 (patch)
tree42d8056f023b1a5f7918f7a83862ec20e950c2c0
parentdbc2504bf932f58eb757fe269c979cacf9516040 (diff)
downloadpoky-654cbd4cc8a22b477a529bf25318586d4ccf29c6.tar.gz
systemd: use consistent approach for musl PACKAGECONFIG options
Consistently use PACKAGECONFIG_remove_libc-musl to disable options which are not compatible with musl. Also sort the default PACKAGECONFIG list. (From OE-Core rev: 8fb362d90628d0dbc9a5073a0d75296eab569d44) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb67
1 files changed, 38 insertions, 29 deletions
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 69465388b2..b7968b15aa 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -50,36 +50,45 @@ PAM_PLUGINS = " \
50 pam-plugin-keyinit \ 50 pam-plugin-keyinit \
51" 51"
52 52
53PACKAGECONFIG ??= "xz \ 53PACKAGECONFIG ??= " \
54 ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \ 54 ${@bb.utils.filter('DISTRO_FEATURES', 'efi ldconfig pam selinux usrmerge', d)} \
55 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 55 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
56 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ 56 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
57 binfmt \ 57 backlight \
58 randomseed \ 58 binfmt \
59 machined \ 59 firstboot \
60 backlight \ 60 hibernate \
61 vconsole \ 61 hostnamed \
62 quotacheck \ 62 ima \
63 hostnamed \ 63 localed \
64 ${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers utmp', '', d)} \ 64 logind \
65 nss \ 65 machined \
66 hibernate \ 66 myhostname \
67 timedated \ 67 networkd \
68 timesyncd \ 68 nss \
69 localed \ 69 polkit \
70 ima \ 70 quotacheck \
71 smack \ 71 randomseed \
72 logind \ 72 resolved \
73 firstboot \ 73 smack \
74 polkit \ 74 sysusers \
75 resolved \ 75 timedated \
76 networkd \ 76 timesyncd \
77 utmp \
78 vconsole \
79 xz \
80"
81
82PACKAGECONFIG_remove_libc-musl = " \
83 localed \
84 myhostname \
85 nss \
86 resolved \
87 selinux \
88 smack \
89 sysusers \
90 utmp \
77" 91"
78PACKAGECONFIG_remove_libc-musl = "selinux"
79PACKAGECONFIG_remove_libc-musl = "smack"
80PACKAGECONFIG_remove_libc-musl = "resolved"
81PACKAGECONFIG_remove_libc-musl = "nss"
82PACKAGECONFIG_remove_libc-musl = "localed"
83 92
84# Use the upstream systemd serial-getty@.service and rely on 93# Use the upstream systemd serial-getty@.service and rely on
85# systemd-getty-generator instead of using the OE-core specific 94# systemd-getty-generator instead of using the OE-core specific