]> code.ossystems Code Review - openembedded-core.git/commitdiff
glibc: systemd and sysvinit are not mutually exclusive
authorJonas Bonn <jonas@norrbonn.se>
Tue, 29 Jan 2019 07:24:39 +0000 (08:24 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 31 Jan 2019 23:04:50 +0000 (23:04 +0000)
Signed-off-by: Jonas Bonn <jonas@norrbonn.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/glibc/glibc-package.inc

index a98ae1a29c9746b441ea5197ed636e6e09ea7154..329732f48c0bec823386bd5fd873d36c15564e16 100644 (file)
@@ -107,7 +107,9 @@ do_install_append () {
                install -d ${D}${sysconfdir}/tmpfiles.d
                echo "d /run/nscd 755 root root -" \
                        > ${D}${sysconfdir}/tmpfiles.d/nscd.conf
-       else
+       fi
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
                install -d ${D}${sysconfdir}/default/volatiles
                echo "d root root 0755 /var/run/nscd none" \
                        > ${D}${sysconfdir}/default/volatiles/98_nscd