[PATCH 0/1] Cleanup non shipped empty directories for gcc-cross-canadian

[PATCH 0/1] Cleanup non shipped empty directories for gcc-cross-canadian

[Lianhao Lu]

This patch improved the previous patch of commit id 04a08bf7 by hanlding the 
non-existent directory situation.

The following changes since commit 644b7503c37fd73730dd3d7841463b158b8934ed:
  Richard Purdie (1):
        guile: Deal with hardcoded path issues

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib llu/warningfix2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/warningfix2

Lianhao Lu (1):
  gcc-cross-canadian: Clean non shipped empty directories.

 meta/recipes-devtools/gcc/gcc-package-sdk.inc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

[PATCH 1/1] gcc-cross-canadian: Clean non shipped empty directories.

[Lianhao Lu]

Cleaning up non shipped empty directories.

Signed-off-by: Lianhao Lu <lianhao.lu@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

Re: [PATCH 0/1] Cleanup non shipped empty directories for gcc-cross-canadian

[Saul Wold]

On 03/26/2012 09:38 PM, Lianhao Lu wrote:
> This patch improved the previous patch of commit id 04a08bf7 by hanlding the
> non-existent directory situation.
>
> The following changes since commit 644b7503c37fd73730dd3d7841463b158b8934ed:
>    Richard Purdie (1):
>          guile: Deal with hardcoded path issues
>
> are available in the git repository at:
>
>    git://git.yoctoproject.org/poky-contrib llu/warningfix2
>    http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/warningfix2
>
> Lianhao Lu (1):
>    gcc-cross-canadian: Clean non shipped empty directories.
>
>   meta/recipes-devtools/gcc/gcc-package-sdk.inc |   10 +++++-----
>   1 files changed, 5 insertions(+), 5 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core

Thanks
	Sau!