mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

ppp: fix build against 5.15 headers

Browse Source 
The 5.15 kernel has removed ipx support, along with the userspace
visible header.

The build error was found for muslc, since it doesn't have a
fallback header, we disable it for both glibc/muslc.

This support wasn't used previously (as it hasn't been very well
maintained in the kernel for several years), so we can simply
disable it in our build and wait for upstream to do a release that
drops the support.

Although the tarball we use for our build (versus git), doesn't
use the autoconf disable flag to turn off the support, it is included
in this patch in case someone is building via git source base.

Upstream-Status: Inappropriate [OE-specific configuration/headers]

(From OE-Core rev: 2d61b061f52cc8dbed82e2d9547e8b52d3ec9e34)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2021-11-05 13:19:54 -04:00
committed by Richard Purdie
parent ed151b32e8
commit 824782d6b5
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch
+36
View File
@@ -0,0 +1,36 @@
From aba3273273e826c6dc90f197ca9a3e800e826891 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Fri, 5 Nov 2021 12:41:35 -0400
Subject: [PATCH] ppp: fix build against 5.15 headers
The 5.15 kernel has removed ipx support, along with the userspace
visible header.
This support wasn't used previously (as it hasn't been very well
maintained in the kernel for several years), so we can simply
disable it in our build and wait for upstream to do a release that
drops the support.
Upstream-Status: Inappropriate [OE-specific configuration/headers]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
pppd/Makefile.linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 22837c5..23b9b22 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -91,7 +91,7 @@ MAXOCTETS=y
INCLUDE_DIRS= -I../include
-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -pipe
+COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP -pipe
CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
--
2.25.1
meta/recipes-connectivity/ppp/ppp_2.4.9.bb
+3
View File
@@ -24,6 +24,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
file://ppp_on_boot \
file://provider \
file://ppp@.service \
file://0001-ppp-fix-build-against-5.15-headers.patch \
"
SRC_URI[sha256sum] = "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d"
@@ -39,6 +40,8 @@ EXTRA_OECONF = "--disable-strip"
#
EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"'
EXTRA_OECONF:append:libc-musl = " --disable-ipxcp"
do_configure () {
oe_runconf
}