diff mbox series

ppp: remove erroneous generated header from the source tree

Message ID 20250314094638.1893858-1-alex.kanavin@gmail.com
State New
Headers show
Series ppp: remove erroneous generated header from the source tree | expand

Commit Message

Alexander Kanavin March 14, 2025, 9:46 a.m. UTC 
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 mbox series

Patch

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
+}
+
 do_install:append () {
 	mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
 	mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/