Daniel, I'm guessing that you ran into the fact that debian/bin/gencontrol.py in firmware-nonfree doesn't work with the current linux-support package. Here's a patch that seems to fix that, and a patch that adds the metadata for the Ralink firmware. If you don't have time to commit and upload, please could you ask tbm (or another admin) to add me to the kernel group on Alioth so that I can do this myself. Ben. -- Ben Hutchings Every program is either trivial or else contains at least one bug
Index: firmware-nonfree/debian/bin/gencontrol.py
===================================================================
--- firmware-nonfree/debian/bin/gencontrol.py (revision 9717)
+++ firmware-nonfree/debian/bin/gencontrol.py (working copy)
@@ -8,7 +8,7 @@
class PackageDescription(object):
__slots__ = "short", "long"
- _wrap = wrap(width = 74, fix_sentence_endings = True).wrap
+ _wrap = TextWrapper(width = 74, fix_sentence_endings = True).wrap
def __init__(self, value = None):
self.long = []
@@ -40,9 +40,9 @@
def append_pre(self, l):
self.long.append(l)
-package._fields['Description'] = PackageDescription
+Package._fields['Description'] = PackageDescription
-class packages_list(sorted_dict):
+class PackagesList(SortedDict):
def append(self, package):
self[package['Package']] = package
@@ -50,14 +50,14 @@
for package in packages:
self[package['Package']] = package
-class gencontrol(object):
+class GenControl(object):
def __init__(self, kernelversion):
self.config = ConfigReader()
- self.templates = templates()
+ self.templates = Templates()
self.kernelversion = kernelversion
def __call__(self):
- packages = packages_list()
+ packages = PackagesList()
makefile = []
self.do_source(packages)
@@ -146,16 +146,11 @@
def process_relation(self, key, e, in_e, vars):
in_dep = in_e[key]
- dep = package_relation_list()
+ dep = PackageRelation()
for in_groups in in_dep:
- groups = package_relation_group()
+ groups = PackageRelationGroup()
for in_item in in_groups:
- item = package_relation()
- item.name = self.substitute(in_item.name, vars)
- if in_item.version is not None:
- item.version = self.substitute(in_item.version, vars)
- item.arches = in_item.arches
- groups.append(item)
+ groups.append(PackageRelationEntry(str(in_item)))
dep.append(groups)
e[key] = dep
@@ -168,9 +163,9 @@
e['Description'] = desc
def process_package(self, in_entry, vars):
- e = package()
+ e = Package()
for key, value in in_entry.iteritems():
- if isinstance(value, package_relation_list):
+ if isinstance(value, PackageRelation):
self.process_relation(key, e, in_entry, vars)
elif key == 'Description':
self.process_description(e, in_entry, vars)
@@ -217,11 +212,11 @@
f.write("%s: %s\n" % (key, value))
f.write('\n')
-class ConfigReader(debian_linux.config.config_reader):
+class ConfigReader(debian_linux.config.ConfigReaderCore):
schema = {
- 'files': debian_linux.config.schema_item_list(),
- 'packages': debian_linux.config.schema_item_list(),
- 'support': debian_linux.config.schema_item_list(),
+ 'files': debian_linux.config.SchemaItemList(),
+ 'packages': debian_linux.config.SchemaItemList(),
+ 'support': debian_linux.config.SchemaItemList(),
}
def __init__(self):
@@ -229,8 +224,8 @@
self._readBase()
def _readBase(self):
- files = self._get_files(self.config_name)
- config = debian_linux.config.config_parser(self.schema, files)
+ files = self.getFiles(self.config_name)
+ config = debian_linux.config.ConfigParser(self.schema, files)
packages = config['base',]['packages']
@@ -246,8 +241,8 @@
self._readPackage(package)
def _readPackage(self, package):
- files = self._get_files("%s/%s" % (package, self.config_name))
- config = debian_linux.config.config_parser(self.schema, files)
+ files = self.getFiles("%s/%s" % (package, self.config_name))
+ config = debian_linux.config.ConfigParser(self.schema, files)
self['base', package] = config['base',]
@@ -259,4 +254,4 @@
self[tuple(real)] = config[section]
if __name__ == '__main__':
- gencontrol(sys.argv[1])()
+ GenControl(sys.argv[1])()
Index: firmware-nonfree/debian/rules.defs
===================================================================
--- firmware-nonfree/debian/rules.defs (revision 9717)
+++ firmware-nonfree/debian/rules.defs (working copy)
@@ -1 +1 @@
-KERNELVERSION := 2.6.21-2
+KERNELVERSION := 2.6.22-3
Index: firmware-nonfree/rt61/LICENSE
===================================================================
--- firmware-nonfree/rt61/LICENSE (revision 0)
+++ firmware-nonfree/rt61/LICENSE (revision 0)
@@ -0,0 +1,39 @@
+Copyright (c) 2007, Ralink Technology Corporation
+All rights reserved.
+
+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.
Index: firmware-nonfree/rt61/defines
===================================================================
--- firmware-nonfree/rt61/defines (revision 0)
+++ firmware-nonfree/rt61/defines (revision 0)
@@ -0,0 +1,19 @@
+[base]
+desc: rt61 and rt61pci wireless network drivers
+files:
+ rt2561.bin
+ rt2561s.bin
+ rt2661.bin
+longdesc: PCI and CardBus wireless network cards with the Ralink
+ RT2501 [Turbo], RT2600, RT5201 [Turbo] or RT5600 chipset,
+ supported by the rt61 and rt61pci drivers
+uri: http://www.ralinktech.com/ralink/Home/Support/Linux.html
+
+[rt2561.bin]
+desc: Ralink RT2561 (RT2501/RT5201 chipset) firmware
+
+[rt2561s.bin]
+desc: Ralink RT2561S (RT2501 Turbo/RT5201 Turbo chipset) firmware
+
+[rt2661.bin]
+desc: Ralink RT2661 (RT2600/RT5600 chipset) firmware
Index: firmware-nonfree/rt73/LICENSE
===================================================================
--- firmware-nonfree/rt73/LICENSE (revision 0)
+++ firmware-nonfree/rt73/LICENSE (revision 0)
@@ -0,0 +1,39 @@
+Copyright (c) 2007, Ralink Technology Corporation
+All rights reserved.
+
+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.
Index: firmware-nonfree/rt73/defines
===================================================================
--- firmware-nonfree/rt73/defines (revision 0)
+++ firmware-nonfree/rt73/defines (revision 0)
@@ -0,0 +1,10 @@
+[base]
+desc: rt73 and rt73usb wireless network drivers
+files:
+ rt73.bin
+longdesc: USB wireless network cards with the Ralink RT2501USB
+ or RT5201USB chipset, supported by the rt73 and rt73usb drivers
+uri: http://www.ralinktech.com/ralink/Home/Support/Linux.html
+
+[rt73.bin]
+desc: Ralink RT2571W/RT2671 (RT2501USB/RT5201USB chipset) firmware
Index: firmware-nonfree/defines
===================================================================
--- firmware-nonfree/defines (revision 9717)
+++ firmware-nonfree/defines (working copy)
@@ -3,3 +3,5 @@
ipw3945
iwlwifi
qlogic
+ rt61
+ rt73
Attachment:
signature.asc
Description: This is a digitally signed message part