diff options
| -rw-r--r-- | net-dialup/fritzcapi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/fritzcapi/Manifest | 14 | ||||
| -rw-r--r-- | net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3 | 2 | ||||
| -rw-r--r-- | net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild | 69 |
4 files changed, 39 insertions, 52 deletions
diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog index 02851204c40b..3b15cbaa491b 100644 --- a/net-dialup/fritzcapi/ChangeLog +++ b/net-dialup/fritzcapi/ChangeLog @@ -1,6 +1,10 @@ # 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.5 2004/12/12 22:14:02 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.6 2004/12/22 23:22:27 mrness Exp $ + + 23 Dec 2004; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.26.7-r3.ebuild: + Replace kernel-mod inherit with linux-mod, thanks to Stefan Schweizer + <genstef@gentoo.org> (#75117). *fritzcapi-2.6.26.7-r3 (12 Dec 2004) diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest index 9ef72a783865..9dd92fa755f8 100644 --- a/net-dialup/fritzcapi/Manifest +++ b/net-dialup/fritzcapi/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 1263c46695d96ea0f5d40540b938c13c metadata.xml 301 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) - -iD8DBQFBvMK0jtv59x0+BrURApxQAKD7UU+Xi4XCk9rqdD7xxr2l56Ks5wCdFiTG -1PiLV7AMftUGceIVpCIiy6s= -=mY80 ------END PGP SIGNATURE----- +MD5 897952667d5b718ab364126c20b249d7 fritzcapi-2.6.26.7-r3.ebuild 4075 +MD5 4e97476cdc108508618f39f2aab8c70c files/digest-fritzcapi-2.6.26.7-r3 151 diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3 index dbe8e7cbdf4b..979f898d2493 100644 --- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3 +++ b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.26.7-r3 @@ -1,2 +1,2 @@ MD5 da1774a7774e22afc7bff26d2978118e km_fritzcapi-2.6-26.7.i586.rpm 1904272 -MD5 a38bc7083f1103e450e03bfe27d1d08f fcusb2-firmware-3.11.04.tar.bz2 22193 +MD5 8e27c2cd253a58c0c1d56cf00a2ef80b capi4linux-2004.4.5-0.i586.rpm 166931 diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild index 705e357fcbd9..7b12eafc3c71 100644 --- a/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild +++ b/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild @@ -1,47 +1,59 @@ # 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-r3.ebuild,v 1.1 2004/12/12 22:14:02 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.26.7-r3.ebuild,v 1.2 2004/12/22 23:22:27 mrness Exp $ -inherit kernel-mod rpm eutils - -S="${WORKDIR}/usr/src/kernel-modules/fritzcapi" +inherit linux-mod rpm eutils 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 - mirror://gentoo/fcusb2-firmware-3.11.04.tar.bz2" + ftp://ftp.suse.com/pub/suse/i386/9.1/suse/i586/capi4linux-2004.4.5-0.i586.rpm" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~x86" IUSE="pcmcia usb" -RDEPEND=">=net-dialup/capi4k-utils-20040810" -DEPEND="${RDEPEND} - virtual/linux-sources" +DEPEND=">=net-dialup/capi4k-utils-20040810" + +S="${WORKDIR}/usr/src/kernel-modules/fritzcapi" 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") +BUILD_PARAMS="KDIR=${KV_DIR}" +BUILD_TARGETS="all" + +get_card_module_name() { + local CARD=$1 + echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)" + if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ]; then + #PCMCIA have also a *_cs module + echo "${FRITZCAPI_MODULES[CARD]}_cs(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)" + fi +} + pkg_setup() { - if ! kernel-mod_is_2_6_kernel; then + linux-mod_pkg_setup + if ! kernel_is 2 6; then die "This package works only with 2.6 kernel!" fi - if ! kernel-mod_configoption_present ISDN_CAPI_CAPI20; then + if ! linux_chkconfig_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_CARDS="" FRITZCAPI_BUILD_TARGETS="" + MODULE_NAMES="" 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 + if [ "${USERCARD}" = "${FRITZCAPI_MODULES[CARD]}" ]; then FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}" FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}" + MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`" continue 2 fi done @@ -68,45 +80,28 @@ pkg_setup() { fi FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}" FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}" + MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`" done fi einfo "Selected cards: ${FRITZCAPI_BUILD_CARDS}" } -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() { + linux-mod_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 + dodoc ${S}/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/* + doins ${WORKDIR}/usr/lib/isdn/* echo -e "#fcusb2\tput_here_your_firmware\t-\t-\t-\t-\t-" >>${D}/etc/capi.conf ) @@ -116,11 +111,9 @@ src_install() { } 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} + linux-mod_pkg_postinst - einfo "If your device need a firmware, you should edit copy the firmware files" + einfo "If your device needs 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}" ] && ( |