All of lore.kernel.org
 help / color / mirror / Atom feed
* [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined.
@ 2013-12-29 17:00 Romain Naour
  2013-12-29 17:51 ` Gilles Chanteperdrix
  2013-12-29 17:56 ` Gilles Chanteperdrix
  0 siblings, 2 replies; 6+ messages in thread
From: Romain Naour @ 2013-12-29 17:00 UTC (permalink / raw)
  To: xenomai

fixes: http://autobuild.buildroot.org/results/d59/d590be34637a4043c929ce615f9db504484be435/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 src/skins/posix/rtdm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/skins/posix/rtdm.c b/src/skins/posix/rtdm.c
index 5840c64..d6c87dc 100644
--- a/src/skins/posix/rtdm.c
+++ b/src/skins/posix/rtdm.c
@@ -107,8 +107,9 @@ int __wrap_open64(const char *path, int oflag, ...)
 			errno = EMFILE;
 			ret = -1;
 		}
+	}
 #endif
-	} else {
+	else {
 		errno = -ret;
 		ret = -1;
 	}
-- 
1.8.1.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined.
  2013-12-29 17:00 [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined Romain Naour
@ 2013-12-29 17:51 ` Gilles Chanteperdrix
  2013-12-29 17:56 ` Gilles Chanteperdrix
  1 sibling, 0 replies; 6+ messages in thread
From: Gilles Chanteperdrix @ 2013-12-29 17:51 UTC (permalink / raw)
  To: Romain Naour; +Cc: xenomai

On 12/29/2013 06:00 PM, Romain Naour wrote:
> fixes: http://autobuild.buildroot.org/results/d59/d590be34637a4043c929ce615f9db504484be435/build-end.log

Ok, so now buildroot builds without LFS, whereas the fix to support LFS
in xenomai came from a buildroot bug report :-)

Will merge, thanks.


-- 
                                                                Gilles.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined.
  2013-12-29 17:00 [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined Romain Naour
  2013-12-29 17:51 ` Gilles Chanteperdrix
@ 2013-12-29 17:56 ` Gilles Chanteperdrix
  2013-12-29 18:00   ` Romain Naour
  2013-12-29 20:42   ` Romain Naour
  1 sibling, 2 replies; 6+ messages in thread
From: Gilles Chanteperdrix @ 2013-12-29 17:56 UTC (permalink / raw)
  To: Romain Naour; +Cc: xenomai

On 12/29/2013 06:00 PM, Romain Naour wrote:
> fixes: http://autobuild.buildroot.org/results/d59/d590be34637a4043c929ce615f9db504484be435/build-end.log
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  src/skins/posix/rtdm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/skins/posix/rtdm.c b/src/skins/posix/rtdm.c
> index 5840c64..d6c87dc 100644
> --- a/src/skins/posix/rtdm.c
> +++ b/src/skins/posix/rtdm.c
> @@ -107,8 +107,9 @@ int __wrap_open64(const char *path, int oflag, ...)
>  			errno = EMFILE;
>  			ret = -1;
>  		}
> +	}
>  #endif
> -	} else {
> +	else {
>  		errno = -ret;
>  		ret = -1;
>  	}
> 
xenomai-2.6$ git apply ~/foo.eml
/home/gilles/foo.eml:79: trailing whitespace.
        }
/home/gilles/foo.eml:82: trailing whitespace.
        else {
error: patch failed: src/skins/posix/rtdm.c:107
error: src/skins/posix/rtdm.c: patch does not apply

Are you working from xenomai-2.6 git?

-- 
                                                                Gilles.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined.
  2013-12-29 17:56 ` Gilles Chanteperdrix
@ 2013-12-29 18:00   ` Romain Naour
  2013-12-29 20:42   ` Romain Naour
  1 sibling, 0 replies; 6+ messages in thread
From: Romain Naour @ 2013-12-29 18:00 UTC (permalink / raw)
  To: Gilles Chanteperdrix; +Cc: xenomai

Le 29/12/2013 18:56, Gilles Chanteperdrix a écrit :
> On 12/29/2013 06:00 PM, Romain Naour wrote:
>> fixes: http://autobuild.buildroot.org/results/d59/d590be34637a4043c929ce615f9db504484be435/build-end.log
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> ---
>>   src/skins/posix/rtdm.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/skins/posix/rtdm.c b/src/skins/posix/rtdm.c
>> index 5840c64..d6c87dc 100644
>> --- a/src/skins/posix/rtdm.c
>> +++ b/src/skins/posix/rtdm.c
>> @@ -107,8 +107,9 @@ int __wrap_open64(const char *path, int oflag, ...)
>>   			errno = EMFILE;
>>   			ret = -1;
>>   		}
>> +	}
>>   #endif
>> -	} else {
>> +	else {
>>   		errno = -ret;
>>   		ret = -1;
>>   	}
>>
> xenomai-2.6$ git apply ~/foo.eml
> /home/gilles/foo.eml:79: trailing whitespace.
>          }
> /home/gilles/foo.eml:82: trailing whitespace.
>          else {
> error: patch failed: src/skins/posix/rtdm.c:107
> error: src/skins/posix/rtdm.c: patch does not apply
>
> Are you working from xenomai-2.6 git?
>
yes from xenomai-2.6 git current master, and I used git send-email to 
send the patch.

Romain


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined.
  2013-12-29 17:56 ` Gilles Chanteperdrix
  2013-12-29 18:00   ` Romain Naour
@ 2013-12-29 20:42   ` Romain Naour
  2013-12-29 20:51     ` Gilles Chanteperdrix
  1 sibling, 1 reply; 6+ messages in thread
From: Romain Naour @ 2013-12-29 20:42 UTC (permalink / raw)
  To: Gilles Chanteperdrix; +Cc: xenomai

Le 29/12/2013 18:56, Gilles Chanteperdrix a écrit :
> On 12/29/2013 06:00 PM, Romain Naour wrote:
>> fixes: http://autobuild.buildroot.org/results/d59/d590be34637a4043c929ce615f9db504484be435/build-end.log
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> ---
>>   src/skins/posix/rtdm.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/skins/posix/rtdm.c b/src/skins/posix/rtdm.c
>> index 5840c64..d6c87dc 100644
>> --- a/src/skins/posix/rtdm.c
>> +++ b/src/skins/posix/rtdm.c
>> @@ -107,8 +107,9 @@ int __wrap_open64(const char *path, int oflag, ...)
>>   			errno = EMFILE;
>>   			ret = -1;
>>   		}
>> +	}
>>   #endif
>> -	} else {
>> +	else {
>>   		errno = -ret;
>>   		ret = -1;
>>   	}
>>
> xenomai-2.6$ git apply ~/foo.eml
> /home/gilles/foo.eml:79: trailing whitespace.
>          }
> /home/gilles/foo.eml:82: trailing whitespace.
>          else {
> error: patch failed: src/skins/posix/rtdm.c:107
> error: src/skins/posix/rtdm.c: patch does not apply
>
> Are you working from xenomai-2.6 git?
>
I have no error while I do:
git diff --check HEAD HEAD~1

But I'm able to reproduce this error when I save the email to foo.eml 
with Thunderbird...

Have you whitespace errors with my previous patch too ?

Best regards,
Romain Naour


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined.
  2013-12-29 20:42   ` Romain Naour
@ 2013-12-29 20:51     ` Gilles Chanteperdrix
  0 siblings, 0 replies; 6+ messages in thread
From: Gilles Chanteperdrix @ 2013-12-29 20:51 UTC (permalink / raw)
  To: Romain Naour; +Cc: xenomai

On 12/29/2013 09:42 PM, Romain Naour wrote:
> Le 29/12/2013 18:56, Gilles Chanteperdrix a écrit :
>> On 12/29/2013 06:00 PM, Romain Naour wrote:
>>> fixes: http://autobuild.buildroot.org/results/d59/d590be34637a4043c929ce615f9db504484be435/build-end.log
>>>
>>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>>> ---
>>>   src/skins/posix/rtdm.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/src/skins/posix/rtdm.c b/src/skins/posix/rtdm.c
>>> index 5840c64..d6c87dc 100644
>>> --- a/src/skins/posix/rtdm.c
>>> +++ b/src/skins/posix/rtdm.c
>>> @@ -107,8 +107,9 @@ int __wrap_open64(const char *path, int oflag, ...)
>>>   			errno = EMFILE;
>>>   			ret = -1;
>>>   		}
>>> +	}
>>>   #endif
>>> -	} else {
>>> +	else {
>>>   		errno = -ret;
>>>   		ret = -1;
>>>   	}
>>>
>> xenomai-2.6$ git apply ~/foo.eml
>> /home/gilles/foo.eml:79: trailing whitespace.
>>          }
>> /home/gilles/foo.eml:82: trailing whitespace.
>>          else {
>> error: patch failed: src/skins/posix/rtdm.c:107
>> error: src/skins/posix/rtdm.c: patch does not apply
>>
>> Are you working from xenomai-2.6 git?
>>
> I have no error while I do:
> git diff --check HEAD HEAD~1
> 
> But I'm able to reproduce this error when I save the email to foo.eml 
> with Thunderbird...
> 
> Have you whitespace errors with my previous patch too ?

git am accepts the patch, it seems git apply does not because of
whitespace issues. I believe you did not introduce the whitespace
issues, they were there before.

> 
> Best regards,
> Romain Naour
> 


-- 
                                                                Gilles.


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-12-29 20:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-29 17:00 [Xenomai] [PATCH 1/1] posix: fix build failure when HAVE_OPEN64 is undefined Romain Naour
2013-12-29 17:51 ` Gilles Chanteperdrix
2013-12-29 17:56 ` Gilles Chanteperdrix
2013-12-29 18:00   ` Romain Naour
2013-12-29 20:42   ` Romain Naour
2013-12-29 20:51     ` Gilles Chanteperdrix

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.