diff options
author | 2007-01-28 17:45:20 +0000 | |
---|---|---|
committer | 2007-01-28 17:45:20 +0000 | |
commit | e099b507a212893af9023dababd9e06ba92724a7 (patch) | |
tree | 455e0c293ef529ec3814e20ab46e2b0bebb37b2c /net-wireless/ndiswrapper | |
parent | app-misc/lsx: Fix HOMEPAGE (diff) | |
download | gentoo-2-e099b507a212893af9023dababd9e06ba92724a7.tar.gz gentoo-2-e099b507a212893af9023dababd9e06ba92724a7.tar.bz2 gentoo-2-e099b507a212893af9023dababd9e06ba92724a7.zip |
Version bump(1.35). Also finally add a correct patch for suspend2(already in ndiswrapper svn).
(Portage version: 2.1.2-r4)
Diffstat (limited to 'net-wireless/ndiswrapper')
-rw-r--r-- | net-wireless/ndiswrapper/ChangeLog | 10 | ||||
-rw-r--r-- | net-wireless/ndiswrapper/files/digest-ndiswrapper-1.35 | 3 | ||||
-rw-r--r-- | net-wireless/ndiswrapper/files/ndiswrapper-new_suspend2.patch | 26 | ||||
-rw-r--r-- | net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild | 9 | ||||
-rw-r--r-- | net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild | 11 | ||||
-rw-r--r-- | net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild | 112 |
6 files changed, 165 insertions, 6 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index b93d5703a36b..2dac9312bb9c 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-wireless/ndiswrapper # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.70 2007/01/11 17:11:35 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.71 2007/01/28 17:45:20 peper Exp $ + +*ndiswrapper-1.35 (28 Jan 2007) + + 28 Jan 2007; Piotr Jaroszyński <peper@gentoo.org> + +files/ndiswrapper-new_suspend2.patch, ndiswrapper-1.33.ebuild, + ndiswrapper-1.34.ebuild, +ndiswrapper-1.35.ebuild: + Version bump(1.35). + Also finally add a correct patch for suspend2(already in ndiswrapper svn). 11 Jan 2007; Piotr Jaroszyński <peper@gentoo.org> -files/ndiswrapper-1.2-kernel-2.6.14.patch, diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.35 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.35 new file mode 100644 index 000000000000..de7fe6d4bb58 --- /dev/null +++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.35 @@ -0,0 +1,3 @@ +MD5 bd6aa8e6a513cf727ba7674959a6cff4 ndiswrapper-1.35.tar.gz 191277 +RMD160 ffbd196a22bd6a432157df4e2d0ec203ff6dc250 ndiswrapper-1.35.tar.gz 191277 +SHA256 d4f396d9dafe94fec374df4ff68283b1078d2c17de86bb430af68390cd0f999c ndiswrapper-1.35.tar.gz 191277 diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-new_suspend2.patch b/net-wireless/ndiswrapper/files/ndiswrapper-new_suspend2.patch new file mode 100644 index 000000000000..1936010b860a --- /dev/null +++ b/net-wireless/ndiswrapper/files/ndiswrapper-new_suspend2.patch @@ -0,0 +1,26 @@ +--- driver/ntoskernel.h.old 2007-01-28 17:14:51.000000000 +0100 ++++ driver/ntoskernel.h 2007-01-28 17:34:14.000000000 +0100 +@@ -348,12 +348,6 @@ + #define pci_choose_state(dev, state) (state) + #endif + +-#if defined(CONFIG_SOFTWARE_SUSPEND2) || defined(CONFIG_SUSPEND2) +-#define KTHREAD_RUN(a,b,c) kthread_run(a,b,0,c) +-#else +-#define KTHREAD_RUN(a,b,c) kthread_run(a,b,c) +-#endif +- + #if !defined(HAVE_NETDEV_PRIV) + #define netdev_priv(dev) ((dev)->priv) + #endif +--- driver/ntoskernel.c.old 2007-01-28 16:09:21.000000000 +0100 ++++ driver/ntoskernel.c 2007-01-28 17:22:03.000000000 +0100 +@@ -1911,7 +1911,7 @@ + } + DBGTRACE2("created task: %d", pid); + #else +- task = KTHREAD_RUN(thread_trampoline, &thread_info, "windisdrvr"); ++ task = kthread_run(thread_trampoline, &thread_info, "windisdrvr"); + if (IS_ERR(task)) { + free_object(thread_info.thread); + TRACEEXIT2(return STATUS_FAILURE); diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild index b65010807b3c..4f9fc267262d 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild,v 1.3 2007/01/11 17:11:35 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild,v 1.4 2007/01/28 17:45:20 peper Exp $ -inherit linux-mod +inherit eutils linux-mod DESCRIPTION="Wrapper for using Windows drivers for some wireless cards" HOMEPAGE="http://ndiswrapper.sourceforge.net/" @@ -36,6 +36,8 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" + # New patch for suspend2 kernels - peper + epatch "${FILESDIR}/${PN}-new_suspend2.patch" convert_to_m "${S}/driver/Makefile" } @@ -95,6 +97,9 @@ pkg_postinst() { einfo "for the FAQ, HowTos, Tips, Configuration, and installation" einfo "information." echo + einfo "ndiswrapper devs need support(_hardware_, cash)." + einfo "Don't hesistate if you can help, see http://ndiswrapper.sf.net for details." + echo einfo "Attempting to automatically reinstall any Windows drivers" einfo "you might already have." diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild index 36e86c61fc2c..8499241f6b68 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild,v 1.2 2007/01/11 17:11:35 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild,v 1.3 2007/01/28 17:45:20 peper Exp $ -inherit linux-mod +inherit eutils linux-mod DESCRIPTION="Wrapper for using Windows drivers for some wireless cards" HOMEPAGE="http://ndiswrapper.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" IUSE="debug usb" DEPEND="sys-apps/pciutils" @@ -36,6 +36,8 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" + # New patch for suspend2 kernels - peper + epatch "${FILESDIR}/${PN}-new_suspend2.patch" convert_to_m "${S}/driver/Makefile" } @@ -95,6 +97,9 @@ pkg_postinst() { einfo "for the FAQ, HowTos, Tips, Configuration, and installation" einfo "information." echo + einfo "ndiswrapper devs need support(_hardware_, cash)." + einfo "Don't hesistate if you can help, see http://ndiswrapper.sf.net for details." + echo einfo "Attempting to automatically reinstall any Windows drivers" einfo "you might already have." diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild new file mode 100644 index 000000000000..6a5ef31018df --- /dev/null +++ b/net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild,v 1.1 2007/01/28 17:45:20 peper Exp $ + +inherit eutils linux-mod + +DESCRIPTION="Wrapper for using Windows drivers for some wireless cards" +HOMEPAGE="http://ndiswrapper.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="debug usb" + +DEPEND="sys-apps/pciutils" +RDEPEND="${DEPEND} + net-wireless/wireless-tools" + +CONFIG_CHECK="NET_RADIO" + +MODULE_NAMES="ndiswrapper(misc:${S}/driver)" +BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_FULL}" +BUILD_TARGETS="all" +MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper") + +ERROR_USB="You need to enable USB support in your kernel +to use usb support in ndiswrapper." + +pkg_setup() { + einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml for a list of supported kernels." + echo "" + use usb && CONFIG_CHECK="${CONFIG_CHECK} USB" + linux-mod_pkg_setup +} + +src_unpack() { + unpack ${A} + cd "${S}" + # New patch for suspend2 kernels - peper + epatch "${FILESDIR}/${PN}-new_suspend2.patch" + + convert_to_m "${S}/driver/Makefile" +} + +src_compile() { + local params + + # Enable verbose debugging information + if use debug; then + params="DEBUG=3" + use usb && params="${params} USB_DEBUG=1" + fi + + cd utils + emake || die "Compile of utils failed!" + + use usb || params="DISABLE_USB=1" + + # Does not like parallel builds + # http://bugs.gentoo.org/show_bug.cgi?id=154213 + + # KBUILD trick needed to build against sources where only make + # modules_prepare has been run so /lib/modules/$(uname -r) does + # not exists yet + # KBUILD value can't be quoted or amd64 fails + # http://bugs.gentoo.org/show_bug.cgi?id=156319 + BUILD_PARAMS="KBUILD=${KV_OUT_DIR} ${BUILD_PARAMS} ${params} -j1" linux-mod_src_compile +} + +src_install() { + dodoc README INSTALL AUTHORS ChangeLog + doman ndiswrapper.8 + + keepdir /etc/ndiswrapper + + linux-mod_src_install + + cd utils + emake DESTDIR="${D}" install || die "emake install failed" +} + +pkg_postinst() { + linux-mod_pkg_postinst + echo + einfo "ndiswrapper requires .inf and .sys files from a Windows(tm) driver" + einfo "to function. Download these to /root for example, then" + einfo "run 'ndiswrapper -i /root/foo.inf'. After that you can delete them." + einfo "They will be copied to the proper location." + einfo "Once done, please run 'modules-update'." + echo + einfo "check http://ndiswrapper.sf.net/mediawiki/index.php/List for drivers" + I=$(lspci -n | egrep 'Class (0280|0200):' | cut -d' ' -f4) + einfo "Look for the following on that page for your driver:" + einfo "Possible Hardware: ${I}" + echo + einfo "Please have a look at http://ndiswrapper.sourceforge.net/wiki/" + einfo "for the FAQ, HowTos, Tips, Configuration, and installation" + einfo "information." + echo + einfo "ndiswrapper devs need support(_hardware_, cash)." + einfo "Don't hesistate if you can help, see http://ndiswrapper.sf.net for details." + echo + + einfo "Attempting to automatically reinstall any Windows drivers" + einfo "you might already have." + for driver in $(ls /etc/ndiswrapper) + do + einfo "Driver: ${driver}" + mv /etc/ndiswrapper/${driver} ${T} + ndiswrapper -i ${T}/${driver}/${driver}.inf + done +} |