Patchwork eglibc: fix directory cleanup for 2.17

login
register
mail settings
Submitter Riku Voipio
Date Aug. 26, 2013, 9:51 a.m.
Message ID <1377510661-14290-1-git-send-email-riku.voipio@linaro.org>
Download mbox | patch
Permalink /patch/56615/
State Accepted
Commit 10722a37bb7efa563425a7389100b9322d96492e
Headers show

Comments

Riku Voipio - Aug. 26, 2013, 9:51 a.m.
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@gmail.com>
---
 meta/recipes-core/eglibc/eglibc-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Khem Raj - Aug. 26, 2013, 5:32 p.m.
On Aug 26, 2013, at 2:51 AM, Riku Voipio <riku.voipio@linaro.org> wrote:

> 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@gmail.com>
> ---
> meta/recipes-core/eglibc/eglibc-package.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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


I think its better to use  --ignore-fail-on-non-empty option to rmdir

> 		rmdir ${D}${libdir}/eglibc
> 	fi
> 	oe_multilib_header bits/syscall.h
> -- 
> 1.8.3.1
>
Khem Raj - Aug. 26, 2013, 9:18 p.m.
On Aug 26, 2013, at 10:32 AM, Khem Raj <raj.khem@gmail.com> wrote:

> 
> On Aug 26, 2013, at 2:51 AM, Riku Voipio <riku.voipio@linaro.org> wrote:
> 
>> 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@gmail.com>
>> ---
>> meta/recipes-core/eglibc/eglibc-package.inc | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> 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
> 
> 
> I think its better to use  --ignore-fail-on-non-empty option to rmdir

oh well just realized that this patch was committed as it is so you can ignore this suggestion.

Patch

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