Gentoo Archives: gentoo-commits

From: WANG Xuerui <xen0n@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/linux-atm/, net-dialup/linux-atm/files/
Date: Sun, 07 Aug 2022 04:24:39
Message-Id: 1659846250.a041e5a65ffbd2004f9201f9bd87bac5419dabb0.xen0n@gentoo
1 commit: a041e5a65ffbd2004f9201f9bd87bac5419dabb0
2 Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 7 04:20:58 2022 +0000
4 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 7 04:24:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a041e5a6
7
8 net-dialup/linux-atm: fix build with linux-headers-5.19
9
10 Closes: https://bugs.gentoo.org/863677
11 Suggested-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12 Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
13
14 .../files/linux-atm-2.5.2-linux-headers-5.19.patch | 24 ++++++++++++++++++++++
15 net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild | 1 +
16 2 files changed, 25 insertions(+)
17
18 diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-headers-5.19.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-headers-5.19.patch
19 new file mode 100644
20 index 000000000000..eeb96f262f2e
21 --- /dev/null
22 +++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-headers-5.19.patch
23 @@ -0,0 +1,24 @@
24 +linux/atm_zatm.h was removed in >=linux-headers-5.19. As the hardware is
25 +said to be unlikely working on modern systems, just disable its utility
26 +program to keep the rest building.
27 +
28 +See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=052e1f01bfae8be6
29 +
30 +--- a/src/maint/Makefile.am
31 ++++ b/src/maint/Makefile.am
32 +@@ -1,5 +1,5 @@
33 + BOOTPGMS=atmaddr esi
34 +-SYSPGMS=atmloop atmtcp enitune zntune hediag # nstune
35 ++SYSPGMS=atmloop atmtcp enitune hediag # nstune zntune
36 + USRPGMS=atmdiag atmdump sonetdiag saaldump
37 +
38 + INCLUDES=-I$(srcdir)/../q2931 -I$(srcdir)/../saal -I.
39 +@@ -14,7 +14,7 @@ esi_SOURCES = esi.c
40 + atmloop_SOURCES = atmloop.c
41 + atmtcp_SOURCES = atmtcp.c
42 + enitune_SOURCES = enitune.c
43 +-zntune_SOURCES = zntune.c
44 ++#zntune_SOURCES = zntune.c
45 + #nstune_SOURCES = nstune.c
46 +
47 + atmdiag_SOURCES = atmdiag.c
48
49 diff --git a/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
50 index 123c75c3009d..e86231713615 100644
51 --- a/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
52 +++ b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
53 @@ -22,6 +22,7 @@ CONFIG_CHECK="~ATM"
54 PATCHES=(
55 "${FILESDIR}"/${P}-headers.patch
56 "${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch
57 + "${FILESDIR}"/${P}-linux-headers-5.19.patch
58 )
59
60 src_prepare() {