r21 - in unstable/rt2x00/debian: . patches
benh at alioth.debian.org
benh at alioth.debian.org
Sun Sep 23 21:23:50 UTC 2007
Author: benh
Date: 2007-09-23 21:23:50 +0000 (Sun, 23 Sep 2007)
New Revision: 21
Added:
unstable/rt2x00/debian/patches/002_out_of_tree.diff
unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff
Removed:
unstable/rt2x00/debian/docs.modules.in
unstable/rt2x00/debian/patches/000_version.diff
unstable/rt2x00/debian/patches/001_debugfs.diff
unstable/rt2x00/debian/rt2x00-source.docs
Modified:
unstable/rt2x00/debian/changelog
unstable/rt2x00/debian/control
unstable/rt2x00/debian/copyright
unstable/rt2x00/debian/patches/series
unstable/rt2x00/debian/rt2x00-source.README.Debian
unstable/rt2x00/debian/rules
Log:
Updated for new upstream version using in-tree mac80211.
Removed installation of documents no longer present in upstream source.
Removed obsolete patches.
Added patches to build drivers out-of-tree and on Linux 2.6.22.
Updated copyright holders and upstream source location.
Modified: unstable/rt2x00/debian/changelog
===================================================================
--- unstable/rt2x00/debian/changelog 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/changelog 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,3 +1,10 @@
+rt2x00 (2.0.8+git20070918-1) unstable; urgency=low
+
+ * New version from git (closes: bug#421747, bug#422685)
+ - Fixes suspend/resume problems (closes: bug#413444)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 23 Sep 2007 22:00:31 +0100
+
rt2x00 (0cvs20070219-2) unstable; urgency=low
* Switch maintainer to "Debian Ralink packages maintainers".
@@ -93,7 +100,3 @@
* Initial Release (closes: bug#362040).
-- Aurelien Jarno <aurel32 at debian.org> Fri, 21 Jul 2006 17:27:45 +0200
-
-Local variables:
-mode: debian-changelog
-End:
Modified: unstable/rt2x00/debian/control
===================================================================
--- unstable/rt2x00/debian/control 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/control 2007-09-23 21:23:50 UTC (rev 21)
@@ -24,5 +24,4 @@
or simply use the module-assistant utility.
.
WARNING: This driver is still experimental, it only works for a few
- cards. You will need a 2.6.17 or later kernel to use it.
-
+ cards. You will need a 2.6.22 or later kernel to use it.
Modified: unstable/rt2x00/debian/copyright
===================================================================
--- unstable/rt2x00/debian/copyright 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/copyright 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,14 +1,14 @@
This package was debianized by Aurelien Jarno <aurel32 at debian.org> on
Fri, 21 Jul 2006 17:27:45 +0200.
-It was downloaded from http://rt2x00.serialmonkey.com/
+It uses source from:
-Copyright
+ git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/
- This package is copyright Ivo van Doorn <ivd at euronet.nl>, Luis Correia
- <lfcorreia at users.sf.net>, Mark Wallis <mwallis at serialmonkey.com> and
- others. See THANKS for more detail.
+Copyright:
+ rt2x00 is copyright 2004-2007 rt2x00 SourceForge Project,
+
License:
This program is free software; you can redistribute it and/or modify
Deleted: unstable/rt2x00/debian/docs.modules.in
===================================================================
--- unstable/rt2x00/debian/docs.modules.in 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/docs.modules.in 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,2 +0,0 @@
-README
-THANKS
Deleted: unstable/rt2x00/debian/patches/000_version.diff
===================================================================
--- unstable/rt2x00/debian/patches/000_version.diff 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/patches/000_version.diff 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,11 +0,0 @@
---- rt2x00.h
-+++ rt2x00.h
-@@ -45,7 +45,7 @@
- #define DRV_NAME "rt2x00"
- #endif /* DRV_NAME */
- #define DRV_VERSION "CVS"
--#define DRV_RELDATE "N/A"
-+#define DRV_RELDATE "20070219"
- #define DRV_PROJECT "http://rt2x00.serialmonkey.com"
-
- /*
Deleted: unstable/rt2x00/debian/patches/001_debugfs.diff
===================================================================
--- unstable/rt2x00/debian/patches/001_debugfs.diff 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/patches/001_debugfs.diff 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,11 +0,0 @@
---- config 2007-03-06 00:22:49.000000000 +0100
-+++ config 2007-03-06 00:23:01.000000000 +0100
-@@ -72,7 +72,7 @@
- #
-
- # Enable rt2x00 debugfs support
--CONFIG_RT2X00_DEBUGFS=y
-+CONFIG_RT2X00_DEBUGFS=n
- # Enable rt2x00 debugfs asm file creation
- CONFIG_RT2X00_DEBUGFS_ASM=n
-
Added: unstable/rt2x00/debian/patches/002_out_of_tree.diff
===================================================================
--- unstable/rt2x00/debian/patches/002_out_of_tree.diff (rev 0)
+++ unstable/rt2x00/debian/patches/002_out_of_tree.diff 2007-09-23 21:23:50 UTC (rev 21)
@@ -0,0 +1,82 @@
+--- rt2x00.orig/drivers/net/wireless/rt2x00/Makefile
++++ rt2x00/drivers/net/wireless/rt2x00/Makefile
+@@ -1,3 +1,9 @@
++SUBDIRS ?= $(shell pwd)
++
++# Include kernel and rt2x00 config
++include $(KSRC)/.config
++include $(SUBDIRS)/config
++
+ rt2x00lib-objs := rt2x00dev.o rt2x00mac.o rt2x00config.o
+
+ ifeq ($(CONFIG_RT2X00_LIB_DEBUGFS),y)
+@@ -20,3 +26,22 @@
+ obj-$(CONFIG_RT61PCI) += rt61pci.o
+ obj-$(CONFIG_RT2500USB) += rt2500usb.o
+ obj-$(CONFIG_RT73USB) += rt73usb.o
++
++CPPFLAGS += -I$(SUBDIRS)/../../../../include
++
++default: $(SUBDIRS)/config.h
++ $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) modules
++
++$(SUBDIRS)/config.h: $(SUBDIRS)/config
++ awk -F = > $(SUBDIRS)/config.h < $(SUBDIRS)/config '/^CONFIG.*$\/ \
++ { \
++ if($$2 == "y") { \
++ print "#define " $$1; \
++ } else { \
++ print "#undef " $$1; \
++ } \
++ }'
++
++clean:
++ $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) clean
++ rm -f $(SUBDIRS)/config.h
+--- /dev/null
++++ rt2x00/drivers/net/wireless/rt2x00/config
+@@ -0,0 +1,16 @@
++CONFIG_RT2X00=m
++CONFIG_RT2X00_LIB=m
++CONFIG_RT2X00_LIB_PCI=m
++CONFIG_RT2X00_LIB_USB=m
++CONFIG_RT2X00_LIB_FIRMWARE=y
++CONFIG_RT2X00_LIB_RFKILL=n
++CONFIG_RT2400PCI=m
++CONFIG_RT2400PCI_RFKILL=n
++CONFIG_RT2500PCI=m
++CONFIG_RT2500PCI_RFKILL=n
++CONFIG_RT61PCI=m
++CONFIG_RT61PCI_RFKILL=n
++CONFIG_RT2500USB=m
++CONFIG_RT73USB=m
++CONFIG_RT2X00_LIB_DEBUGFS=y
++CONFIG_RT2X00_DEBUG=y
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt2x00.h
++++ rt2x00/drivers/net/wireless/rt2x00/rt2x00.h
+@@ -38,6 +38,8 @@
+ #include "rt2x00reg.h"
+ #include "rt2x00ring.h"
+
++#include "config.h"
++
+ /*
+ * Module information.
+ * DRV_NAME should be set within the individual module source files.
+--- /dev/null
++++ rt2x00/drivers/misc/Makefile
+@@ -0,0 +1,14 @@
++SUBDIRS ?= $(shell pwd)
++
++# Include kernel config
++include $(KSRC)/.config
++
++obj-m += eeprom_93cx6.o
++
++CPPFLAGS += -I$(SUBDIRS)/../../include
++
++default:
++ $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) modules
++
++clean:
++ $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) clean
Added: unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff
===================================================================
--- unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff (rev 0)
+++ unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff 2007-09-23 21:23:50 UTC (rev 21)
@@ -0,0 +1,23 @@
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt2x00.h
++++ rt2x00/drivers/net/wireless/rt2x00/rt2x00.h
+@@ -31,6 +31,7 @@
+ #include <linux/skbuff.h>
+ #include <linux/workqueue.h>
+ #include <linux/firmware.h>
++#include <linux/version.h>
+
+ #include <net/mac80211.h>
+
+@@ -806,4 +807,12 @@
+ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev);
+ #endif /* CONFIG_PM */
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++#define ieee80211_rts_get(hw, if_id, frame, frame_len, frame_txctl, rts) \
++ ieee80211_rts_get(hw, frame, frame_len, frame_txctl, rts)
++#define ieee80211_ctstoself_get(hw, if_id, frame, frame_len, frame_txctl, cts) \
++ ieee80211_ctstoself_get(hw, frame, frame_len, frame_txctl, cts)
++#define IEEE80211_TXCTL_LONG_RETRY_LIMIT 0
++#endif
++
+ #endif /* RT2X00_H */
Modified: unstable/rt2x00/debian/patches/series
===================================================================
--- unstable/rt2x00/debian/patches/series 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/patches/series 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,2 +1,2 @@
-000_version.diff -p0
-001_debugfs.diff -p0
+002_out_of_tree.diff
+003_workaround_2.6.22.diff
Modified: unstable/rt2x00/debian/rt2x00-source.README.Debian
===================================================================
--- unstable/rt2x00/debian/rt2x00-source.README.Debian 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/rt2x00-source.README.Debian 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,10 +1,9 @@
README.Debian for rt2x00-source
-Aurelien Jarno <aurel32 at debian.org>
-$Id: rt2x00-source.README.Debian,v 1.0 2006/07/21 19:59:42 aurel32 Exp $
+Ben Hutchings <ben at decadent.org.uk>, Aurelien Jarno <aurel32 at debian.org>
,----
| WARNING: This driver is still experimental, it only works for a few
-| cards. You will need a 2.6.17 or later kernel to use it.
+| cards. You will need a 2.6.22 or later kernel to use it.
`----
This package is a source package that can be used to build modules that
@@ -27,25 +26,3 @@
- The "by hand" way: if you prefer handling your kernel by hand, then
you're supposed to know what to do with rt2x00-source and I won't
bother you any longer.
-
-There also used to be a third way, using kernel-package. It's been
-removed (module-assistant becoming the standard way to build modules
-/in Debian). For reference, here's the text that used to be above
-(will probably be removed in some future version):
-,----
-| You probably want to use kernel-package for building these modules.
-| Install it and read /usr/share/kernel-package/README.modules. Having
-| built a kernel with kernel-package, it should suffice to be in the top
-| directory of your kernel source tree and run:
-|
-| make-kpkg modules-image
-|
-| If you are using a prebuilt Debian kernel, the process is almost the
-| same. Enter in the directory containing the kernel headers
-| corresponding to your kernel and run make-kpkg:
-|
-| cd /usr/src/linux-headers-2.6.17-2-686/
-| make-kpkg modules-image
-`----
-
-
Deleted: unstable/rt2x00/debian/rt2x00-source.docs
===================================================================
--- unstable/rt2x00/debian/rt2x00-source.docs 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/rt2x00-source.docs 2007-09-23 21:23:50 UTC (rev 21)
@@ -1,2 +0,0 @@
-README
-THANKS
Modified: unstable/rt2x00/debian/rules
===================================================================
--- unstable/rt2x00/debian/rules 2007-09-23 21:19:22 UTC (rev 20)
+++ unstable/rt2x00/debian/rules 2007-09-23 21:23:50 UTC (rev 21)
@@ -28,7 +28,6 @@
clean:
dh_testdir
dh_testroot
- -$(MAKE) -C Module clean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean
rm -rf debian/build
@@ -40,12 +39,9 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- # Copy most of the source tree into the temp directory and clean it
- cd $(CURDIR) \
- && find . -path ./debian/\* -type d -prune -o -print \
- | egrep -v 'RPM|CVS|debian' \
- | cpio -admp $(CURDIR)/debian/build/usr/src/modules/rt2x00
- cp -f $(CURDIR)/{README,THANKS,CHANGELOG} $(CURDIR)/debian/build/usr/src/modules/rt2x00
+ # Copy the source code into the temp directory
+ mkdir -p debian/build/usr/src/modules/rt2x00
+ cp -dpR drivers include debian/build/usr/src/modules/rt2x00/
ln -s /usr/share/doc/rt2x00-source/README.Debian $(CURDIR)/debian/build/usr/src/modules/rt2x00/INSTALL.Debian
mkdir $(CURDIR)/debian/build/usr/src/modules/rt2x00/debian
@@ -53,12 +49,8 @@
cp -f $(CURDIR)/debian/changelog $(CURDIR)/debian/build/usr/src/modules/rt2x00/debian
cp -f $(CURDIR)/debian/compat $(CURDIR)/debian/build/usr/src/modules/rt2x00/debian
cp -f $(CURDIR)/debian/copyright $(CURDIR)/debian/build/usr/src/modules/rt2x00/debian
- cp -f $(CURDIR)/debian/rt2x00-source.docs $(CURDIR)/debian/build/usr/src/modules/rt2x00/debian/docs
cp -f $(CURDIR)/debian/rules $(CURDIR)/debian/build/usr/src/modules/rt2x00/debian
- -cd $(CURDIR)/debian/build/usr/src/modules/rt2x00 \
- && make clean
-
touch build-indep-stamp
install-indep: build-indep install-indep-stamp
@@ -67,7 +59,7 @@
dh_testroot
dh_clean -i -k
dh_installdirs -i
-
+
# Pack this up into a tarball
chown -R root.src debian/build/usr/src/modules
mkdir -p debian/rt2x00-source/usr/src
@@ -95,7 +87,7 @@
dh_installman -i
# dh_installinfo -i
dh_installmodules -i
- dh_installchangelogs -i CHANGELOG
+ dh_installchangelogs -i
dh_strip -i
dh_link -i
dh_compress -i
@@ -124,16 +116,22 @@
dh_installdirs lib/modules/$(KVERS)/kernel/drivers/net/wireless
# Build modules
- $(MAKE) KERNDIR=$(KSRC)
- for i in *.ko ; do \
- install -m 0644 $$i $(CURDIR)/debian/rt2x00-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless ; \
+ $(MAKE) -C drivers/net/wireless/rt2x00
+ mkdir -p debian/rt2x00-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless
+ for i in drivers/net/wireless/rt2x00/*.ko ; do \
+ install -m 0644 $$i debian/rt2x00-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net/wireless ; \
done
+ $(MAKE) -C drivers/misc
+ mkdir -p debian/rt2x00-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/misc
+ for i in drivers/misc/*.ko ; do \
+ install -m 0644 $$i debian/rt2x00-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/misc ; \
+ done
dh_testdir
dh_testroot
dh_installdocs
dh_installmodules
- dh_installchangelogs CHANGELOG
+ dh_installchangelogs
dh_link
dh_strip
dh_compress
@@ -145,5 +143,6 @@
.PHONY: kdist_clean
kdist_clean:
- $(MAKE) clean KERNDIR=$(KSRC)
+ $(MAKE) -C drivers/net/wireless/rt2x00 clean
+ $(MAKE) -C drivers/misc clean
-dh_clean
More information about the Pkg-ralink-commits
mailing list