summaryrefslogtreecommitdiffstats
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:18:48 +0000
commit7fe785d6928649da330d65d9838ab092e0c82ac3 (patch)
tree329080fbe900c8585d9c209a5024ed5e6398e24c
parentb3e9e56756b5b9b68e59711d4136d8e15f5e3ab4 (diff)
downloadpoky-7fe785d6928649da330d65d9838ab092e0c82ac3.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) (From OE-Core rev: 897faad73e478cfb4a884ff83180bdba2420e7c4) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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}" \
28do_install_append () { 28do_install_append () {
29 install -d ${D}${sysconfdir} 29 install -d ${D}${sysconfdir}
30 install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf 30 install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
31 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
32 install -d ${D}${sysconfdir}/sysctl.d
33 ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf
34 fi
31} 35}
32 36
33CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" 37CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"