[OE-core] [PATCH] glibc-package.inc: correct intention for deleting /usr/lib as needed

[Belal, Awais]

ping!


BR,
Awais
________________________________
From: openembedded-core-bounces at lists.openembedded.org <openembedded-core-bounces at lists.openembedded.org> on behalf of Belal, Awais
Sent: Tuesday, September 18, 2018 3:36 PM
To: openembedded-core at lists.openembedded.org
Subject: [OE-core] [PATCH] 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>
---
 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..22a59d2 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
--
2.7.4

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180920/a9c49347/attachment-0002.html>