remove card detection from src_compile

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 9e1408239f4b72636d2751902e9a4cd198d85394..1ce6b0ee142c2a6406535767e02ee2e84451669d 100644 (file)
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/fcdsl
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.3 2004/11/20 12:37:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.4 2004/11/21 21:24:47 mrness Exp $
+
+  21 Nov 2004; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.20.7-r1.ebuild:
+  Install all modules and remove card detection from compile function. See bug
+  #71781.
 
 *fcdsl-2.6.20.7-r1 (20 Nov 2004)
 

diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index a52d7138ea1ee099c160f68f0af073406aecde42..b77d1bc2b3ffaf621c7f7abef07ece73aafa3078 100644 (file)
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5432935107359c7a8223ed1b5dcaad26 ChangeLog 769
+MD5 4030b9716af322c98c3502ddb48c7e98 ChangeLog 932
 MD5 7e441fe8845d85e66f3cf257959d2572 fcdsl-2.6.20.7.ebuild 7203
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 5adddedabf326041026814e39891ce20 fcdsl-2.6.20.7-r1.ebuild 7284
+MD5 6c67134e387f5b6813abf045c8093958 fcdsl-2.6.20.7-r1.ebuild 7284
 MD5 364100988c059984dab986c49888df6f files/digest-fcdsl-2.6.20.7 72
 MD5 364100988c059984dab986c49888df6f files/digest-fcdsl-2.6.20.7-r1 72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBnzp8jtv59x0+BrURApeLAJ9I5s6+gjI3npVuJflq6dCZyCedRgCfVgy8
-7lJvOOXnyw9vTosSz1NpKwE=
-=4QhV
+iD8DBQFBoQesjtv59x0+BrURAujRAJ48HL8a/eem6jHKcOTqDF6xqFc9WwCg2tdS
+nsRsoJLsnlWLM3EDp/4slT4=
+=BnW1
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild
index a032f5b8c87f9866165865c517b5a2d8304f432e..f83fe77fe7760462828ad76afe8cc6e69d9e6b85 100644 (file)
--- a/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.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/fcdsl/fcdsl-2.6.20.7-r1.ebuild,v 1.1 2004/11/20 12:37:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild,v 1.2 2004/11/21 21:24:47 mrness Exp $
 
 inherit kernel-mod rpm eutils
 
@@ -17,7 +17,6 @@ IUSE=""
 
 RDEPEND=">=net-dialup/capi4k-utils-20040810"
 DEPEND="${RDEPEND}
-       app-arch/rpm2targz
        sys-apps/gawk
        sys-apps/sed
        virtual/linux-sources"
@@ -88,17 +87,18 @@ src_unpack() {
 }
 
 src_compile() {
-       unset ARCH
+       set_arch_to_kernel
        if [ "${FCDSL_MODULE}" == "" ]; then
                for ((CARD=0; CARD < ${#FCDSL_IDS[*]}; CARD++)); do
                        einfo "Compiling driver for ${FCDSL_NAMES[CARD]}"
                        cd ${WORKDIR}/${FCDSL_MODULES[CARD]/fc/fritz.}/src || die "Could not change to ${FCDSL_NAMES[CARD]} source directory."
-                       make || die "Could not compile driver for ${FCDSL_NAMES[CARD]}."
+                       kernel-mod_src_compile || die "Could not compile driver for ${FCDSL_NAMES[CARD]}."
                done
        else
                cd ${WORKDIR}/${FCDSL_MODULE/fc/fritz.}/src || die "Could not change to driver source directory."
-               make || die "Could not compile driver."
+               kernel-mod_src_compile || die "Could not compile driver."
        fi
+       set_arch_to_portage
 }
 
 src_install() {
@@ -139,34 +139,22 @@ src_install() {
 }
 
 pkg_postinst() {
-       einfo "To complete the installation you have to modify the file"
-       einfo "    /etc/modules.d/fcdsl"
-       einfo "with the options drdsl will give you."
-       echo
-       if [ "${FCDSL_MODULE}" == "" ];
-       then
-               einfo "(your modulename)\t(your firmware)\t-\t-\t-\t-\t-"
-       else
-               einfo "${FCDSL_MODULE}\t${FCDSL_FIRMWARE}\t-\t-\t-\t-\t-"
-       fi
+       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}
+
        echo
-       einfo "Please enter following commands:"
-       einfo "    depmod -ae"
+       einfo "If you want to setup your DSL card driver and create a peer file, please run:"
+       einfo "    etc-update"
+       einfo "    ebuild /var/db/pkg/net-dialup/${PF}/${PF}.ebuild config"
        einfo "    capiinit start"
        einfo "    drdsl -n"
-       einfo "    nano /etc/modules.d/fcdsl (=> enter the values)"
+       einfo "    nano /etc/modules.d/fcdsl"
        einfo "    update-modules"
-       echo
-       einfo "If you want to create a peer file, please run:"
-       einfo "    ebuild /var/db/pkg/net-dialup/${PF}/${PF}.ebuild config"
-
-       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}
+       sleep 10
 }
 
 readpassword() {
-
        VALUE_1=""
        VALUE_2=""
        while true; do
@@ -194,11 +182,9 @@ readpassword() {
        VALUE_2=""
        unset VALUE_1
        unset VALUE_2
-
 }
 
 readvalue() {
-
        VALUE=""
        while true; do
                einfo "${2}:"
@@ -214,11 +200,9 @@ readvalue() {
 
        VALUE=""
        unset VALUE
-
 }
 
 pkg_config() {
-
        detect_fcdsl_card
 
        if [ "${FCDSL_MODULE}" != "" ]; then
@@ -268,10 +252,17 @@ EOF
                else
                        ewarn "Peer file \"/etc/ppp/peers/${FCDSL_PROVIDER}\" always exists!"
                fi
+
+               #Uncomment correspondent lines in /etc/capi.conf & /etc/modules.d/fcdsl
+               if [ -f /etc/capi.conf ]; then
+                       sed -i -e "s:^#${FCDSL_MODULE}:${FCDSL_MODULE}" /etc/capi.conf
+               fi
+               if [ -f /etc/modules.d/fcdsl ]; then
+                       sed -i -e "s:^#options +${FCDSL_MODULE}:options ${FCDSL_MODULE}" /etc/modules.d/fcdsl
+               fi
        else
                ewarn "No AVM FRITZ!Card DSL found!"
        fi
        unset FCDSL_PROVIDER
        unset FCDSL_USER
-
 }