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:24:20 +0100
commit2daab2114a0bee1268ce8f7d973ea81d5a530dfd (patch)
tree29d49eb92a197c08a6a7711c159023ce111f3bad
parentda8269ed0fd609699b23c2e3e6c61bc54f7b2832 (diff)
downloadopenembedded-core-contrib-2daab2114a0bee1268ce8f7d973ea81d5a530dfd.tar.gz
openembedded-core-contrib-2daab2114a0bee1268ce8f7d973ea81d5a530dfd.tar.bz2
openembedded-core-contrib-2daab2114a0bee1268ce8f7d973ea81d5a530dfd.zip
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. 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 () {
[ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done
install -d ${D}${base_sbindir}
[ "${sbindir}" != "${base_sbindir}" ] && for i in ${base_sbindir_progs}; do mv ${D}${sbindir}/$i ${D}${base_sbindir}/$i; done
- # Remove now empty dir
- rmdir ${D}/${sbindir}
+ if [ "${base_sbindir}" != "${sbindir}" ]; then
+ rmdir ${D}${sbindir}
+ fi
install -d ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf