Index: /pkg/kev/non-free/rt2860-source/trunk/debian/changelog =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/changelog (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/changelog (revision 5498) @@ -0,0 +1,76 @@ +rt2860-source (2.1.2.0-1) unstable; urgency=low + + * New upstream stable release + - removed 01_remove-tft-lines-from-makefile and 03_wpa-fix + - added 01_add-network-mgr-support and 02_no2.4-in-kernelversion + + -- Alan Baghumian Mon, 15 Jun 2009 20:47:13 -0700 + +rt2860-source (1.8.0.0-3) unstable; urgency=low + + * Use KSRC variable so we can build for non-running kernels with + module assistant. + Closes: #506230 -- rt2860-source: uses "uname -r" to choos build dir + + -- Glenn Saberton Sat, 27 Dec 2008 13:17:30 +0900 + +rt2860-source (1.8.0.0-2) unstable; urgency=low + + * install kernel module in net/wireless, not wireless/ + Closes: #504459 -- rt2860-source: module should be installed in + .../drivers/net/wireless/ + Thanks to Eric Cooper for reporting. + * add debhelper to Recommends + Closes: #504127 -- rt2860- source: missing dependency on debhelper + still not Depends. + + -- Damyan Ivanov Tue, 04 Nov 2008 18:31:24 +0200 + +rt2860-source (1.8.0.0-1) unstable; urgency=low + + * New upstream version + * adapt 01_remove-tft-lines-from-makefile.patch + * drop 02_Fix-compilation-for-2.6.26.patch (applied upstream) + * adapt 03_wpa-fix.patch + * refresh 04_clean-install.patch + + * control/Uploaders: fix a typo in my name + * add debian/repack.sh and plug it in debian/watch + * move bzip2 from Build-Depends to Build-Depends-Indep + * fix Vcs-* URLs to point to the new repository + * rules: remove generated tools/bin2h during clean + * fix a typo in debian/copyright + * copyright: also note reverse engineering is prohibited + * README.Debian: + + give an example for building with m-a + + point to usr/share/doc/rt2860-source/README_STA.gz for more information + + README.Debian: reword the 'make;make install' variant + + README.Debian: remove the (not working) kpkg way of building + * stop suggesting kernel-package + * control: downgrade m-a from Depends to Recomments; make + goes to Suggests; drop debhelper + * control.modules.in: refer to -source/README.Debian for building + instructions + + -- Damyan Ivanov Mon, 20 Oct 2008 12:12:43 +0300 + +rt2860-source (1.7.0.0-2) unstable; urgency=low + + [ Damyan Ivanov ] + * Fix license + * Add Damyan Ivanov to Uploaders + * Build with wpasupplicant support + * Various debian/ file fixes + * Move the configuration dat file to doc + + [ Glenn Saberton ] + * Release 1.7.0.0-2 + + -- Glenn Saberton Mon, 15 Sep 2008 23:33:32 +0800 + +rt2860-source (1.7.0.0-1) unstable; urgency=low + + * Initial release. Closes: #497200 (ITP) + + -- Glenn Saberton Sat, 23 Aug 2008 14:43:38 +0800 + Index: /pkg/kev/non-free/rt2860-source/trunk/debian/patches/02_no2.4-in-kernelversion.patch =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/patches/02_no2.4-in-kernelversion.patch (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/patches/02_no2.4-in-kernelversion.patch (revision 5498) @@ -0,0 +1,17 @@ +--- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/config.mk 2009-04-20 21:30:17.000000000 -0400 ++++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/config.mk 2009-04-20 21:31:04.000000000 -0400 +@@ -235,14 +235,7 @@ export CFLAGS + endif + + ifeq ($(PLATFORM),PC) +- ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- # Linux 2.4 +- CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS) +- export CFLAGS +- else +- # Linux 2.6 + EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include +- endif + endif + + ifeq ($(PLATFORM),IXP) Index: /pkg/kev/non-free/rt2860-source/trunk/debian/patches/04_clean-install.patch =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/patches/04_clean-install.patch (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/patches/04_clean-install.patch (revision 5498) @@ -0,0 +1,20 @@ +# Do not install anything in build system's /etc directory, please +# also, no point of running depmod as the module is not yet in /lib +--- a/os/linux/Makefile.6 ++++ b/os/linux/Makefile.6 +@@ -72,15 +72,8 @@ clean: + rm -f ../../sta/.*.{cmd,flags,d} + + install: +- rm -rf $(DAT_PATH) +- $(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless) +- mkdir $(DAT_PATH) +- cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/. + install -d $(LINUX_SRC_MODULE) + install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) +- /sbin/depmod -a ${shell uname -r} + + uninstall: +-# rm -rf $(DAT_PATH) + rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) +- /sbin/depmod -a ${shell uname -r} Index: /pkg/kev/non-free/rt2860-source/trunk/debian/patches/01_add-network-mgr-support.patch =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/patches/01_add-network-mgr-support.patch (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/patches/01_add-network-mgr-support.patch (revision 5498) @@ -0,0 +1,17 @@ +--- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/config.mk 2009-03-26 20:20:43.000000000 -0400 ++++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/config.mk 2009-04-20 21:26:04.000000000 -0400 +@@ -6,12 +6,12 @@ HAS_28xx_QA=n + + #ifdef WPA_SUPPLICANT_SUPPORT + # Support Wpa_Supplicant +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + #endif // WPA_SUPPLICANT_SUPPORT // + + #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT + # Support Native WpaSupplicant for Network Maganger +-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n ++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // + + #Support Net interface block while Tx-Sw queue full Index: /pkg/kev/non-free/rt2860-source/trunk/debian/patches/series =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/patches/series (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/patches/series (revision 5498) @@ -0,0 +1,4 @@ +01_add-network-mgr-support.patch +02_no2.4-in-kernelversion.patch +04_clean-install.patch +05_makefile-ksrc.patch Index: /pkg/kev/non-free/rt2860-source/trunk/debian/patches/05_makefile-ksrc.patch =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/patches/05_makefile-ksrc.patch (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/patches/05_makefile-ksrc.patch (revision 5498) @@ -0,0 +1,20 @@ +diff --git a/Makefile b/Makefile +index 8f95bcc..e86370e 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,10 +63,15 @@ endif + + ifeq ($(PLATFORM),PC) + # Linux 2.6 ++ifndef KSRC + LINUX_SRC = /lib/modules/$(shell uname -r)/build + # Linux 2.4 Change to your local setting + #LINUX_SRC = /usr/src/linux-2.4 + LINUX_SRC_MODULE = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless/ ++else ++LINUX_SRC = $(KSRC) ++LINUX_SRC_MODULE = $(KSRC)/kernel/drivers/net/wireless/ ++endif + CROSS_COMPILE = + endif + Index: /pkg/kev/non-free/rt2860-source/trunk/debian/copyright =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/copyright (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/copyright (revision 5498) @@ -0,0 +1,85 @@ +This package was debianized by Glenn Saberton on +Sat, 23 Aug 2008 14:43:38 +0800. + +It was downloaded from http://www.ralinktech.com + +Non-free content +---------------- +This package is not part of Debian GNU/Linux because it contains two files -- +include/firmware.h and common/rt2860.bin -- licensed under a license that +prohibits their modification and limits their use (no reverse engineering +allowed for example). + +Upstream Author: Ralink Technology Inc. + +Copyright: Copyright (c) 2002-2007 Ralink Technology Inc. + +License: + include/firmware.h + ------------------ + (and presumably the binary blob from which this is generated - + common/rt2860.bin): + + Redistribution. Redistribution and use in binary form, without + modification, are permitted provided that the following conditions are + met: + + * Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. + * Neither the name of Ralink Technology Corporation nor the names of its + suppliers may be used to endorse or promote products derived from this + software without specific prior written permission. + * No reverse engineering, decompilation, or disassembly of this software + is permitted. + + Limited patent license. Ralink Technology Corporation grants a world-wide, + royalty-free, non-exclusive license under patents it now or hereafter + owns or controls to make, have made, use, import, offer to sell and + sell ("Utilize") this software, but solely to the extent that any + such patent is necessary to Utilize the software alone, or in + combination with an operating system licensed under an approved Open + Source license as listed by the Open Source Initiative at + http://opensource.org/licenses. The patent license shall not apply to + any other combinations which include this software. No hardware per + se is licensed hereunder. + + DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. + */ + /* AUTO GEN PLEASE DO NOT MODIFY IT */ + + + All the rest + ------------ + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is + (C) 2008, Glenn Saberton , + (C) 2008 Damyan Ivanov +and is licensed under the GNU General Public license, version 2 or later, see +above. + + Index: /pkg/kev/non-free/rt2860-source/trunk/debian/docs =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/docs (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/docs (revision 5498) @@ -0,0 +1,2 @@ +iwpriv_usage.txt +README_STA Index: /pkg/kev/non-free/rt2860-source/trunk/debian/rules =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/rules (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/rules (revision 5498) @@ -0,0 +1,62 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + dh_clean build-stamp install-stamp + dh_clean tools/bin2h + +install: build install-stamp +install-stamp: + dh_testdir + dh_testroot + dh_clean -k + + install -D -m 0755 debian/rules.modules \ + debian/tmp/modules/rt2860/debian/rules + + for f in *.modules.in control compat copyright changelog; do \ + install -m 0644 debian/$$f \ + debian/tmp/modules/rt2860/debian/; \ + done + + find . -path ./debian/\* -type d -prune -o -printf "%P\n" | \ + egrep -v 'debian|contrib|regression|.svn' | \ + cpio -admp debian/tmp/modules/rt2860/ + + mkdir -p debian/rt2860-source/usr/src/ + tar jcf debian/rt2860-source/usr/src/rt2860.tar.bz2 \ + -C debian/tmp modules + + touch $@ + +binary-arch: +# We have nothing to do by default. + +binary-indep: build install + dh_testdir + dh_testroot + dh_install + dh_installdocs + dh_installchangelogs + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean install binary-indep binary-arch binary + Index: /pkg/kev/non-free/rt2860-source/trunk/debian/README.source =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/README.source (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/README.source (revision 5498) @@ -0,0 +1,4 @@ +This package uses quilt for managing changes to upstream source. + +For more information about how to work with quilt, see +/usr/share/doc/quilt/README.source in `quilt' package. Index: /pkg/kev/non-free/rt2860-source/trunk/debian/control.modules.in =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/control.modules.in (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/control.modules.in (revision 5498) @@ -0,0 +1,22 @@ +Source: rt2860-source +Section: non-free/net +Priority: extra +Maintainer: Debian Eee PC Team +Uploaders: Glenn Saberton , + Damyan Ivanov +Build-Depends: debhelper (>= 7) +Standards-Version: 3.8.0 +Homepage: http://www.ralinktech.com/ +Vcs-Git: git://git.debian.org/git/debian-eeepc/rt2860.git +Vcs-Browser: http://git.debian.org/?p=debian-eeepc/rt2860.git + +Package: rt2860-modules-_KVERS_ +Architecture: any +Provides: rt2860-modules +Description: rt2860 modules for Linux (kernel _KVERS_). + This package contains the set of loadable kernel modules for the + rt2860 wireless chip. + . + This package contains the compiled kernel modules for _KVERS_ + . + See README.Debian in the rt2860-source package for building instructions. Index: /pkg/kev/non-free/rt2860-source/trunk/debian/README.Debian =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/README.Debian (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/README.Debian (revision 5498) @@ -0,0 +1,19 @@ +rt2860 for Debian +----------------- + +Please see /usr/share/doc/rt2860-source/README_STA.gz for a description of the +rt2860 software. + +The Debian rt2860 source package provides rt2860-source, +which provides the source for the kernel modules + +The rt2860-source package can be used in several ways, + + - Using module-assistant package. Run "m-a a-b rt2860" and install the + resulting package with "dpkg -i". + + - Unpack the sources in /usr/src/rt2860.tar.bz2 and follow the instructions in + README_STA This will build and install a module specific to the system you + are building on and is not under control of the packaging system. + + -- Glenn Saberton Sat, 23 Aug 2008 14:43:38 +0800 Index: /pkg/kev/non-free/rt2860-source/trunk/debian/repack.sh =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/repack.sh (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/repack.sh (revision 5498) @@ -0,0 +1,10 @@ +#!/bin/sh +# called with ’--upstream-version’ + +set -e +set -u + +# Upstream distributes bzip2-compressed tarballs +# we recompress it with gzip, ommitting timestamp and +# using maximum compression +bzcat "$3" | gzip -n -9 > "../rt2860-source_$2.orig.tar.gz" Index: /pkg/kev/non-free/rt2860-source/trunk/debian/control =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/control (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/control (revision 5498) @@ -0,0 +1,24 @@ +Source: rt2860-source +Section: non-free/net +Priority: extra +Maintainer: Debian Eee PC Team +Uploaders: Glenn Saberton , + Damyan Ivanov +Build-Depends: debhelper (>= 7), quilt +Build-Depends-Indep: bzip2 +Standards-Version: 3.8.0 +Homepage: http://www.ralinktech.com/ +Vcs-Git: git://git.debian.org/git/debian-eeepc/rt2860-source.git +Vcs-Browser: http://git.debian.org/?p=debian-eeepc/rt2860-source.git + +Package: rt2860-source +Architecture: all +Depends: bzip2 +Recommends: module-assistant, debhelper +Suggests: make +Description: source for RT2860 wireless adapter kernel module + RT2860 is a wireless adapter found particularly in the ASUS EeePC model + 901 and above. The package contains the source of a Linux kernel module for + it. + . + The source is ready to be compiled using module-assistant. Index: /pkg/kev/non-free/rt2860-source/trunk/debian/dirs =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/dirs (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/dirs (revision 5498) @@ -0,0 +1,2 @@ +usr/bin +usr/sbin Index: /pkg/kev/non-free/rt2860-source/trunk/debian/rules.modules =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/rules.modules (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/rules.modules (revision 5498) @@ -0,0 +1,51 @@ +#!/usr/bin/make -f + +PACKAGE := rt2860-modules +MA_DIR ?= /usr/share/modass +-include $(MA_DIR)/include/generic.make +-include $(MA_DIR)/include/common-rules.make + +TMP?= $(CURDIR)/debian/$(PKGNAME) + +.PHONY: kdist_config +kdist_config: prep-deb-files + +.PHONY: binary-modules +binary-modules: kdist_config + dh_testdir + dh_testroot + dh_clean -k + + # Build modules + $(MAKE) -C $(CURDIR) \ + KERNELPATH=$(KSRC) KERNELRELEASE=$(KVERS) KERNELCONF=$(KSRC)/.config + + # Install modules + $(MAKE) -C $(CURDIR) install \ + KERNELPATH=$(KSRC) KERNELRELEASE=$(KVERS) KERNELCONF=$(KSRC)/.config \ + LINUX_SRC_MODULE=$(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/drivers/net/wireless + # upstream has some .dat file to be used in the absence of + # wpa_supplicant/network-manager/iwconfig/iwpriv in /etc/Wireless + # ship that in doc/examples instead + # (os/linux/Makefile.6's install target is patched not to fiddle + # with /etc/) + dh_installdirs usr/share/doc/$(PKGNAME)/examples + cp RT2860STA.dat $(TMP)/usr/share/doc/$(PKGNAME)/examples/ + + dh_installdocs + dh_installchangelogs + dh_compress + dh_fixperms + dh_installmodules + dh_installdeb + dh_gencontrol -- -v$(VERSION) + dh_md5sums + dh_builddeb --destdir=$(DEB_DESTDIR) + +.PHONY: kdist_clean +kdist_clean: + dh_testdir + dh_testroot + dh_clean + $(MAKE) -C $(CURDIR) clean \ + KERNELPATH=$(KSRC) KERNELRELEASE=$(KVERS) KERNELCONF=$(KSRC)/.config Index: /pkg/kev/non-free/rt2860-source/trunk/debian/compat =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/compat (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/compat (revision 5498) @@ -0,0 +1,1 @@ +7 Index: /pkg/kev/non-free/rt2860-source/trunk/debian/watch =================================================================== --- /pkg/kev/non-free/rt2860-source/trunk/debian/watch (revision 5498) +++ /pkg/kev/non-free/rt2860-source/trunk/debian/watch (revision 5498) @@ -0,0 +1,4 @@ +version=3 +http://www.ralinktech.com/ralink/Home/Support/Linux.html \ + .*/drivers/(?:.*)RT2860_Linux_STA_v([\d.]+)\.tar\.bz2 \ + debian debian/repack.sh