summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-11-05 13:19:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-07 15:49:51 +0000
commit824782d6b5021073ac70520df852819fec1ba15d (patch)
treef97955ed08886bc2473cd392d352f45ce8848386 /meta/recipes-connectivity
parented151b32e8f199652a7d8b7e3c0fe00256e64a84 (diff)
downloadpoky-824782d6b5021073ac70520df852819fec1ba15d.tar.gz
ppp: fix build against 5.15 headers
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch36
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.9.bb3
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch b/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch
new file mode 100644
index 0000000000..c91246dbf5
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp/0001-ppp-fix-build-against-5.15-headers.patch
@@ -0,0 +1,36 @@
1From aba3273273e826c6dc90f197ca9a3e800e826891 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Fri, 5 Nov 2021 12:41:35 -0400
4Subject: [PATCH] ppp: fix build against 5.15 headers
5
6The 5.15 kernel has removed ipx support, along with the userspace
7visible header.
8
9This support wasn't used previously (as it hasn't been very well
10maintained in the kernel for several years), so we can simply
11disable it in our build and wait for upstream to do a release that
12drops the support.
13
14Upstream-Status: Inappropriate [OE-specific configuration/headers]
15
16Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
17---
18 pppd/Makefile.linux | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
22index 22837c5..23b9b22 100644
23--- a/pppd/Makefile.linux
24+++ b/pppd/Makefile.linux
25@@ -91,7 +91,7 @@ MAXOCTETS=y
26
27 INCLUDE_DIRS= -I../include
28
29-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -pipe
30+COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP -pipe
31
32 CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
33
34--
352.25.1
36
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
index 235595ff76..bd6435e69c 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
@@ -24,6 +24,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \
24 file://ppp_on_boot \ 24 file://ppp_on_boot \
25 file://provider \ 25 file://provider \
26 file://ppp@.service \ 26 file://ppp@.service \
27 file://0001-ppp-fix-build-against-5.15-headers.patch \
27 " 28 "
28 29
29SRC_URI[sha256sum] = "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d" 30SRC_URI[sha256sum] = "f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d"
@@ -39,6 +40,8 @@ EXTRA_OECONF = "--disable-strip"
39# 40#
40EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"' 41EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"'
41 42
43EXTRA_OECONF:append:libc-musl = " --disable-ipxcp"
44
42do_configure () { 45do_configure () {
43 oe_runconf 46 oe_runconf
44} 47}