From 466eee6699bff1d94db6622565ce2044c106e60c Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 4 Sep 2015 15:59:46 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-extended/procps/procps_3.3.10.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended/procps/procps_3.3.10.bb') 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 -- cgit v1.2.3-54-g00ecf