1 |
commit: 6d1f4088f1bfa1c60b9ec54663a352c89d088177 |
2 |
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> |
3 |
AuthorDate: Fri Jun 10 07:18:26 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 30 21:46:42 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1f4088 |
7 |
|
8 |
net-misc/dahdi: 3.1.0-r4 |
9 |
|
10 |
This fixes a few reported bugs, and re-introduces some drivers that was |
11 |
dropped from upstream, which someone mentioned to me could still be |
12 |
useful, but I can't recall whom nor can I find references as to where, |
13 |
but seeing when I pushed -r3 this was plainly in the pipeline I pushed |
14 |
forward on that. |
15 |
|
16 |
Closes: https://bugs.gentoo.org/832587 |
17 |
Bug: https://bugs.gentoo.org/834640 |
18 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
19 |
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> |
20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
21 |
|
22 |
net-misc/dahdi/Manifest | 2 + |
23 |
net-misc/dahdi/dahdi-3.1.0-r4.ebuild | 120 +++++++++++++++++++++++++++++++++++ |
24 |
2 files changed, 122 insertions(+) |
25 |
|
26 |
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest |
27 |
index 69792b91e8f9..716cde8c9cc2 100644 |
28 |
--- a/net-misc/dahdi/Manifest |
29 |
+++ b/net-misc/dahdi/Manifest |
30 |
@@ -16,5 +16,7 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43 |
31 |
DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3 |
32 |
DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 |
33 |
DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 |
34 |
+DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157 |
35 |
DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de |
36 |
+DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762 |
37 |
DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 |
38 |
|
39 |
diff --git a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild |
40 |
new file mode 100644 |
41 |
index 000000000000..05ae21da55a6 |
42 |
--- /dev/null |
43 |
+++ b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild |
44 |
@@ -0,0 +1,120 @@ |
45 |
+# Copyright 1999-2022 Gentoo Authors |
46 |
+# Distributed under the terms of the GNU General Public License v2 |
47 |
+ |
48 |
+EAPI=7 |
49 |
+ |
50 |
+inherit flag-o-matic linux-mod toolchain-funcs |
51 |
+ |
52 |
+MY_P="${P/dahdi/dahdi-linux}" |
53 |
+JNET=1.0.14 |
54 |
+GENTOO_PATCHVERSION=3.1.0-r4 |
55 |
+GENTOO_SOURCEVERSION=3.1.0-r4 |
56 |
+S="${WORKDIR}/${MY_P}" |
57 |
+ |
58 |
+JNET_DRIVERS="cwain qozap ztgsm" |
59 |
+ |
60 |
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" |
61 |
+HOMEPAGE="https://www.asterisk.org" |
62 |
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz |
63 |
+ https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz |
64 |
+ https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2 |
65 |
+ https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2 |
66 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz |
67 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz |
68 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz |
69 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz |
70 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz |
71 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz |
72 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz |
73 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz |
74 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz |
75 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz |
76 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz |
77 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz |
78 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz |
79 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz |
80 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz |
81 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz |
82 |
+ https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz |
83 |
+" |
84 |
+ |
85 |
+LICENSE="LGPL-2.1" |
86 |
+SLOT="0" |
87 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
88 |
+IUSE="flash oslec" |
89 |
+ |
90 |
+PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" ) |
91 |
+ |
92 |
+CONFIG_CHECK="MODULES PCI ~CRC_CCITT" |
93 |
+ |
94 |
+pkg_setup() { |
95 |
+ use oslec && CONFIG_CHECK+=" ECHO" |
96 |
+ linux-mod_pkg_setup |
97 |
+} |
98 |
+ |
99 |
+src_unpack() { |
100 |
+ local file drv |
101 |
+ |
102 |
+ unpack ${A} |
103 |
+ # Copy the firmware tarballs over, the makefile will try and download them otherwise |
104 |
+ for file in ${A} ; do |
105 |
+ [[ "${file}" = dahdi-fw* ]] || continue |
106 |
+ cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || |
107 |
+ die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" |
108 |
+ done |
109 |
+ # But without the .bin's it'll still fall over and die, so copy those too. |
110 |
+ mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || |
111 |
+ die "Error moving firmware files into the right folders." |
112 |
+ |
113 |
+ for drv in ${JNET_DRIVERS}; do |
114 |
+ ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || |
115 |
+ die "Error linking ${drv}.c from jnet to DAHDI." |
116 |
+ ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || |
117 |
+ die "Error linking ${drv}.h from jnet to DAHDI." |
118 |
+ done |
119 |
+ |
120 |
+ # Find the stuff from gentoo-sources (ie, modules that has been removed by |
121 |
+ # upstream and we're re-adding). |
122 |
+ DAHDI_GENTOO_MODULES="" |
123 |
+ for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do |
124 |
+ [[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/" |
125 |
+ [[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o" |
126 |
+ mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed." |
127 |
+ done |
128 |
+} |
129 |
+ |
130 |
+src_prepare() { |
131 |
+ if use flash; then |
132 |
+ sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || |
133 |
+ die "Failed to define FXSFLASH" |
134 |
+ sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ |
135 |
+ include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" |
136 |
+ fi |
137 |
+ if use oslec; then |
138 |
+ sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ |
139 |
+ drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." |
140 |
+ fi |
141 |
+ default |
142 |
+} |
143 |
+ |
144 |
+src_compile() { |
145 |
+ unset ARCH |
146 |
+ emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ |
147 |
+ DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ |
148 |
+ LDFLAGS="$(raw-ldflags)" all |
149 |
+} |
150 |
+ |
151 |
+src_install() { |
152 |
+ einfo "Installing kernel module" |
153 |
+ emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ |
154 |
+ DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \ |
155 |
+ LDFLAGS="$(raw-ldflags)" install |
156 |
+ |
157 |
+ # Remove the blank "version" files (these files are all empty, and root owned). |
158 |
+ find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" |
159 |
+ |
160 |
+ # If the kernel sources have a System.map, and there a suitable depmod |
161 |
+ # available (seemingly when we're not cross-compiling), then the kernel |
162 |
+ # sources depmod kicks in. Remove the files caused by that. |
163 |
+ find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" |
164 |
+} |