summaryrefslogtreecommitdiffstats
path: root/meta
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:41:41 +0100
commit3bbbe25ae74e120f7d3452685f0cae2245d7b14d (patch)
tree4bb6c4818395b3b38b69dba813c90a07ed041a0d /meta
parent652e3ccd534ae5fa01e2318c39d4188059e55db0 (diff)
downloadpoky-3bbbe25ae74e120f7d3452685f0cae2245d7b14d.tar.gz
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>
Diffstat (limited to 'meta')
-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 () {
207 rm -rf ${D}/${localedir} 207 rm -rf ${D}/${localedir}
208 rm -rf ${D}${datadir}/locale 208 rm -rf ${D}${datadir}/locale
209 if [ "${libdir}" != "${exec_prefix}/lib" ]; then 209 if [ "${libdir}" != "${exec_prefix}/lib" ]; then
210 if [ -d ${D}${exec_prefix}/lib/locale ] ; then 210 if [ -d ${D}${exec_prefix}/lib ]; then
211 rm -rf ${D}${exec_prefix}/lib/locale
212 # error out if directory isn't empty 211 # error out if directory isn't empty
213 rm -f ${D}${exec_prefix}/lib 212 # this dir should only contain locale dir
213 # which has been deleted in the previous step
214 rmdir ${D}${exec_prefix}/lib
214 fi 215 fi
215 fi 216 fi
216} 217}