[oe-commits] Riku Voipio : eglibc: fix directory cleanup for 2.17

git at git.openembedded.org git at git.openembedded.org
Mon Aug 26 13:08:09 UTC 2013


Module: openembedded-core.git
Branch: master-next
Commit: 10722a37bb7efa563425a7389100b9322d96492e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=10722a37bb7efa563425a7389100b9322d96492e

Author: Riku Voipio <riku.voipio at linaro.org>
Date:   Mon Aug 26 12:51:01 2013 +0300

eglibc: fix directory cleanup for 2.17

Commit e0c2dd275827a4b37b8116d0f0119333638461af broke building
eglibc 2.17, which still ships pt_chown under eglibc/ directory.

Fix by only deleting directory when pt_chown is not there.

Cc: Khem Raj <raj.khem at gmail.com>

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/eglibc/eglibc-package.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index c36d16c..3adf1a9 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -75,7 +75,7 @@ do_install_append () {
 	rm -rf ${D}${localstatedir}
 
 	# remove empty eglibc dir
-	if [ -d ${D}${libdir}/eglibc ]; then
+	if [ -d ${D}${libdir}/eglibc -a ! -e ${D}${libdir}/eglibc/pt_chown ]; then
 		rmdir ${D}${libdir}/eglibc
 	fi
 	oe_multilib_header bits/syscall.h



More information about the Openembedded-commits mailing list