diff options
| -rw-r--r-- | net-wireless/rt2x00/ChangeLog | 9 | ||||
| -rw-r--r-- | net-wireless/rt2x00/Manifest | 9 | ||||
| -rw-r--r-- | net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta2-r1 | 1 | ||||
| -rw-r--r-- | net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3 | 1 | ||||
| -rw-r--r-- | net-wireless/rt2x00/files/rt2x00-2.0.0-beta2.patch | 107 | ||||
| -rw-r--r-- | net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild (renamed from net-wireless/rt2x00/rt2x00-2.0.0_beta2-r1.ebuild) | 11 |
6 files changed, 14 insertions, 124 deletions
diff --git a/net-wireless/rt2x00/ChangeLog b/net-wireless/rt2x00/ChangeLog index 7205ca0cb6bd..e25ed8589cd8 100644 --- a/net-wireless/rt2x00/ChangeLog +++ b/net-wireless/rt2x00/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/rt2x00 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.4 2005/11/26 16:04:35 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.5 2005/12/19 15:54:58 uberlord Exp $ + +*rt2x00-2.0.0_beta3 (19 Dec 2005) + + 19 Dec 2005; Roy Marples <uberlord@gentoo.org> + -files/rt2x00-2.0.0-beta2.patch, -rt2x00-2.0.0_beta2-r1.ebuild, + +rt2x00-2.0.0_beta3.ebuild: + Version bump. 26 Nov 2005; Roy Marples <uberlord@gentoo.org> -rt2x00-2.0.0_beta2.ebuild, rt2x00-2.0.0_beta2-r1.ebuild, rt2x00-9999.ebuild: diff --git a/net-wireless/rt2x00/Manifest b/net-wireless/rt2x00/Manifest index dacfb6abc1e5..cc7a06c16a67 100644 --- a/net-wireless/rt2x00/Manifest +++ b/net-wireless/rt2x00/Manifest @@ -1,7 +1,6 @@ MD5 68dd7a4754bf27ec87dc220c66959c76 ChangeLog 1007 -MD5 54ee82472260168806fb057169ea7b48 rt2x00-9999.ebuild 2484 -MD5 9b4c78cc466fd2e16b2818dc1963d081 rt2x00-2.0.0_beta2-r1.ebuild 2604 -MD5 d881dd1c4bfd4e45a852f320b5a973c7 metadata.xml 315 -MD5 8f60581425bcdcef4e28a376b29a3dfa files/rt2x00-2.0.0-beta2.patch 3064 -MD5 f84ccb94a3aa44174c09b91028354a40 files/digest-rt2x00-2.0.0_beta2-r1 67 +MD5 249132d59cf43ab39a9e65d88a672658 files/digest-rt2x00-2.0.0_beta3 67 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rt2x00-9999 0 +MD5 d881dd1c4bfd4e45a852f320b5a973c7 metadata.xml 315 +MD5 8538d00939860d485b7ef11cf26349da rt2x00-2.0.0_beta3.ebuild 2302 +MD5 54ee82472260168806fb057169ea7b48 rt2x00-9999.ebuild 2484 diff --git a/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta2-r1 b/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta2-r1 deleted file mode 100644 index c7afd3f178af..000000000000 --- a/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4bf731328df460934110569551635c99 rt2x00-2.0.0-b2.tar.gz 130690 diff --git a/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3 b/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3 new file mode 100644 index 000000000000..330829b105ff --- /dev/null +++ b/net-wireless/rt2x00/files/digest-rt2x00-2.0.0_beta3 @@ -0,0 +1 @@ +MD5 4881d742ee49d3ea12c435a91deacd41 rt2x00-2.0.0-b3.tar.gz 133603 diff --git a/net-wireless/rt2x00/files/rt2x00-2.0.0-beta2.patch b/net-wireless/rt2x00/files/rt2x00-2.0.0-beta2.patch deleted file mode 100644 index 587c60efc409..000000000000 --- a/net-wireless/rt2x00/files/rt2x00-2.0.0-beta2.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- Makefile 2005-10-22 03:11:18.000000000 +0100 -+++ Makefile 2005-11-04 13:10:41.000000000 +0000 -@@ -19,8 +19,6 @@ - # Module: Makefile - # Abstract: Makefile for rt2x00 kernel module - --all: default -- - obj-m += rt2x00core.o - obj-m += rt2400pci.o - obj-m += rt2500pci.o -@@ -38,22 +36,49 @@ - KERNEL_OUTPUT := - endif - -+ifdef KBUILD_EXTMOD -+ IEEE80211_DIR := $(KBUILD_EXTMOD)/ieee80211 -+else -+ IEEE80211_DIR := ieee80211 -+endif -+ -+MAKEFLAGS += --no-print-directory -+CFLAGS := -I$(IEEE80211_DIR) -include $(IEEE80211_DIR)/net/ieee80211_compat.h $(CFLAGS) -+CPPFLAGS := -I$(IEEE80211_DIR) -include $(IEEE80211_DIR)/net/ieee80211_compat.h $(CPPFLAGS) -+ -+all: debug - default: debug -+nodebug: ieee80211-nodebug update-symbols rt2x00-nodebug -+debug: ieee80211-debug update-symbols rt2x00-debug -+install: ieee80211-install rt2x00-install -+clean: ieee80211-clean rt2x00-clean -+ -+update-symbols: -+ @mkdir -p .tmp_versions -+ @cp $(IEEE80211_DIR)/.tmp_versions/*.mod .tmp_versions -+ -+ieee80211-nodebug: -+ @$(MAKE) -C $(IEEE80211_DIR) nodebug -+ -+ieee80211-debug: -+ @$(MAKE) -C $(IEEE80211_DIR) debug -+ -+ieee80211-install: -+ @$(MAKE) -C $(IEEE80211_DIR) install -+ -+ieee80211-clean: -+ @$(MAKE) -C $(IEEE80211_DIR) clean -+ -+rt2x00-nodebug: -+ @$(MAKE) -C $(KERNEL_SOURCES) SUBDIRS=$(shell pwd) $(KERNEL_OUTPUT) modules - --nodebug: -- @$(MAKE) -C $(KERNEL_SOURCES) \ -- EXTRA_CFLAGS="-DEXPORT_SYMTAB" SUBDIRS=$(shell pwd) $(KERNEL_OUTPUT) \ -- modules -- --debug: -- @$(MAKE) -C $(KERNEL_SOURCES) \ -- EXTRA_CFLAGS="-DEXPORT_SYMTAB -DCONFIG_RT2X00_DEBUG" SUBDIRS=$(shell pwd) $(KERNEL_OUTPUT) \ -- modules -+rt2x00-debug: -+ @$(MAKE) -C $(KERNEL_SOURCES) SUBDIRS=$(shell pwd) EXTRA_CFLAGS="-DCONFIG_RT2X00_DEBUG" $(KERNEL_OUTPUT) modules - --install: -- @$(MAKE) -C $(KERNEL_SOURCES) SUBDIRS=$(shell pwd) $(KERNEL_OUTPUT) modules_install -+rt2x00-install: -+ @$(MAKE) -C $(KERNEL_SOURCES) SUBDIRS=$(shell pwd) INSTALL_MOD_DIR=rt2x00 $(KERNEL_OUTPUT) modules_install - /sbin/depmod -a - --clean: -+rt2x00-clean: - @rm -f *.o *.ko .*.cmd .*.flags *.mod.c .*.o.d *~ -- @rm -fr .tmp_versions -+ @rm -fr .tmp_versions -\ No newline at end of file -+++ ieee80211_compat.h 2005-11-03 11:45:28.000000000 +0000 -@@ -0,0 +1,30 @@ -+/* -+ * RT2X00 Compatability fixes for specific kernels. -+ */ -+#ifndef IEEE_COMPAT_H -+#define IEEE_COMPAT_H -+ -+#include <linux/kernel.h> -+#include <linux/version.h> -+#include <linux/etherdevice.h> -+ -+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 13) -+typedef unsigned __nocast gfp_t; -+ -+static inline int is_broadcast_ether_addr(const u8 *addr) -+{ -+ return (addr[0] & addr[1] & addr[2] & addr[3] & addr[4] & addr[5]) == 0xff; -+} -+#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 13) */ -+ -+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 14) -+static inline unsigned compare_ether_addr(const u8 *_a, const u8 *_b) -+{ -+ const u16 *a = (const u16 *) _a; -+ const u16 *b = (const u16 *) _b; -+ -+ BUILD_BUG_ON(ETH_ALEN != 6); -+ return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0; -+} -+#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 14) */ -+#endif /* IEEE_COMPAT_H */ diff --git a/net-wireless/rt2x00/rt2x00-2.0.0_beta2-r1.ebuild b/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild index 6866cc9e1dbe..24796e6e0d27 100644 --- a/net-wireless/rt2x00/rt2x00-2.0.0_beta2-r1.ebuild +++ b/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-2.0.0_beta2-r1.ebuild,v 1.2 2005/11/26 16:04:35 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-2.0.0_beta3.ebuild,v 1.1 2005/12/19 15:54:58 uberlord Exp $ inherit linux-mod eutils @@ -61,15 +61,6 @@ src_install() { dodoc CHANGELOG COPYING README THANKS } -src_unpack() { - unpack "${A}" - cd "${S}" - # Fix Makefile so the debug flag works and enable compliation - # against the ieee80211 stack in portage - epatch "${FILESDIR}/rt2x00-2.0.0-beta2.patch" - sed -i 's,^\(CFLAGS\|CPPFLAGS\) := .*,\1 := -include ieee80211_compat.h $(\1) -I/usr/include,g' Makefile -} - src_compile() { linux-mod_src_compile |