Re: [Minios-devel] [UNIKRAFT/LWIP PATCH 5/8] Don't provide file status flags when we have a libc

[Florian Schmidt <Florian.Schmidt@xxxxxxxxx>]

Hi Felipe,

right, as you said, the problem is with patches that include patch files 
themselves, and in which the newline is foreign to the system. In this 
case, the lwip code uses CRLF, but after pulling this patch from the 
mailing list, all the newlines are LF on a unix system, and the patch 
subsequently fails to apply.
I can't think of a good solution for this right now. Having patch ignore 
newline differences seemed the most straightforward solution, but I 
can't find an option for that. (I tried `-l` with patch, but that 
doesn't help.)
I'm very open to suggestions by whoever has one.

Cheers,
Florian

On 5/27/19 1:57 PM, Felipe Huici wrote:
> Hi Florian,
>
> As discussed, when picking up patches within patches from the mailing list, the 
> "inner" patch fails to apply during build. For the record, this happens (as you 
> pointed out) when the file's line endings are different from those of the local system: 
> when the patch goes out the differences get lost and the patch fails. For the purposes of 
> these series I've worked around this, but in the future we might want to figure out a 
> cleaner solution.
>
> -- Felipe
>
> Reviewed-by: Felipe Huici <felipe.huici@xxxxxxxxx>
>
> ============================================================
> Dr. Felipe Huici
> Chief Researcher, Systems and Machine Learning Group
> NEC Laboratories Europe GmbH
> Kurfuerstenanlage 36, D-69115 Heidelberg
> Tel.  +49
> (0)6221 4342-241
> Fax:  +49
> (0)6221 4342-155
>   
> e-mail:
> felipe.huici@xxxxxxxxx
> ============================================================
> Registered at Amtsgericht Mannheim, Germany, HRB728558
>
> On 20.05.19, 13:30, "Minios-devel on behalf of Florian Schmidt" 
> <minios-devel-bounces@xxxxxxxxxxxxxxxxxxxx on behalf of florian.schmidt@xxxxxxxxx> wrote:
>
>      Instead, trust that they will show up during compilation, just maybe a
>      bit later. Otherwise, we might very well end up with conflicting
>      definitions for the values of these flags.
>      
>      Signed-off-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>
>      ---
>       ...ile-status-flags-when-we-have-a-libc.patch | 46 +++++++++++++++++++
>       1 file changed, 46 insertions(+)
>       create mode 100644 
> patches/0002-Don-t-provide-file-status-flags-when-we-have-a-libc.patch
>      
>      diff --git a/patches/0002-Don-t-provide-file-status-flags-when-we-have-a-libc.patch b/patches/0002-Don-t-provide-file-status-flags-when-we-have-a-libc.patch
>      new file mode 100644
>      index 0000000..34a4238
>      --- /dev/null
>      +++ 
> b/patches/0002-Don-t-provide-file-status-flags-when-we-have-a-libc.patch
>      @@ -0,0 +1,46 @@
>      +From 5bba402a1fe30e6bbad90599ba9373edf3da3ad3 Mon Sep 17 00:00:00 2001
>      +From: Florian Schmidt <florian.schmidt@xxxxxxxxx>
>      +Date: Wed, 17 Apr 2019 15:37:20 +0200
>      +Subject: [PATCH] Don't provide file status flags when we have a libc
>      +
>      +Instead, trust that they will show up during compilation, just maybe a
>      +bit later. Otherwise, we might very well end up with conflicting
>      +definitions for the values of these flags.
>      +
>      +Signed-off-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>
>      +---
>      + src/include/lwip/sockets.h | 4 ++++
>      + 1 file changed, 4 insertions(+)
>      +
>      +diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h
>      +index d70d36c4..72169cd0 100644
>      +--- a/src/include/lwip/sockets.h
>      ++++ b/src/include/lwip/sockets.h
>      +@@ -39,6 +39,8 @@
>      + #ifndef LWIP_HDR_SOCKETS_H
>      + #define LWIP_HDR_SOCKETS_H
>      +
>      ++#include <uk/config.h>
>      ++
>      + #include "lwip/opt.h"
>      +
>      + #if LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
>      +@@ -438,6 +440,7 @@ typedef struct ipv6_mreq {
>      + #define F_SETFL 4
>      + #endif
>      +
>      ++#ifndef CONFIG_HAVE_LIBC
>      + /* File status flags and file access modes for fnctl,
>      +    these are bits in an int. */
>      + #ifndef O_NONBLOCK
>      +@@ -455,6 +458,7 @@ typedef struct ipv6_mreq {
>      + #ifndef O_RDWR
>      + #define O_RDWR      (O_RDONLY|O_WRONLY)
>      + #endif
>      ++#endif /* CONFIG_HAVE_LIBC */
>      +
>      + #ifndef SHUT_RD
>      +   #define SHUT_RD   0
>      +--
>      +2.21.0
>      +
>      --
>      2.21.0
>      
>      
>      _______________________________________________
>      Minios-devel mailing list
>      Minios-devel@xxxxxxxxxxxxxxxxxxxx
>      https://lists.xenproject.org/mailman/listinfo/minios-devel
--
Dr. Florian Schmidt
フローリアン・シュミット
Research Scientist,
Systems and Machine Learning Group
NEC Laboratories Europe
Kurfürsten-Anlage 36, D-69115 Heidelberg
Tel.     +49 (0)6221 4342-265
Fax:     +49 (0)6221 4342-155
e-mail:  florian.schmidt@xxxxxxxxx
============================================================
Registered at Amtsgericht Mannheim, Germany, HRB728558

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel