ppp: remove erroneous generated header from the source tree
PATCH 1/1 ppp: remove erroneous generated header from the source tree
From: Alexander Kanavin <[email protected]>
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.
--- meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-connectivity/ppp/ppp_2.5.2.bb +6 -1
@@ -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/
Signature · 1 line
2.39.5
Quoted 25 lines · Alexander Kanavin via lists.openembedded.org
From: Alexander Kanavin <[email protected]>
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 <[email protected]>--- meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)meta/recipes-connectivity/ppp/ppp_2.5.2.bb +0
-1@@ -29,11 +29,16 @@ SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55 inherit autotools pkgconfig systemd -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl multilink"
meta/recipes-connectivity/ppp/ppp_2.5.2.bb SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55 · line 41
Quoted 10 lines
meta/recipes-connectivity/ppp/ppp_2.5.2.bb +6
-0+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.
Quoted 15 lines
meta/recipes-connectivity/ppp/ppp_2.5.2.bb +0
-1do_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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Good point that. I’ll make a new patch.
Alex
Quoted 64 lines · Khem Raj
Quoted 11 lines · Alexander Kanavin via lists.openembedded.org
From: Alexander Kanavin <[email protected]>
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.
Review
Quoted 6 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)(quoted diff) +0
-0b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb
meta/recipes-connectivity/ppp/ppp_2.5.2.bb SRC_URI[sha256sum] =
Quoted 4 lines
index
9ea99cc15a3..fd9223d2d1c100644meta/recipes-connectivity/ppp/ppp_2.5.2.bb +0
-0@@ -29,11 +29,16 @@ SRC_URI[sha256sum] ="
47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55meta/recipes-connectivity/ppp/ppp_2.5.2.bb SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55
Quoted 4 lines
meta/recipes-connectivity/ppp/ppp_2.5.2.bb +0
-1inherit autotools pkgconfig systemd -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}openssl multilink"
meta/recipes-connectivity/ppp/ppp_2.5.2.bb SRC_URI[sha256sum] = · line 31
Quoted 1 line
meta/recipes-connectivity/ppp/ppp_2.5.2.bb +1
-0+PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}openssl"
meta/recipes-connectivity/ppp/ppp_2.5.2.bb SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55 · line 41
Quoted 9 lines
meta/recipes-connectivity/ppp/ppp_2.5.2.bb +5
-0PACKAGECONFIG[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.
Quoted 10 lines
meta/recipes-connectivity/ppp/ppp_2.5.2.bb +0
-1do_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
Quoted 3 lines
Mute This Topic: https://lists.openembedded.org/mt/111695980/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Quoted 2 lines
-=-=-=-=-=-=-=-=-=-=-=-