From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- net-misc/dahdi/Manifest | 5 +- net-misc/dahdi/dahdi-3.1.0-r2.ebuild | 107 ------------------------------- net-misc/dahdi/dahdi-3.1.0-r4.ebuild | 120 +++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 109 deletions(-) delete mode 100644 net-misc/dahdi/dahdi-3.1.0-r2.ebuild create mode 100644 net-misc/dahdi/dahdi-3.1.0-r4.ebuild (limited to 'net-misc/dahdi') diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest index cd7c014873e6..73d1656bc37d 100644 --- a/net-misc/dahdi/Manifest +++ b/net-misc/dahdi/Manifest @@ -16,9 +16,10 @@ DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43 DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 -DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304 +DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157 DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de +DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 -EBUILD dahdi-3.1.0-r2.ebuild 4797 BLAKE2B 0678c138c04c0d18e7b1220150615cc19bedc684ba8e22129439e938c80eed8af614314849e2d86811e18bacd78eb0baf4403784f658e5be4b473e66af0528ef SHA512 5846b09fe4cb0103c97f7eab2ae4e4a2ae4ad4872bb36979dac84378095611cfee432b1ff326d8fabb3d9d4d877fbbaa81a1fed93118c8acc7787d3159753101 EBUILD dahdi-3.1.0-r3.ebuild 4805 BLAKE2B d6e722b3d9649293889ac3fd9374aa247a1b35b28a6d7fdc526568ed24ff42af392555b75550a82d9089af77d270abcb51edea4c6d7fdbab29e2ea92a80279a1 SHA512 3ccd4e65fead21091cb18bcf5bb9871160c55f7009afcdc3b5a1b2a7cc3cff03c79ee3f0895c8adc3a4312400151945490ecbf74d9acba726fd144f09e82f0b0 +EBUILD dahdi-3.1.0-r4.ebuild 5495 BLAKE2B c71798600838bc2bee130b40ffc689dfda07b4ccd60a78f205c567a5288779aaf0dce693843773c71c20b64e28e4f6923e1a9123d924a5c591bf20c7a2f4dccd SHA512 9d903c0749d278e7c5f78503cf04b8fde0b32328f065e669b3cc0dce7001c269aed4fa3e7c333c78b37655176000623e1a3dd3f0f3978fa8b757be193fc9f6a2 MISC metadata.xml 570 BLAKE2B 9a86d4d85b8f3198da5e405d6eddff9196a5110d3928e96950bb35776288a107bb9a0a8ee683be94fa91e47bdb7457d0f4f3b545c23aaade69dfb9669287091a SHA512 dbef634f326db6041d861bbb86e6929bdd8999f2476d5d9d10c6f4866f83f3d3781fbec4713a159191f36c65ef63b483d82ab09f8e8671242e71b95d8ba7e844 diff --git a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild b/net-misc/dahdi/dahdi-3.1.0-r2.ebuild deleted file mode 100644 index 1bde322e9f43..000000000000 --- a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-mod toolchain-funcs - -MY_P="${P/dahdi/dahdi-linux}" -JNET=1.0.14 -GENTOO=3.1.0-r1-v2 -S="${WORKDIR}/${MY_P}" - -JNET_DRIVERS="cwain qozap ztgsm" - -DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz - https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2 - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="flash oslec" - -PATCHES=( "${WORKDIR}/dahdi-patchset" ) - -CONFIG_CHECK="MODULES PCI ~CRC_CCITT" - -pkg_pretend() { - use oslec && CONFIG_CHECK+=" ECHO" - check_extra_config -} - -src_unpack() { - unpack ${A} - # Copy the firmware tarballs over, the makefile will try and download them otherwise - for file in ${A} ; do - [[ "${file}" = dahdi-fw* ]] || continue - cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || - die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" - done - # But without the .bin's it'll still fall over and die, so copy those too. - mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || - die "Error moving firmware files into the right folders." - - for drv in ${JNET_DRIVERS}; do - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.c from jnet to DAHDI." - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.h from jnet to DAHDI." - done -} - -src_prepare() { - if use flash; then - sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || - die "Failed to define FXSFLASH" - sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ - include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" - fi - if use oslec; then - sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ - drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." - fi - default -} - -src_compile() { - unset ARCH - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" all -} - -src_install() { - einfo "Installing kernel module" - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" install - - # Remove the blank "version" files (these files are all empty, and root owned). - find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" - - # If the kernel sources have a System.map, and there a suitable depmod - # available (seemingly when we're not cross-compiling), then the kernel - # sources depmod kicks in. Remove the files caused by that. - find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" -} diff --git a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild new file mode 100644 index 000000000000..05ae21da55a6 --- /dev/null +++ b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-mod toolchain-funcs + +MY_P="${P/dahdi/dahdi-linux}" +JNET=1.0.14 +GENTOO_PATCHVERSION=3.1.0-r4 +GENTOO_SOURCEVERSION=3.1.0-r4 +S="${WORKDIR}/${MY_P}" + +JNET_DRIVERS="cwain qozap ztgsm" + +DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz + https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz + https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2 + https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2 + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz + https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz +" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="flash oslec" + +PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" ) + +CONFIG_CHECK="MODULES PCI ~CRC_CCITT" + +pkg_setup() { + use oslec && CONFIG_CHECK+=" ECHO" + linux-mod_pkg_setup +} + +src_unpack() { + local file drv + + unpack ${A} + # Copy the firmware tarballs over, the makefile will try and download them otherwise + for file in ${A} ; do + [[ "${file}" = dahdi-fw* ]] || continue + cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || + die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" + done + # But without the .bin's it'll still fall over and die, so copy those too. + mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || + die "Error moving firmware files into the right folders." + + for drv in ${JNET_DRIVERS}; do + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.c from jnet to DAHDI." + ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || + die "Error linking ${drv}.h from jnet to DAHDI." + done + + # Find the stuff from gentoo-sources (ie, modules that has been removed by + # upstream and we're re-adding). + DAHDI_GENTOO_MODULES="" + for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do + [[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/" + [[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o" + mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed." + done +} + +src_prepare() { + if use flash; then + sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || + die "Failed to define FXSFLASH" + sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ + include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" + fi + if use oslec; then + sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ + drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." + fi + default +} + +src_compile() { + unset ARCH + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ + LDFLAGS="$(raw-ldflags)" all +} + +src_install() { + einfo "Installing kernel module" + emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ + DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \ + LDFLAGS="$(raw-ldflags)" install + + # Remove the blank "version" files (these files are all empty, and root owned). + find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" + + # If the kernel sources have a System.map, and there a suitable depmod + # available (seemingly when we're not cross-compiling), then the kernel + # sources depmod kicks in. Remove the files caused by that. + find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" +} -- cgit v1.2.3