[Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15

[Fabrice Fontaine]

Le lun. 20 déc. 2021 à 23:33, Arnout Vandecappelle <arnout at mind.be> a écrit :
>
>
>
> On 19/12/2021 17:02, Fabrice Fontaine wrote:
> > Fix the following build failure with kernel >= 5.15:
> >
> > sys-linux.c:148:10: fatal error: linux/ipx.h: No such file or directory
> >    148 | #include <linux/ipx.h>
> >        |          ^~~~~~~~~~~~~
> >
> > This hook could be removed as soon as a new pppd version is released:
> > https://github.com/ppp-project/ppp/pull/326
>
>   In that PR, the maintainers say that instead --disable-ipxcp should be used.
> If that doesn't work, please add a comment so they'll actually merge it. Right
> now, it looks like they won't.
We can't use --disable-ipxcp as the latest version does not ship any
configure script.
It has been added recently in master by
https://github.com/ppp-project/ppp/commit/2883dd07101bf851e2ea368f0c04c91aea85cff2
I'm pretty confident that this will get merged, see
https://github.com/ppp-project/ppp/issues/111 or latest comment of
https://github.com/ppp-project/ppp/pull/326
>
> >
> > Fixes:
> >   - http://autobuild.buildroot.org/results/5a7f89e5178735f4d3e3f3360f0feb263f6ac431
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> > ---
> >   package/pppd/pppd.mk | 7 +++++++
> >   1 file changed, 7 insertions(+)
> >
> > diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
> > index 71bfceb607..19b6f3ccce 100644
> > --- a/package/pppd/pppd.mk
> > +++ b/package/pppd/pppd.mk
> > @@ -57,6 +57,13 @@ ifeq ($(BR2_PACKAGE_PPPD_OVERWRITE_RESOLV_CONF),y)
> >   PPPD_POST_EXTRACT_HOOKS += PPPD_SET_RESOLV_CONF
> >   endif
> >
> > +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15),y)
> > +define PPPD_DROP_IPX
> > +     $(SED) 's/-DIPX_CHANGE//' $(PPPD_DIR)/pppd/Makefile.linux
>
>   Even though it's a large patch, I'd prefer to take the PR patch instead of
> sed'ing. Easier to keep track of when updating IMHO.
We can't use the PR as we don't have any configure script to patch.
>
>
>   Regards,
>   Arnout
>
> > +endef
> > +PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_IPX
> > +endif
> > +
> >   define PPPD_CONFIGURE_CMDS
> >       $(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
> >       $(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
> >
Best Regards,

Fabrice