[oe-commits] [openembedded-core] 45/45: glibc-package.inc: correct intention for deleting /usr/lib as needed
git at git.openembedded.org
git at git.openembedded.org
Fri Sep 21 15:25:31 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 33f7c71c413923b2e2d5ecc9828010bcc792f157
Author: Awais Belal <awais_belal at mentor.com>
AuthorDate: Tue Sep 18 13:50:59 2018 +0500
glibc-package.inc: correct intention for deleting /usr/lib as needed
In case the baselib is lib64 we would want to delete /usr/lib
after removing the /usr/lib/locale dir and the implementation
wanted to do that earlier as well but the fault was checking
an already removed dir (/usr/lib/locale) before trying to
remove /usr/lib as that check would always fail.
Now we simply try to delete /usr/lib after deleting
/usr/lib/locale to make sure it deletes cleanly and is empty
at the time of deletion.
Signed-off-by: Awais Belal <awais_belal at mentor.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-core/glibc/glibc-package.inc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 9ea41b7..3c75cc5 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -207,11 +207,10 @@ do_poststash_install_cleanup () {
rm -rf ${D}/${localedir}
rm -rf ${D}${datadir}/locale
if [ "${libdir}" != "${exec_prefix}/lib" ]; then
- if [ -d ${D}${exec_prefix}/lib/locale ] ; then
- rm -rf ${D}${exec_prefix}/lib/locale
- # error out if directory isn't empty
- rm -f ${D}${exec_prefix}/lib
- fi
+ # error out if directory isn't empty
+ # this dir should only contain locale dir
+ # which has been deleted in the previous step
+ rmdir ${D}${exec_prefix}/lib
fi
}
addtask do_poststash_install_cleanup after do_stash_locale do_install before do_populate_sysroot do_package
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list