mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

systemd: use consistent approach for musl PACKAGECONFIG options

Browse Source 
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>
This commit is contained in:
Andre McCurdy
2017-11-14 11:39:21 -08:00
committed by Richard Purdie
parent dbc2504bf9
commit 654cbd4cc8
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd_234.bb
+38 -29
View File
@@ -50,36 +50,45 @@ PAM_PLUGINS = " \
pam-plugin-keyinit \ pam-plugin-keyinit \
" "
PACKAGECONFIG ??= "xz \ PACKAGECONFIG ??= " \
${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'efi ldconfig pam selinux usrmerge', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
binfmt \ backlight \
randomseed \ binfmt \
machined \ firstboot \
backlight \ hibernate \
vconsole \ hostnamed \
quotacheck \ ima \
hostnamed \ localed \
${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers utmp', '', d)} \ logind \
nss \ machined \
hibernate \ myhostname \
timedated \ networkd \
timesyncd \ nss \
localed \ polkit \
ima \ quotacheck \
smack \ randomseed \
logind \ resolved \
firstboot \ smack \
polkit \ sysusers \
resolved \ timedated \
networkd \ timesyncd \
utmp \
vconsole \
xz \
"
PACKAGECONFIG_remove_libc-musl = " \
localed \
myhostname \
nss \
resolved \
selinux \
smack \
sysusers \
utmp \
" "
PACKAGECONFIG_remove_libc-musl = "selinux"
PACKAGECONFIG_remove_libc-musl = "smack"
PACKAGECONFIG_remove_libc-musl = "resolved"
PACKAGECONFIG_remove_libc-musl = "nss"
PACKAGECONFIG_remove_libc-musl = "localed"
# Use the upstream systemd serial-getty@.service and rely on # Use the upstream systemd serial-getty@.service and rely on
# systemd-getty-generator instead of using the OE-core specific # systemd-getty-generator instead of using the OE-core specific