Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H
@ 2023-09-24 16:29 Fabrice Fontaine
  2023-09-24 18:23 ` Yann E. MORIN
  2023-09-27 11:45 ` Peter Korsgaard
  0 siblings, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2023-09-24 16:29 UTC (permalink / raw)
  To: buildroot; +Cc: Bernd Kuhls, Fabrice Fontaine

PPPD_DROP_INTERNAL_IF_PPOL2TP_H is not needed since bump to version
2.4.6 in commit 49b239ab20e632792a6c61173ba830cdc2128ebf and
https://github.com/ppp-project/ppp/commit/c41092dd4c49267f232f6cba3d31c6c68bfdf68d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/pppd/pppd.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index d9d6244f10..25d017a84f 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -37,15 +37,6 @@ PPPD_DEPENDENCIES += libpcap
 PPPD_MAKE_OPTS += FILTER=y
 endif
 
-# pppd bundles some but not all of the needed kernel headers. The embedded
-# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34,
-# and has been part of the kernel headers since 2.6.23, so drop it
-define PPPD_DROP_INTERNAL_IF_PPOL2TP_H
-	$(RM) $(@D)/include/linux/if_pppol2tp.h
-endef
-
-PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H
-
 # pppd defaults to /etc/ppp/resolv.conf, which not be writable and is
 # definitely not useful since the C library only uses
 # /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf
-- 
2.40.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H
       [not found] <20230924162909.1019467-1-fontaine.fabrice__40740.243210324$1695572981$gmane$org@gmail.com>
@ 2023-09-24 17:20 ` Bernd Kuhls
  2023-09-24 18:19   ` Yann E. MORIN
  0 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2023-09-24 17:20 UTC (permalink / raw)
  To: buildroot

Am Sun, 24 Sep 2023 18:29:09 +0200 schrieb Fabrice Fontaine:

> PPPD_DROP_INTERNAL_IF_PPOL2TP_H is not needed since bump to version
> 2.4.6 in commit 49b239ab20e632792a6c61173ba830cdc2128ebf and
> https://github.com/ppp-project/ppp/commit/
c41092dd4c49267f232f6cba3d31c6c68bfdf68d

Hi Fabrice,

your patch is part of my patch bumping pppd to 2.5.0:
https://patchwork.ozlabs.org/project/buildroot/patch/
20230726060041.4434-1-bernd@kuhls.net/

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H
  2023-09-24 17:20 ` Bernd Kuhls
@ 2023-09-24 18:19   ` Yann E. MORIN
  0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2023-09-24 18:19 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot

Bernd, All,

On 2023-09-24 19:20 +0200, Bernd Kuhls spake thusly:
> Am Sun, 24 Sep 2023 18:29:09 +0200 schrieb Fabrice Fontaine:
> 
> > PPPD_DROP_INTERNAL_IF_PPOL2TP_H is not needed since bump to version
> > 2.4.6 in commit 49b239ab20e632792a6c61173ba830cdc2128ebf and
> > https://github.com/ppp-project/ppp/commit/
> c41092dd4c49267f232f6cba3d31c6c68bfdf68d
> 
> Hi Fabrice,
> 
> your patch is part of my patch bumping pppd to 2.5.0:
> https://patchwork.ozlabs.org/project/buildroot/patch/
> 20230726060041.4434-1-bernd@kuhls.net/

But the hooks is already not needed for 2.4.9, so it is not related to
the bump from 2.4.9 to 2.5.0, so we want it as a separate change
(because it can then be backported if needed).

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H
  2023-09-24 16:29 [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H Fabrice Fontaine
@ 2023-09-24 18:23 ` Yann E. MORIN
  2023-09-27 11:45 ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2023-09-24 18:23 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

Fabrice, All,

On 2023-09-24 18:29 +0200, Fabrice Fontaine spake thusly:
> PPPD_DROP_INTERNAL_IF_PPOL2TP_H is not needed since bump to version
> 2.4.6 in commit 49b239ab20e632792a6c61173ba830cdc2128ebf and
> https://github.com/ppp-project/ppp/commit/c41092dd4c49267f232f6cba3d31c6c68bfdf68d
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/pppd/pppd.mk | 9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
> index d9d6244f10..25d017a84f 100644
> --- a/package/pppd/pppd.mk
> +++ b/package/pppd/pppd.mk
> @@ -37,15 +37,6 @@ PPPD_DEPENDENCIES += libpcap
>  PPPD_MAKE_OPTS += FILTER=y
>  endif
>  
> -# pppd bundles some but not all of the needed kernel headers. The embedded
> -# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34,
> -# and has been part of the kernel headers since 2.6.23, so drop it
> -define PPPD_DROP_INTERNAL_IF_PPOL2TP_H
> -	$(RM) $(@D)/include/linux/if_pppol2tp.h
> -endef
> -
> -PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H
> -
>  # pppd defaults to /etc/ppp/resolv.conf, which not be writable and is
>  # definitely not useful since the C library only uses
>  # /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf
> -- 
> 2.40.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H
  2023-09-24 16:29 [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H Fabrice Fontaine
  2023-09-24 18:23 ` Yann E. MORIN
@ 2023-09-27 11:45 ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2023-09-27 11:45 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > PPPD_DROP_INTERNAL_IF_PPOL2TP_H is not needed since bump to version
 > 2.4.6 in commit 49b239ab20e632792a6c61173ba830cdc2128ebf and
 > https://github.com/ppp-project/ppp/commit/c41092dd4c49267f232f6cba3d31c6c68bfdf68d

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2023.02.x and 2023.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-09-27 11:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-24 16:29 [Buildroot] [PATCH 1/1] package/pppd: drop PPPD_DROP_INTERNAL_IF_PPOL2TP_H Fabrice Fontaine
2023-09-24 18:23 ` Yann E. MORIN
2023-09-27 11:45 ` Peter Korsgaard
     [not found] <20230924162909.1019467-1-fontaine.fabrice__40740.243210324$1695572981$gmane$org@gmail.com>
2023-09-24 17:20 ` Bernd Kuhls
2023-09-24 18:19   ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox