add fcusb2 firmware files & hotplug script (#52984)

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index fa2c233145858bbbc727986bbf7c9bb8d74d15f7..02851204c40b884d49b76d551b7b175164c80421 100644 (file)
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/fritzcapi
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.4 2004/12/05 17:44:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.5 2004/12/12 22:14:02 mrness Exp $
+
+*fritzcapi-2.6.26.7-r3 (12 Dec 2004)
+
+  12 Dec 2004; Alin Nastac <mrness@gentoo.org> -fritzcapi-2.6.26.7-r1.ebuild,
+  -fritzcapi-2.6.26.7-r2.ebuild, +fritzcapi-2.6.26.7-r3.ebuild,
+  -fritzcapi-2.6.26.7.ebuild:
+  Add fcusb2 firmware files and hotplug script. See #52984.
 
 *fritzcapi-2.6.26.7-r2 (05 Dec 2004)
 

diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
index af6526d7a91501f3fa7284c2a96482d8cfd5efdb..9ef72a7838650de9fa48efc8627b8c9067a7a5f6 100644 (file)
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -2,17 +2,13 @@
 Hash: SHA1
 
 MD5 1263c46695d96ea0f5d40540b938c13c metadata.xml 301
-MD5 f1f8e5e19356dff1b8c7ffe1d9962658 ChangeLog 954
-MD5 1f97975f589a67c14d90d9070cee4350 fritzcapi-2.6.26.7.ebuild 1559
-MD5 56afc8aaf5cb53aae9422881becf9cf8 fritzcapi-2.6.26.7-r1.ebuild 2605
-MD5 55bc86e6d26bfd8ce63d5981018cd7e1 fritzcapi-2.6.26.7-r2.ebuild 3338
-MD5 accf9b4a9f56c30c485802543f4e44d5 files/digest-fritzcapi-2.6.26.7 76
-MD5 accf9b4a9f56c30c485802543f4e44d5 files/digest-fritzcapi-2.6.26.7-r1 76
-MD5 accf9b4a9f56c30c485802543f4e44d5 files/digest-fritzcapi-2.6.26.7-r2 76
+MD5 ec85a3fbaab89d69e8ff0a69d0a41737 ChangeLog 1225
+MD5 9916f6afe9b13479cd4f7f08f501197b fritzcapi-2.6.26.7-r3.ebuild 4335
+MD5 86fdda254b3cadec4c561d8cafc888fa files/digest-fritzcapi-2.6.26.7-r3 151
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBs0kBjtv59x0+BrURAnqmAJ4jZv+tE5Jk0nXA2Jl/GiCs/H4RxQCcDsyu
-DVF8DhCtbFCpi0eUHdyOIm4=
-=XmMT
+iD8DBQFBvMK0jtv59x0+BrURApxQAKD7UU+Xi4XCk9rqdD7xxr2l56Ks5wCdFiTG
+1PiLV7AMftUGceIVpCIiy6s=
+=mY80
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r1 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r1
deleted file mode 100644 (file)
index 364f6b2..0000000
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da1774a7774e22afc7bff26d2978118e km_fritzcapi-2.6-26.7.i586.rpm 1904272

diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r2 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r2
deleted file mode 100644 (file)
index 364f6b2..0000000
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da1774a7774e22afc7bff26d2978118e km_fritzcapi-2.6-26.7.i586.rpm 1904272

diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3
similarity index 50%
rename from net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7
rename to net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3
index 364f6b2de00c30b827ca32c0303e145def407434..dbe8e7cbdf4b826a026ffd5109c3dbcd1ccc8eb4 100644 (file)
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7
+++ b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3
@@ -1 +1,2 @@
 MD5 da1774a7774e22afc7bff26d2978118e km_fritzcapi-2.6-26.7.i586.rpm 1904272
+MD5 a38bc7083f1103e450e03bfe27d1d08f fcusb2-firmware-3.11.04.tar.bz2 22193

diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r1.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r1.ebuild
deleted file mode 100644 (file)
index 092513f..0000000
--- a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r1.ebuild,v 1.1 2004/11/28 10:16:48 mrness Exp $
-
-inherit kernel-mod rpm
-
-S="${WORKDIR}/usr/src/kernel-modules/fritzcapi"
-
-DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ and fxusb"
-HOMEPAGE="http://www.avm.de/"
-SRC_URI="ftp://ftp.suse.com/pub/suse/i386/update/9.1/rpm/i586/km_${P/2.6./2.6-}.i586.rpm"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="pcmcia usb"
-
-RDEPEND=">=net-dialup/capi4k-utils-20040810"
-DEPEND="${RDEPEND}
-       virtual/linux-sources"
-
-FRITZCAPI_MODULES=("fcclassic" "fcpci" "fcpcmcia" "fcpnp" "fcusb" "fcusb2" "fxusb_CZ" "fxusb")
-FRITZCAPI_TARGETS=("fritz.classic" "fritz.pci" "fritz.pcmcia" "fritz.pnp" "fritz.usb" "fritz.usb2" "fritz.xusb_CZ" "fritz.xusb")
-
-pkg_setup() {
-       if ! kernel-mod_is_2_6_kernel; then
-               die "This package works only with 2.6 kernel!"
-       fi
-       if ! kernel-mod_configoption_present ISDN_CAPI_CAPI20; then
-               die "For using the driver you need a kernel with enabled CAPI support."
-       fi
-       kernel-mod_check_modules_supported
-
-       local USERCARD CARD
-       FRITZCAPI_BUILD_TARGETS=""
-       if [ -n "${FRITZCAPI_CARDS}" ]; then
-               #Check existence of user selected cards
-               for USERCARD in ${FRITZCAPI_CARDS} ; do
-                       for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-                               if [ "$USERCARD" = "${FRITZCAPI_MODULES[CARD]}" ]; then
-                                       FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-                                       continue 2
-                               fi
-                       done
-                       die "Module ${USERCARD} not present in ${P}"
-               done
-       else
-               #Filter build targets by USE
-               for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-                       if [ ${FRITZCAPI_MODULES[CARD]/pcmcia/} != ${FRITZCAPI_MODULES[CARD]} ] && ! useq pcmcia; then
-                               continue
-                       fi
-                       if [ ${FRITZCAPI_MODULES[CARD]/usb/} != ${FRITZCAPI_MODULES[CARD]} ] && ! useq usb; then
-                               continue
-                       fi
-                       FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-               done
-       fi
-}
-
-src_unpack() {
-       rpm_src_unpack ${A} || die "Could not unpack RPM package."
-}
-
-src_compile() {
-       (
-               unset ARCH
-               emake KERNEL_SOURCE="${ROOT}/usr/src/linux" TARGETS="${FRITZCAPI_BUILD_TARGETS}" modules || \
-                       die "emake modules failed"
-       )
-}
-
-src_install() {
-       insinto /lib/modules/${KV_VERSION_FULL}/extra
-       doins fritz.*/src/*.ko
-}
-
-pkg_postinst() {
-       einfo "Checking kernel module dependencies"
-       test -r "${ROOT}/usr/src/linux/System.map" && \
-               depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}

diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r2.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild
similarity index 73%
rename from net-dialup/fritzcapi/fritzcapi-2.6.26.7-r2.ebuild
rename to net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild
index 7bb0425bc3f6715ca42d26de12c28df1d80334f0..705e357fcbd95f0824d27933f2cf05087d23cc82 100644 (file)
--- a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r2.ebuild
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r2.ebuild,v 1.1 2004/12/05 17:44:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild,v 1.1 2004/12/12 22:14:02 mrness Exp $
 
 inherit kernel-mod rpm eutils
 
@@ -8,7 +8,8 @@ S="${WORKDIR}/usr/src/kernel-modules/fritzcapi"
 
 DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ and fxusb"
 HOMEPAGE="http://www.avm.de/"
-SRC_URI="ftp://ftp.suse.com/pub/suse/i386/update/9.1/rpm/i586/km_${P/2.6./2.6-}.i586.rpm"
+SRC_URI="ftp://ftp.suse.com/pub/suse/i386/update/9.1/rpm/i586/km_${P/2.6./2.6-}.i586.rpm
+       mirror://gentoo/fcusb2-firmware-3.11.04.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -86,14 +87,44 @@ src_compile() {
 }
 
 src_install() {
+       dodir /lib/firmware /etc
        insinto /lib/modules/${KV_VERSION_FULL}/extra
        doins fritz.*/src/*.ko
+
+       echo -e "# card\tfile\tproto\tio\tirq\tmem\tcardnr\toptions" >${D}/etc/capi.conf
+       echo "#" >>${D}/etc/capi.conf
+
+       [ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && \
+               dodoc fritz.xusb_CZ/README.fxusb_CZ
+
+       [ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
+               dodir /etc/hotplug/usb
+               cd ${WORKDIR}/fcusb2
+               insopts -m0755
+               insinto /etc/hotplug/usb
+               doins hotplug/usb/*
+
+               insinto /lib/firmware
+               insopts -m0644
+               doins firmware/*
+               echo -e "#fcusb2\tput_here_your_firmware\t-\t-\t-\t-\t-" >>${D}/etc/capi.conf
+       )
+
+       #Compatibility with <=net-dialup/isdn4k-utils-20041006-r3. 
+       #Please remove it when it becomes obsolete
+       dosym firmware /lib/isdn
 }
 
 pkg_postinst() {
        einfo "Checking kernel module dependencies"
        [ -r "${ROOT}/usr/src/linux/System.map" ] && \
                depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-       [ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" = "${FRITZCAPI_BUILD_TARGETS}" ] || \
-               dodoc fritz.xusb_CZ/README.fxusb_CZ
+
+       einfo "If your device need a firmware, you should edit copy the firmware files"
+       einfo "in /lib/firmware and edit /etc/capi.conf."
+       einfo
+       [ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
+               einfo "Note: This ebuild has already installed firmware files necessary for following modules:"
+               einfo "   fcusb2"
+       )
 }

diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.26.7.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.26.7.ebuild
deleted file mode 100644 (file)
index 055a414..0000000
--- a/net-dialup/fritzcapi/fritzcapi-2.6.26.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.26.7.ebuild,v 1.2 2004/11/22 06:12:00 mrness Exp $
-
-inherit kernel-mod rpm
-
-S="${WORKDIR}/usr/src/kernel-modules/fritzcapi"
-
-DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ and fxusb"
-HOMEPAGE="http://www.avm.de/"
-SRC_URI="ftp://ftp.suse.com/pub/suse/i386/update/9.1/rpm/i586/km_${P/2.6./2.6-}.i586.rpm"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="pcmcia usb"
-
-RDEPEND=">=net-dialup/capi4k-utils-20040810"
-DEPEND="${RDEPEND}
-       virtual/linux-sources"
-
-pkg_setup() {
-       if ! kernel-mod_is_2_6_kernel; then
-               die "This package works only with 2.6 kernel!"
-       fi
-       if ! kernel-mod_configoption_present ISDN_CAPI_CAPI20; then
-               die "For using the driver you need a kernel with enabled CAPI support."
-       fi
-       kernel-mod_check_modules_supported
-}
-
-src_unpack() {
-       rpm_src_unpack ${A} || die "Could not unpack RPM package."
-}
-
-src_compile() {
-       (
-               unset ARCH
-               emake KERNEL_SOURCE="${ROOT}/usr/src/linux" modules || die "emake modules failed"
-       )
-}
-
-src_install() {
-       if ! useq pcmcia ; then
-               rm fritz.*/src/*pcmcia*.ko
-       fi
-       if ! useq usb ; then
-               rm fritz.*/src/*usb*.ko
-       fi
-
-       insinto /lib/modules/${KV_VERSION_FULL}/extra
-       doins fritz.*/src/*.ko
-}
-
-pkg_postinst() {
-       einfo "Checking kernel module dependencies"
-       test -r "${ROOT}/usr/src/linux/System.map" && \
-               depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-}