From 752c7c447254f74c2270364395284c2daf707dc0 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 27 Mar 2010 10:57:01 +0100 Subject: [PATCH] Removed nozomi - driver is already in newest kernel --- net-misc/nozomi/Manifest | 5 -- net-misc/nozomi/files/digest-nozomi-2.21 | 3 - net-misc/nozomi/files/digest-nozomi-2.21-r1 | 3 - .../files/nozomi-2.21-kernel-2.6.20.patch | 26 ------ .../files/nozomi-2.21-kernel-2.6.20.patch.ori | 11 --- .../files/nozomi-2.21-pci_module_init.patch | 11 --- net-misc/nozomi/nozomi-2.21-r1.ebuild | 80 ------------------- 7 files changed, 139 deletions(-) delete mode 100644 net-misc/nozomi/Manifest delete mode 100644 net-misc/nozomi/files/digest-nozomi-2.21 delete mode 100644 net-misc/nozomi/files/digest-nozomi-2.21-r1 delete mode 100644 net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch delete mode 100644 net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch.ori delete mode 100644 net-misc/nozomi/files/nozomi-2.21-pci_module_init.patch delete mode 100644 net-misc/nozomi/nozomi-2.21-r1.ebuild diff --git a/net-misc/nozomi/Manifest b/net-misc/nozomi/Manifest deleted file mode 100644 index 4ba0208..0000000 --- a/net-misc/nozomi/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX nozomi-2.21-kernel-2.6.20.patch 850 RMD160 0e67b2e8c26f22b977f79c7ac88e9a277a5465df SHA1 eed022c3091d50b7962a65a58b0de7304883d54c SHA256 e41d7d37643196714351afeb1291cbe902f854d0d15f4584490843e31be3d38d -AUX nozomi-2.21-kernel-2.6.20.patch.ori 442 RMD160 8dfb166eaeded9495180d9b680c1aba4a87697dc SHA1 1ef51ae3667bc598496a8e30de4c79e614d3a6ae SHA256 6da6145386ea3d104f04805f735d90304776ed13cc8ed15963595402eed9b12f -AUX nozomi-2.21-pci_module_init.patch 357 RMD160 bc3877847c3b0549d8e282ca0b480c2b111880b7 SHA1 79c99e26a70a52fda8091050c2fec93a87d28398 SHA256 dc91726f12a820d8d0cd6b173e7c0cd54082172bc0c54c1aaf2323e006971f09 -DIST nozomi_2.21alpha_060917.tar.gz 24792 RMD160 3db7dbb311f920a58da48a4900b57e8486537435 SHA1 6f3d15f2cb4511b36647941353b16ff518bafb4a SHA256 c52e12058fd3161a89abd7d5af20824d0b1e88516ad9241ec49822de1d32b639 -EBUILD nozomi-2.21-r1.ebuild 1909 RMD160 78b08a36e374079a256c11b6b65b680633d1f770 SHA1 3c3bcb9a79f522f4ad73f02a609fae6d616cdf4a SHA256 e4d86509c63b7302c0e9a0afcc9c0780258f728084c00d1670094cac2d8f3ad4 diff --git a/net-misc/nozomi/files/digest-nozomi-2.21 b/net-misc/nozomi/files/digest-nozomi-2.21 deleted file mode 100644 index 929fb81..0000000 --- a/net-misc/nozomi/files/digest-nozomi-2.21 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1ad7b8361ed5e138a833c9f552c9c8f0 nozomi_2.21alpha_060917.tar.gz 24792 -RMD160 3db7dbb311f920a58da48a4900b57e8486537435 nozomi_2.21alpha_060917.tar.gz 24792 -SHA256 c52e12058fd3161a89abd7d5af20824d0b1e88516ad9241ec49822de1d32b639 nozomi_2.21alpha_060917.tar.gz 24792 diff --git a/net-misc/nozomi/files/digest-nozomi-2.21-r1 b/net-misc/nozomi/files/digest-nozomi-2.21-r1 deleted file mode 100644 index 929fb81..0000000 --- a/net-misc/nozomi/files/digest-nozomi-2.21-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 1ad7b8361ed5e138a833c9f552c9c8f0 nozomi_2.21alpha_060917.tar.gz 24792 -RMD160 3db7dbb311f920a58da48a4900b57e8486537435 nozomi_2.21alpha_060917.tar.gz 24792 -SHA256 c52e12058fd3161a89abd7d5af20824d0b1e88516ad9241ec49822de1d32b639 nozomi_2.21alpha_060917.tar.gz 24792 diff --git a/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch b/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch deleted file mode 100644 index bd6d469..0000000 --- a/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- nozomi_2.21alpha_060917.orig/nozomi.c 2006-09-17 10:26:39.000000000 +0200 -+++ nozomi_2.21alpha_060917/nozomi.c 2007-08-15 15:39:21.000000000 +0200 -@@ -1686,7 +1686,13 @@ - ret = -ENODEV; - goto err_disable_device; - } -- dc->base_addr = (void *)ioremap((int)dc->base_addr, dc->card_type); -+ -+#ifdef CONFIG_X86_64 -+ dc->base_addr = (void*)ioremap((u64)dc->base_addr, dc->card_type); -+#else -+ dc->base_addr = (void *)ioremap((int)dc->base_addr, dc->card_type); -+#endif -+ - if (!dc->base_addr) { - dev_err(&pdev->dev, "No I/O-Address for card detected\n"); - ret = -ENODEV; -@@ -1733,7 +1739,7 @@ - BUG_ON(!dc->tty_flip_wq); - return -ENOMEM; - } -- INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc); -+ INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function); - #endif - spin_lock_init(&dc->spin_mutex); - make_proc_dirs(); diff --git a/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch.ori b/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch.ori deleted file mode 100644 index 8171c50..0000000 --- a/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch.ori +++ /dev/null @@ -1,11 +0,0 @@ ---- nozomi.c.orig 2007-02-14 21:14:41.000000000 +0100 -+++ nozomi.c 2007-02-14 19:49:51.000000000 +0100 -@@ -1733,7 +1733,7 @@ - BUG_ON(!dc->tty_flip_wq); - return -ENOMEM; - } -- INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc); -+ INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function); - #endif - spin_lock_init(&dc->spin_mutex); - make_proc_dirs(); diff --git a/net-misc/nozomi/files/nozomi-2.21-pci_module_init.patch b/net-misc/nozomi/files/nozomi-2.21-pci_module_init.patch deleted file mode 100644 index 6bd6da2..0000000 --- a/net-misc/nozomi/files/nozomi-2.21-pci_module_init.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nozomi_2.21alpha_060917.orig/nozomi.c 2007-08-15 15:42:00.000000000 +0200 -+++ nozomi_2.21alpha_060917/nozomi.c 2007-08-15 15:43:06.000000000 +0200 -@@ -2399,7 +2399,7 @@ - { - int rval = 0; - -- rval = pci_module_init(&nozomi_driver); -+ rval = pci_register_driver(&nozomi_driver); - printk(KERN_INFO "Initializing %s\n", VERSION_STRING); - return rval; - } diff --git a/net-misc/nozomi/nozomi-2.21-r1.ebuild b/net-misc/nozomi/nozomi-2.21-r1.ebuild deleted file mode 100644 index 28406b8..0000000 --- a/net-misc/nozomi/nozomi-2.21-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nozomi/nozomi-2.21.ebuild,v 1.1 2006/08/28 09:25:36 mariano Exp $ - -inherit eutils linux-mod - -nozomifile="nozomi_2.21alpha_060917.tar.gz" - -DESCRIPTION="Driver for modem Option Globetrotter UMTS/EDGE " -HOMEPAGE="http://www.pharscape.org" -#SRC_URI="/usr/portage/distfiles/${PN}-2.21.tar.bz2" -SRC_URI="${nozomifile}" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~amd64" -RESTRICT="fetch" -IUSE="" -MODULE_NAMES="nozomi(kernel/drivers/pci/hotplug:)" -BUILD_TARGETS=" " -FETCH_NOZOMI="http://www.pharscape.org/index2.php?option=com_forum&Itemid=68&page=download&id=18" -CONFIG_CHECK="MODULES" - -S=${WORKDIR}/nozomi_2.21alpha_060917 - - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KDIR=${KV_DIR}" -} - -pkg_nofetch() { - einfo "Please download ${nozomifile} from:" - einfo ${FETCH_NOZOMI} - einfo "and move it to ${DISTDIR}" -} - -src_unpack() { - if [ ! -r ${DISTDIR}/${nozomifile} ]; then - die "cannot read ${nozomifile}. Please check the permission and try again." - fi - for pkg in ${A}; do - cd ${WORKDIR} - unpack ${pkg} - if kernel_is ge 2 6 20 ; then - cd ${S} - epatch "${FILESDIR}"/${P}-kernel-2.6.20.patch - fi - if kernel_is ge 2 6 22 ; then - cd ${S} - epatch "${FILESDIR}"/${P}-pci_module_init.patch - fi - - done -} - - -src_compile() { - linux-mod_src_compile - - -} - - -src_install() { - linux-mod_src_install - #dodir /usr/share/${PN}/samples - #insinto /usr/share/${PN}/samples - #doins "${FILESDIR}"/net - #doins "${FILESDIR}"/www.plusgsm.pl - #doins "${FILESDIR}"/chat-www.plusgsm.pl - #doins "${FILESDIR}"/51-3g-datacard.rules - - -} - -pkg_postinst() { - linux-mod_pkg_postinst - einfo "Have fun :)" - -}