[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8234/8267] systemd: use consistent approach for musl PACKAGECONFIG options

[Emmanuele Bassi <ebassi src gnome org>]

commit c889bffda23d9fdc0133b61c725e3d4c20b9aad9
Author: Andre McCurdy <armccurdy gmail com>
Date:   Tue Nov 14 11:39:21 2017 -0800

    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: 84a4a5bd4a80a1336282d6c10c333673bbd3280c)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit 8fb362d90628d0dbc9a5073a0d75296eab569d44)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/systemd/systemd_234.bb |   67 +++++++++++++++++-------------
 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 6946538..b7968b1 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -50,36 +50,45 @@ PAM_PLUGINS = " \
     pam-plugin-keyinit \
 "
 
-PACKAGECONFIG ??= "xz \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
-                   binfmt \
-                   randomseed \
-                   machined \
-                   backlight \
-                   vconsole \
-                   quotacheck \
-                   hostnamed \
-                   ${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers utmp', '', d)} \
-                   nss \
-                   hibernate \
-                   timedated \
-                   timesyncd \
-                   localed \
-                   ima \
-                   smack \
-                   logind \
-                   firstboot \
-                   polkit \
-                   resolved \
-                   networkd \
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'efi ldconfig pam selinux usrmerge', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
+    backlight \
+    binfmt \
+    firstboot \
+    hibernate \
+    hostnamed \
+    ima \
+    localed \
+    logind \
+    machined \
+    myhostname \
+    networkd \
+    nss \
+    polkit \
+    quotacheck \
+    randomseed \
+    resolved \
+    smack \
+    sysusers \
+    timedated \
+    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
 # systemd-getty-generator instead of using the OE-core specific