Cleaning up non shipped empty directories.

Signed-off-by: Lianhao Lu <lianhao...@intel.com>
---
 meta/recipes-devtools/gcc/gcc-package-sdk.inc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-package-sdk.inc 
b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
index 95d6804..ffe9a9e 100644
--- a/meta/recipes-devtools/gcc/gcc-package-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
@@ -47,11 +47,11 @@ do_install () {
        rm -f ${D}${libdir}/libiberty.a
 
        # Cleanup empty directories which are not shipped
-       # we use rmdir instead of 'rm -f' to ensure the directories are empty
-       rmdir ${D}${libdir}/../lib
-       rmdir ${D}${prefix}/${TARGET_SYS}/lib
-       rmdir ${D}${prefix}/${TARGET_SYS}
-       rmdir ${D}${includedir}
+       # we use rmdir instead of 'rm -f' to ensure the non empty directories 
are not deleted
+       local empty_dirs="${D}${libdir}/../lib ${D}${prefix}/${TARGET_SYS}/lib 
${D}${prefix}/${TARGET_SYS} ${D}${includedir}"
+       for i in $empty_dirs; do
+               [ -d $i ] && rmdir --ignore-fail-on-non-empty $i
+       done
 
        # Insert symlinks into libexec so when tools without a prefix are 
searched for, the correct ones are
        # found.
-- 
1.7.0.4


_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to