From: Jonas Bonn Date: Tue, 29 Jan 2019 07:24:39 +0000 (+0100) Subject: glibc: systemd and sysvinit are not mutually exclusive X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=635fbf88e2572183b1eedc6ac9bf2422a4d79e1c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git glibc: systemd and sysvinit are not mutually exclusive (From OE-Core rev: 0990d77d99a9ba81e21961f9633df10ccef4b1a4) Signed-off-by: Jonas Bonn Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index a98ae1a29c9..329732f48c0 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -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