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.

(From OE-Core rev: 4dad1568f8f84ec9de4bf7235822f77a8ee6a413)

Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 9ea41b7b54..a98ae1a29c 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -207,10 +207,11 @@ 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
+                if [ -d ${D}${exec_prefix}/lib ]; then
                         # error out if directory isn't empty
-                        rm -f ${D}${exec_prefix}/lib
+                        # this dir should only contain locale dir
+                        # which has been deleted in the previous step
+                        rmdir ${D}${exec_prefix}/lib
                 fi
         fi
 }