summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-09-04 15:59:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-06 15:26:21 +0100
commit466eee6699bff1d94db6622565ce2044c106e60c (patch)
tree4c45881809136d02971d4033150ef6f7919b10f1
parent1e9ed16b82ae04839e015c8b4bb91403879875f1 (diff)
downloadpoky-466eee6699bff1d94db6622565ce2044c106e60c.tar.gz
procps: fix for base_sbindir == sbindir
An rmdir call in do_install_append was trying to remove the sbindir, however in a system with a merged usr this directory is not empty and therefore failing to rm it causes an ERROR. Instead check that sbindir != base_sbindir before trying to remove the directory. (From OE-Core rev: 2daab2114a0bee1268ce8f7d973ea81d5a530dfd) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/procps/procps_3.3.10.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-extended/procps/procps_3.3.10.bb b/meta/recipes-extended/procps/procps_3.3.10.bb
index 65d64ec478..dcfaba71f2 100644
--- a/meta/recipes-extended/procps/procps_3.3.10.bb
+++ b/meta/recipes-extended/procps/procps_3.3.10.bb
@@ -31,8 +31,9 @@ do_install_append () {
31 [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done 31 [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done
32 install -d ${D}${base_sbindir} 32 install -d ${D}${base_sbindir}
33 [ "${sbindir}" != "${base_sbindir}" ] && for i in ${base_sbindir_progs}; do mv ${D}${sbindir}/$i ${D}${base_sbindir}/$i; done 33 [ "${sbindir}" != "${base_sbindir}" ] && for i in ${base_sbindir_progs}; do mv ${D}${sbindir}/$i ${D}${base_sbindir}/$i; done
34 # Remove now empty dir 34 if [ "${base_sbindir}" != "${sbindir}" ]; then
35 rmdir ${D}/${sbindir} 35 rmdir ${D}${sbindir}
36 fi
36 37
37 install -d ${D}${sysconfdir} 38 install -d ${D}${sysconfdir}
38 install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf 39 install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf