* [PATCH] eglibc: fix directory cleanup for 2.17
@ 2013-08-26 9:51 Riku Voipio
2013-08-26 17:32 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Riku Voipio @ 2013-08-26 9:51 UTC (permalink / raw)
To: openembedded-core
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
rmdir ${D}${libdir}/eglibc
fi
oe_multilib_header bits/syscall.h
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] eglibc: fix directory cleanup for 2.17
2013-08-26 9:51 [PATCH] eglibc: fix directory cleanup for 2.17 Riku Voipio
@ 2013-08-26 17:32 ` Khem Raj
2013-08-26 21:18 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2013-08-26 17:32 UTC (permalink / raw)
To: Riku Voipio; +Cc: openembedded-core
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] eglibc: fix directory cleanup for 2.17
2013-08-26 17:32 ` Khem Raj
@ 2013-08-26 21:18 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2013-08-26 21:18 UTC (permalink / raw)
To: Riku Voipio; +Cc: openembedded-core
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-26 21:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-26 9:51 [PATCH] eglibc: fix directory cleanup for 2.17 Riku Voipio
2013-08-26 17:32 ` Khem Raj
2013-08-26 21:18 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.