ppp: remove erroneous generated header from the source tree

From: Alexander Kanavin <alex@linutronix.de>

ppp-2.5.2 tarball ships a generated header with various
configuration settigns that takes precedence over the same
header generated into the build directory during the actual build.

This resulted in various linking fails that were worked around
by enabling multilink in 2.5.2 version update. The correct fix
that removes all contamination is to remove the bogus header first.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

On Fri, Mar 14, 2025 at 2:46 AM Alexander Kanavin via
lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
wrote:
>
> From: Alexander Kanavin <alex@linutronix.de>
>
> ppp-2.5.2 tarball ships a generated header with various
> configuration settigns that takes precedence over the same
> header generated into the build directory during the actual build.
>
> This resulted in various linking fails that were worked around
> by enabling multilink in 2.5.2 version update. The correct fix
> that removes all contamination is to remove the bogus header first.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
> index 9ea99cc15a3..fd9223d2d1c 100644
> --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
> +++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
> @@ -29,11 +29,16 @@ SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55
>
>  inherit autotools pkgconfig systemd
>
> -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl multilink"
> +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl"
>  PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam"
>  PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl"
>  PACKAGECONFIG[multilink] = "--enable-multilink,--disable-multilink"
>
> +# https://github.com/ppp-project/ppp/issues/541#issuecomment-2722260363
> +do_configure:prepend () {
> +       rm -rf ${S}/pppd/pppdconf.h
> +}
> +

I wonder if it should be a patch instead, it can be better tracked that way.

>  do_install:append () {
>         mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
>         mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/
> --
> 2.39.5
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#212827): https://lists.openembedded.org/g/openembedded-core/message/212827
> Mute This Topic: https://lists.openembedded.org/mt/111695980/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Good point that. I’ll make a new patch.

Alex

On Fri 14. Mar 2025 at 19.07, Khem Raj <raj.khem@gmail.com> wrote:

> On Fri, Mar 14, 2025 at 2:46 AM Alexander Kanavin via
> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
> wrote:
> >
> > From: Alexander Kanavin <alex@linutronix.de>
> >
> > ppp-2.5.2 tarball ships a generated header with various
> > configuration settigns that takes precedence over the same
> > header generated into the build directory during the actual build.
> >
> > This resulted in various linking fails that were worked around
> > by enabling multilink in 2.5.2 version update. The correct fix
> > that removes all contamination is to remove the bogus header first.
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
> b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
> > index 9ea99cc15a3..fd9223d2d1c 100644
> > --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
> > +++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
> > @@ -29,11 +29,16 @@ SRC_URI[sha256sum] =
> "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55
> >
> >  inherit autotools pkgconfig systemd
> >
> > -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}
> openssl multilink"
> > +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}
> openssl"
> >  PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam"
> >  PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl"
> >  PACKAGECONFIG[multilink] = "--enable-multilink,--disable-multilink"
> >
> > +# https://github.com/ppp-project/ppp/issues/541#issuecomment-2722260363
> > +do_configure:prepend () {
> > +       rm -rf ${S}/pppd/pppdconf.h
> > +}
> > +
>
> I wonder if it should be a patch instead, it can be better tracked that
> way.
>
> >  do_install:append () {
> >         mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
> >         mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/
> > --
> > 2.39.5
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#212827):
> https://lists.openembedded.org/g/openembedded-core/message/212827
> > Mute This Topic: https://lists.openembedded.org/mt/111695980/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>