* [Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15
@ 2021-12-19 16:02 Fabrice Fontaine
2021-12-20 22:33 ` Arnout Vandecappelle
2021-12-23 17:48 ` Thomas Petazzoni
0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-12-19 16:02 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
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
Fixes:
- http://autobuild.buildroot.org/results/5a7f89e5178735f4d3e3f3360f0feb263f6ac431
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@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
+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
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15
2021-12-19 16:02 [Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15 Fabrice Fontaine
@ 2021-12-20 22:33 ` Arnout Vandecappelle
2021-12-20 22:38 ` Fabrice Fontaine
2021-12-23 17:48 ` Thomas Petazzoni
1 sibling, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-12-20 22:33 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
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.
>
> Fixes:
> - http://autobuild.buildroot.org/results/5a7f89e5178735f4d3e3f3360f0feb263f6ac431
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@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.
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
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15
2021-12-20 22:33 ` Arnout Vandecappelle
@ 2021-12-20 22:38 ` Fabrice Fontaine
0 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-12-20 22:38 UTC (permalink / raw)
To: Arnout Vandecappelle; +Cc: Buildroot Mailing List
Le lun. 20 déc. 2021 à 23:33, Arnout Vandecappelle <arnout@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@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
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15
2021-12-19 16:02 [Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15 Fabrice Fontaine
2021-12-20 22:33 ` Arnout Vandecappelle
@ 2021-12-23 17:48 ` Thomas Petazzoni
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2021-12-23 17:48 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
On Sun, 19 Dec 2021 17:02:34 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> 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
>
> Fixes:
> - http://autobuild.buildroot.org/results/5a7f89e5178735f4d3e3f3360f0feb263f6ac431
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/pppd/pppd.mk | 7 +++++++
> 1 file changed, 7 insertions(+)
Applied to master, thanks (after seeing the feedback from Fabrice to
Arnout questions/comments).
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-23 17:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-19 16:02 [Buildroot] [PATCH 1/1] package/pppd: fix build with kernel >= 5.15 Fabrice Fontaine
2021-12-20 22:33 ` Arnout Vandecappelle
2021-12-20 22:38 ` Fabrice Fontaine
2021-12-23 17:48 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox