I think you can send a new patch just doing this on top of original patch.
On Thu, Jul 12, 2018 at 12:09 PM Martin Hundebøll <mar...@geanix.com> wrote:
>
> Hi Khem,
>
> On 2018-07-12 14:05, Martin Hundebøll wrote:
> > Remove upstreamed patch to fix musl build, and replace with another
> > (submitted) patch to fix a new musl issue.
> >
> > Signed-off-by: Martin Hundebøll <mar...@geanix.com>
> >
> > ---
> >
> > Changes in v2:
> > - Added patch to fix musl build
> > ---
> >   
> > meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
> >  | 39 +++++++++++++++++++++++++++++++++++++++
> >   meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch      
> >                    | 39 ---------------------------------------
> >   meta-oe/recipes-core/ell/ell_0.4.bb                                       
> >                    | 19 -------------------
> >   meta-oe/recipes-core/ell/ell_0.6.bb                                       
> >                    | 20 ++++++++++++++++++++
> >   4 files changed, 59 insertions(+), 58 deletions(-)
> >   create mode 100644 
> > meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
> >   delete mode 100644 
> > meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch
> >   delete mode 100644 meta-oe/recipes-core/ell/ell_0.4.bb
> >   create mode 100644 meta-oe/recipes-core/ell/ell_0.6.bb
> >
> > diff --git 
> > a/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
> >  
> > b/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
> > new file mode 100644
> > index 0000000..df3c055
> > --- /dev/null
> > +++ 
> > b/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch
> > @@ -0,0 +1,39 @@
> > +From d8236d1d789f496a193dae5d2a15d706b81f6482 Mon Sep 17 00:00:00 2001
> > +From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <mar...@geanix.com>
> > +Date: Thu, 12 Jul 2018 10:19:50 +0200
> > +Subject: [PATCH] dhcp: include if_arp.h from libc instead of linux headers
> > +MIME-Version: 1.0
> > +Content-Type: text/plain; charset=UTF-8
> > +Content-Transfer-Encoding: 8bit
> > +To: e...@lists.01.org
> > +
> > +Compilation with musl libc fails due to redefinition of 'struct
> > +arp{req,req_old,hdr}' in linux/if_arp.h, since it is already defined and
> > +included in net/if_arp.h (through net/ethernet.h -> net/if_ether.h).
> > +
> > +The only symbols used from if_arp.h is ARPHRD_ETHER, so it should be
> > +safe to avoid the compile error by including the if_arp.h header from
> > +the c-library instead.
> > +
> > +Upstream-Status: Submitted 
> > [https://lists.01.org/pipermail/ell/2018-July/001242.html]
>
> The upstream status is now:
> Upstream-Status: Backport
> [https://lists.01.org/pipermail/ell/2018-July/001244.html]
>
> Change it locally if you like. Otherwise I'll send a quick patch when
> this one hits master.
>
> // Martin
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Reply via email to