summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2018-09-27 19:41:43 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-27 23:39:28 +0100
commit4dad1568f8f84ec9de4bf7235822f77a8ee6a413 (patch)
tree9a0d611611b4582e64aea8561c1b3c73a3803580
parent9602c03e8701c972f544001415efa92877622f57 (diff)
downloadopenembedded-core-contrib-4dad1568f8f84ec9de4bf7235822f77a8ee6a413.tar.gz
openembedded-core-contrib-4dad1568f8f84ec9de4bf7235822f77a8ee6a413.tar.bz2
openembedded-core-contrib-4dad1568f8f84ec9de4bf7235822f77a8ee6a413.zip
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@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc7
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
}