On Fri, Nov 5, 2021 at 1:32 PM Khem Raj <[email protected]> wrote:
>
>
>
> On 11/5/21 10:19 AM, Bruce Ashfield wrote:
> > From: Bruce Ashfield <[email protected]>
> >
> > The 5.15 kernel has removed ipx support, along with the userspace
> > visible header.
> >
> > The build error was found for muslc, since it doesn't have a
> > fallback header, we disable it for both glibc/muslc.
> >
> > This support wasn't used previously (as it hasn't been very well
> > maintained in the kernel for several years), so we can simply
> > disable it in our build and wait for upstream to do a release that
> > drops the support.
> >
> > Although the tarball we use for our build (versus git), doesn't
> > use the autoconf disable flag to turn off the support, it is included
> > in this patch in case someone is building via git source base.
> >
> > Upstream-Status: Inappropriate [OE-specific configuration/headers]
> >
> > Signed-off-by: Bruce Ashfield <[email protected]>
> > ---
> > ...1-ppp-fix-build-against-5.15-headers.patch | 36 +++++++++++++++++++
> > meta/recipes-connectivity/ppp/ppp_2.4.9.bb | 3 ++
> > 2 files changed, 39 insertions(+)
> > create mode 100644
> > meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch
> >
> > diff --git
> > a/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch
> >
> > b/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch
> > new file mode 100644
> > index 0000000000..c91246dbf5
> > --- /dev/null
> > +++
> > b/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch
> > @@ -0,0 +1,36 @@
> > +From aba3273273e826c6dc90f197ca9a3e800e826891 Mon Sep 17 00:00:00 2001
> > +From: Bruce Ashfield <[email protected]>
> > +Date: Fri, 5 Nov 2021 12:41:35 -0400
> > +Subject: [PATCH] ppp: fix build against 5.15 headers
> > +
> > +The 5.15 kernel has removed ipx support, along with the userspace
> > +visible header.
> > +
> > +This support wasn't used previously (as it hasn't been very well
> > +maintained in the kernel for several years), so we can simply
> > +disable it in our build and wait for upstream to do a release that
> > +drops the support.
> > +
> > +Upstream-Status: Inappropriate [OE-specific configuration/headers]
> > +
> > +Signed-off-by: Bruce Ashfield <[email protected]>
> > +---
> > + pppd/Makefile.linux | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
> > +index 22837c5..23b9b22 100644
> > +--- a/pppd/Makefile.linux
> > ++++ b/pppd/Makefile.linux
> > +@@ -91,7 +91,7 @@ MAXOCTETS=y
> > +
> > + INCLUDE_DIRS= -I../include
> > +
> > +-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -pipe
> > ++COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP -pipe
> > +
> > + CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
> > +
> > +--
> > +2.25.1
> > +
> > diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
> > b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
> > index 235595ff76..bd6435e69c 100644
> > --- a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
> > +++ b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
> > @@ -24,6 +24,7 @@ SRC_URI =
> > "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
> > file://ppp_on_boot \
> > file://provider \
> > file://[email protected] \
> > + file://0001-ppp-fix-build-against-5.15-headers.patch \
> > "
> >
> > SRC_URI[sha256sum] =
> > "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d"
> > @@ -39,6 +40,8 @@ EXTRA_OECONF = "--disable-strip"
> > #
> > EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl
> > -I${S}/include"'
> >
> > +EXTRA_OECONF:append:libc-musl = " --disable-ipxcp"
>
> does this have to be musl specific ? given that kernel is dropping ipx
> support I think this should be disabled unconditionally isnt it ?
I covered that in my commit message :)
Bruce
>
> > +
> > do_configure () {
> > oe_runconf
> > }
> >
> >
> >
> >
> >
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157918):
https://lists.openembedded.org/g/openembedded-core/message/157918
Mute This Topic: https://lists.openembedded.org/mt/86846153/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
