[oe-commits] Joshua Lock : procps: fix for base_sbindir == sbindir
git at git.openembedded.org
git at git.openembedded.org
Sun Sep 6 14:27:14 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 2daab2114a0bee1268ce8f7d973ea81d5a530dfd
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2daab2114a0bee1268ce8f7d973ea81d5a530dfd
Author: Joshua Lock <joshua.lock at collabora.co.uk>
Date: Fri Sep 4 15:59:46 2015 +0100
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 at collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-extended/procps/procps_3.3.10.bb | 5 +++--
1 file 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 65d64ec..dcfaba7 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
More information about the Openembedded-commits
mailing list