aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-11-09 15:03:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:17:28 +0000
commit897faad73e478cfb4a884ff83180bdba2420e7c4 (patch)
tree8428db4348ed801e87ceee6744f5bfdbd820251a
parentf8385a94ef915c3905c50ab3c774c2dd9d89ba47 (diff)
downloadopenembedded-core-contrib-897faad73e478cfb4a884ff83180bdba2420e7c4.tar.gz
procps: install symlink under /etc/sysctl.d in case of systemd
Install /etc/sysctl.d/99-sysctl.conf symlink in case of systemd so that /etc/sysctl.conf is taken into consideration by systemd-sysctl. (From OE-Core rev: a32869fcbcb5f31741a32fdca14e7f38c2abace6) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-extended/procps/procps_3.2.8.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index 6211a7c955..fcfde194f1 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -28,6 +28,10 @@ EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}" \
do_install_append () {
install -d ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${sysconfdir}/sysctl.d
+ ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf
+ fi
}
CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"