Re: firmware-nonfree : ipw2200 ?
On Mon, 2008-10-27 at 10:49 +0100, Franklin PIAT wrote:
> On Mon, 2008-10-27 at 00:52 +, Ben Hutchings wrote:
> > On Mon, 2008-10-27 at 00:40 +0100, Frank Lin PIAT wrote:
> > > Hello,
> > >
> > > Here's a patch that adds firmware-ipw2200 to firmware-nonfree_0.13.
> >
> > No attachments appeared on the list; please try again. ;-)
>
> Sorry, here is the patch.
> I haven't attached the binary blobs. They are available from:
> http://ipw2200.sourceforge.net/firmware.php?fid=7
>
> The patch is against the firmware-nonfree_0.13 package, not against the
> SVN repository.
Here's a new patch, for gencontrol.py
> > > The patch probably needs some minor adjustments (I didn't completely
> > > understand how debian/bin/gencontrol.py is used)
> > [...]
> >
> > gencontrol.py reads a list of directories from "defines" [..]
> According to the license, I need to place a symlink to the license,
> in /lib/firmware (sorry lintian and fhs). Should I :
> 1. create a [links] section in the define (and modify gencontrol)
> 2. create a ipw2200/links file (and copy it to debian/*.links)
> 3. create a file debian/firmware-ipw2200.links [ouch].
> 4. do something else (maybe in debian/templates)?
Finally, I've implemented a Links header in ipw2200/defines's main
section. A file debian/firmware-ipw2200.links is built from that info.
So my first patch implements a links support in the "define" files.
A second patch implements ipw2200 support.
Franklin
I place the code I'm submitting is in the Public Domain.
diff -r -u firmware-nonfree-orig/debian/bin/gencontrol.py firmware-nonfree-new/debian/bin/gencontrol.py
--- firmware-nonfree-orig/debian/bin/gencontrol.py 2008-10-26 21:20:47.0 +0100
+++ firmware-nonfree-new/debian/bin/gencontrol.py 2008-10-28 18:51:04.0 +0100
@@ -134,6 +134,11 @@
postinst = self.templates['postinst.initramfs-tools']
file("debian/firmware-%s.postinst" % package, 'w').write(self.substitute(postinst, vars))
+ if 'links' in config_entry:
+for l in config_entry['links']:
+src,trg = l.split(':')
+file("debian/firmware-%s.links" % package, 'w').write("%s %s\n" % (src, trg))
+
packages.extend(packages_binary)
makefile.add('binary-indep', cmds = ["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
@@ -209,6 +214,7 @@
schemas = {
'base': {
'files': SchemaItemList(),
+'links': SchemaItemList(),
'packages': SchemaItemList(),
'support': SchemaItemList(),
}
diff -r -u firmware-nonfree-orig/debian/rules.real firmware-nonfree-new/debian/rules.real
--- firmware-nonfree-orig/debian/rules.real 2008-10-26 21:20:47.0 +0100
+++ firmware-nonfree-new/debian/rules.real 2008-10-28 18:51:40.0 +0100
@@ -30,6 +30,7 @@
fi
dh_installchangelogs
dh_installdocs
+ dh_link
dh_compress
dh_fixperms
dh_installdeb
diff -N -r -u firmware-nonfree-old/debian/changelog firmware-nonfree-new/debian/changelog
--- firmware-nonfree-old/debian/changelog 2008-10-28 19:04:27.0 +0100
+++ firmware-nonfree-new/debian/changelog 2008-10-28 10:05:56.0 +0100
@@ -1,3 +1,11 @@
+firmware-nonfree (0.14) unstable; urgency=low
+
+ * Added ipw2200 firwmare, version 3.0,
+ * gencontrol can generate links file.
+
+ -- Frank Lin PIAT <[EMAIL PROTECTED]> Mon, 27 Oct 2008 00:05:03 +0100
+
+
firmware-nonfree (0.13) unstable; urgency=low
* Make firmware-bnx2 trigger update-initramfs (closes: #494936)
diff -N -r -u firmware-nonfree-old/defines firmware-nonfree-new/defines
--- firmware-nonfree-old/defines 2008-10-28 19:00:15.0 +0100
+++ firmware-nonfree-new/defines 2008-10-28 19:01:35.0 +0100
@@ -4,3 +4,4 @@
iwlwifi
qlogic
ralink
+ ipw2200
diff -N -r -u firmware-nonfree-old/ipw2200/defines firmware-nonfree-new/ipw2200/defines
--- firmware-nonfree-old/ipw2200/defines 1970-01-01 01:00:00.0 +0100
+++ firmware-nonfree-new/ipw2200/defines 2008-10-28 08:45:55.0 +0100
@@ -0,0 +1,26 @@
+[base]
+desc: Intel Pro Wireless 2200 and 2915
+files:
+ ipw2200-bss.fw
+ ipw2200-ibss.fw
+ ipw2200-sniffer.fw
+longdesc: Intel Pro Wireless 2200 and 2915 cards.
+ Those firmware are covered by the Intel license, which is available
+ at /usr/share/doc/firmware-ipw2200/copyright
+uri: http://ipw2200.sourceforge.net/firmware.php?fid=7
+links:
+ ../../usr/share/doc/firmware-ipw2200/copyright:/lib/firmware/ipw2200.LICENSE
+
+[ipw2200-bss.fw_base]
+desc: Intel Pro Wireless 2200/2915 firmware (bss)
+version: 3.0
+
+[ipw2200-ibss.fw_base]
+desc: Intel Pro Wireless 2200/2915 firmware (ibss)
+version: 3.0
+
+[ipw2200-sniffer.fw_base]
+desc: Intel Pro Wireless 2200/2915 firmware (snf)
+version: 3.0
+
+
diff -N -r -u firmware-nonfree-old/ipw2200/LICENSE firmware-nonfree-new/ipw2200/LICENSE
--- firmware-nonfree-old/ipw2200/LICENSE 1970-01-01 01:00:00.0 +0100
+++ firmware-nonfree-new/ipw2200/LICENSE 2006-03-07 20:49:46.00
Re: firmware-nonfree : ipw2200 ?
On Mon, Oct 27, 2008 at 11:54 PM, Thadeu Lima de Souza Cascardo <[EMAIL PROTECTED]> wrote: > If I've read the FAQ (posted earlier in this thread) correctly, if > Debian uses a centralized location for license files, which > /usr/share/doc/packagename/copyright is, then Debian should be able to > put the license there and does not need to put a copy in the same > directory as the firmware files. The FAQ clearly emphasises (with the phrase "in addition") that you still have to place a copy of the license in the same directory as the firmware even when placing a copy of the license in /usr/share/doc. -- bye, pabs http://wiki.debian.org/PaulWise -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: firmware-nonfree : ipw2200 ?
On Mon, Oct 27, 2008 at 10:49:53AM +0100, Franklin PIAT wrote: > Which command do I use, to generate the debian/rules.gen? > linux-support-* provides no README file unfortunately. > > According to the license, I need to place a symlink to the license, > in /lib/firmware (sorry lintian and fhs). Should I : > 1. create a [links] section in the define (and modify gencontrol) > 2. create a ipw2200/links file (and copy it to debian/*.links) > 3. create a file debian/firmware-ipw2200.links [ouch]. > 4. do something else (maybe in debian/templates)? > > Thanks, > > Franklin > If I've read the FAQ (posted earlier in this thread) correctly, if Debian uses a centralized location for license files, which /usr/share/doc/packagename/copyright is, then Debian should be able to put the license there and does not need to put a copy in the same directory as the firmware files. Regards, Cascardo. signature.asc Description: Digital signature
Re: firmware-nonfree : ipw2200 ?
On Mon, 2008-10-27 at 00:52 +, Ben Hutchings wrote: > On Mon, 2008-10-27 at 00:40 +0100, Frank Lin PIAT wrote: > > Hello, > > > > Here's a patch that adds firmware-ipw2200 to firmware-nonfree_0.13. > > No attachments appeared on the list; please try again. ;-) Sorry, here is the patch. I haven't attached the binary blobs. They are available from: http://ipw2200.sourceforge.net/firmware.php?fid=7 The patch is against the firmware-nonfree_0.13 package, not against the SVN repository. > > The patch probably needs some minor adjustments (I didn't completely > > understand how debian/bin/gencontrol.py is used) > [...] > > gencontrol.py reads a list of directories from "defines" [..] Which command do I use, to generate the debian/rules.gen? linux-support-* provides no README file unfortunately. According to the license, I need to place a symlink to the license, in /lib/firmware (sorry lintian and fhs). Should I : 1. create a [links] section in the define (and modify gencontrol) 2. create a ipw2200/links file (and copy it to debian/*.links) 3. create a file debian/firmware-ipw2200.links [ouch]. 4. do something else (maybe in debian/templates)? Thanks, Franklin 12a3224fb9d5c95c23bb2461fe80fdcf3f6969e6 diff --git a/debian/changelog b/debian/changelog index bbbe478..b02368b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +firmware-nonfree (0.14) unstable; urgency=low + + * Added ipw2200 firwmare, version 3.0, + + -- Frank Lin PIAT <[EMAIL PROTECTED]> Mon, 27 Oct 2008 00:05:03 +0100 + firmware-nonfree (0.13) unstable; urgency=low * Make firmware-bnx2 trigger update-initramfs (closes: #494936) diff --git a/debian/control b/debian/control index 888c766..788bd56 100644 --- a/debian/control +++ b/debian/control @@ -65,3 +65,20 @@ Description: Binary firmware for Ralink RT2561, RT2571, RT2661 and RT2671 wirele * Ralink RT2571W/RT2671 (RT2501USB/RT5201USB chipset) firmware, version 1.8 Homepage: http://www.ralinktech.com/ralink/Home/Support/Linux.html +Package: firmware-ipw2200 +Architecture: all +Suggests: initramfs-tools, linux-image +Description: Binary firmware for Intel Pro Wireless 2200 and 2915 cards + This package contains the binary firmware for PCI, mini-PCI wireless + network cards with the Intel Pro Wireless 2200 and 2915 cards, + supported by the ipw2200 drivers. + Those firmware are covered by the Intel license, which is available + at /usr/share/doc/firmware-ipw2200/copyright + . + Contents: + * Intel Pro Wireless 2200/2915 BSS firmware + * Intel Pro Wireless 2200/2915 IBSS firmware + * Intel Pro Wireless 2200/2915 SNIFFER firmware + Firmware version 3.0 (for driver v1.1.1 and above) +Homepage: http://ipw2200.sourceforge.net/firmware.php + diff --git a/debian/firmware-ipw2200.copyright b/debian/firmware-ipw2200.copyright new file mode 100644 index 000..fa26c67 --- /dev/null +++ b/debian/firmware-ipw2200.copyright @@ -0,0 +1,210 @@ + TERMS AND CONDITIONS +IMPORTANT - PLEASE READ BEFORE INSTALLING OR USING THIS INTEL(C) SOFTWARE + +Do not use or load this firmware (the "Software") until you have carefully read +the following terms and conditions. By loading or using the Software, you agree +to the terms of this Agreement. If you do not wish to so agree, do not install +or use the Software. + +LICENSEES: + +Please note: + +* If you are an End-User, only Exhibit A, the SOFTWARE LICENSE AGREEMENT, + applies. +* If you are an Original Equipment Manufacturer (OEM), Independent Hardware + Vendor (IHV), or Independent Software Vendor (ISV), this complete Agreement + applies + + + +For OEMs, IHVs, and ISVs: + +LICENSE. This Software is licensed for use only in conjunction with Intel +component products. Use of the Software in conjunction with non-Intel component +products is not licensed hereunder. Subject to the terms of this Agreement, +Intel grants to you a nonexclusive, nontransferable, worldwide, fully paid-up +license under Intel's copyrights to: (i) copy the Software internally for your +own development and maintenance purposes; (ii) copy and distribute the Software +to your end-users, but only under a license agreement with terms at least as +restrictive as those contained in Intel's Final, Single User License Agreement, +attached as Exhibit A; and (iii) modify, copy and distribute the end-user +documentation which may accompany the Software, but only in association with +the Software. + +If you are not the final manufacturer or vendor of a computer system or software +program incorporating the Software, then you may transfer a copy of the +Software, including any related documentation (modified or unmodified) to your +recipient for use in accordance with the terms of this Agreement, provided such +recipient agrees to be fully bound by the terms hereof. You shall not otherwise +assign, sublicense, lease, or in any other way transfer o
Re: firmware-nonfree : ipw2200 ?
Hello, Here's a patch that adds firmware-ipw2200 to firmware-nonfree_0.13. In compliance with the license FAQ[1] : - The package description includes a notice about the Intel license (the alternative would be be a click-through debconf screen). - There's a LICENSE file in the same folder as the firmware (physically, it's a symlink to the copyright) The patch probably needs some minor adjustments (I didn't completely understand how debian/bin/gencontrol.py is used) On Sun, 2008-10-26 at 23:04 +1000, Kel Modderman wrote: > On Friday 24 October 2008 09:15:10 Frank Lin PIAT wrote: > > > > I have just tested Lenny on a laptop[1] with an Intel Pro Wireless 2200 > > chipset. As you probably known the kernel module ipw2200 requires a > > non-free firmware. > > > > I'm wondering why it hasn't been packaged yet (since that card was > > fairly common). > > The license question was brought to debian-legal[1] and it seems there > > was no barrier. > > Of course, the boring part is that 1. It's non-free and 2. We must > > prompt the user to approve the license. > > > > - Do you know why the firmware was never shipped in Debian? > > There wasn't any firm concensus that the Intel license was acceptable for > non-free at the time I last brought it up. I haven't found such discussion. Anybody remembers such discussion? > > - If I provide a patch, do you think if have a chance to be in Lenny? > > I don't think any new package would enter Debian Lenny at this time. The current firmware was released a while ago (March 2006, according to the firmware's mtime), so it is well tested. If you find this suitable for Lenny, I would also prepare a similar patch for ipw2100. Feel free to modify my patch if needed (or just let me know what should be fixed). Franklin [1] http://intellinuxwireless.org/?n=faq&s=license -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: firmware-nonfree : ipw2200 ?
On Friday 24 October 2008 09:15:10 Frank Lin PIAT wrote: > Hello, > > [CC'ing since someone may have the answer] > > I have just tested Lenny on a laptop[1] with an Intel Pro Wireless 2200 > chipset. As you probably known the kernel module ipw2200 requires a > non-free firmware. > > I'm wondering why it hasn't been packaged yet (since that card was > fairly common). > The license question was brought to debian-legal[1] and it seems there > was no barrier. > Of course, the boring part is that 1. It's non-free and 2. We must > prompt the user to approve the license. > > - Do you know why the firmware was never shipped in Debian? There wasn't any firm concensus that the Intel license was acceptable for non-free at the time I last brought it up. > - If I provide a patch, do you think if have a chance to be in Lenny? I don't think any new package would enter Debian Lenny at this time. > > P.S. Kel, do you still have your package's source? Yeah. It's not really relevant anymore though, because firmware which can be in non-free should probably bundled into the kernel-team's conglomerate firmware-nonfree source package. Thanks, Kel. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: firmware-nonfree : ipw2200 ?
On Fri, 2008-10-24 at 11:29 +0200, Giacomo A. Catenazzi wrote: > Frank Lin PIAT wrote: > > Hirllow > > On Fri, 2008-10-24 at 08:05 +0200, Mike Hommey wrote: > >> On Fri, Oct 24, 2008 at 01:15:10AM +0200, Frank Lin PIAT wrote: > >>> I have just tested Lenny on a laptop[1] with an Intel Pro Wireless 2200 > >>> chipset. As you probably known the kernel module ipw2200 requires a > >>> non-free firmware. > >>> > >>> - Do you know why the firmware was never shipped in Debian? > >> Because its license, contrary to other intel wireless firmware license > >> forbids redistributing. Which means we can't even distribute it in > >> non-free. > > > >>> - If I provide a patch, do you think if have a chance to be in Lenny? > >> Except if the license changed, no chance. > > > > That would be too bad... but only Intel should be blamed. > > From my experiences, Intel changes firmware licenses, if we ask. > If you point to other "acceptable" (for our non-free) Intel firmware > license, it is better. > > Ah, it could simplify the task, if you tell him that it would easier > the inclusion in Ubuntu. Unfortunately, this doesn't seems to be an option, as mentioned in their ipw2100/ipw200 license FAQ[1] : Q. The license for the binaries needed with the newer projects (ipw3945 and iwlwifi) seems much cleaner than the license for the ipw2100 and ipw2200. Can you change the terms of the older license? A. Unfortunately, no. Those binaries contain intellectual property licensed from third parties, and Intel must follow certain contractual obligations in licensing for those components. The ipw3945 and iwlwifi related binaries are all Intel-developed, and we are able to use a simplified license for that product. [1] http://intellinuxwireless.org/?n=faq&s=license -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: firmware-nonfree : ipw2200 ?
Frank Lin PIAT wrote: Hirllow On Fri, 2008-10-24 at 08:05 +0200, Mike Hommey wrote: On Fri, Oct 24, 2008 at 01:15:10AM +0200, Frank Lin PIAT wrote: I have just tested Lenny on a laptop[1] with an Intel Pro Wireless 2200 chipset. As you probably known the kernel module ipw2200 requires a non-free firmware. - Do you know why the firmware was never shipped in Debian? Because its license, contrary to other intel wireless firmware license forbids redistributing. Which means we can't even distribute it in non-free. - If I provide a patch, do you think if have a chance to be in Lenny? Except if the license changed, no chance. That would be too bad... but only Intel should be blamed. From my experiences, Intel changes firmware licenses, if we ask. If you point to other "acceptable" (for our non-free) Intel firmware license, it is better. Ah, it could simplify the task, if you tell him that it would easier the inclusion in Ubuntu. ciao cate -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: firmware-nonfree : ipw2200 ?
Hirllow On Fri, 2008-10-24 at 08:05 +0200, Mike Hommey wrote: > On Fri, Oct 24, 2008 at 01:15:10AM +0200, Frank Lin PIAT wrote: > > > > I have just tested Lenny on a laptop[1] with an Intel Pro Wireless 2200 > > chipset. As you probably known the kernel module ipw2200 requires a > > non-free firmware. > > > > - Do you know why the firmware was never shipped in Debian? > > Because its license, contrary to other intel wireless firmware license > forbids redistributing. Which means we can't even distribute it in > non-free. Humm... the license page[1] states : "[..]Intel grants to you a nonexclusive, nontransferable, worldwide [..] For OEMs, IHVs, and ISVs: [..] copy and distribute the Software to your end-users, but only under a license agreement with terms at least as restrictive as those contained in Intel's Final, Single User License Agreement [..]" This is further clarified in their FAQ[2] : Q. I am a package maintainer and I would like to create a package/distribution/CD that installs/provides the Intel firmware necessary for the ipw2100 and ipw2200 projects. How does one go about doing this according to Intel's terms A. There are three key actions that must be performed: 1. Generally distributors alert end users to the fact that components of a package may be covered under a variety of licenses, the specific terms of which vary. Some distributors use an initial license page during the OS install that informs the user that various components are governed by a variety of licenses, and use of the components is subject to the user's compliance with the various licensing requirements. Other package systems support an interactive package approach that requires the user to view and accept the license before they can install it, etc. 2. Any description within the package must indicate that the package is covered by the Intel license, and provide the user with information on how to access that license -- making it clear that the user is not granted a license to use the package unless these terms are agreed to. 3. The package must install the LICENSE file in the same location on the system that the firmware files are installed. If it is standard practice in your distribution to place all license files in a centralized location (for example /usr/share/license), then you are free to place a copy of the license in that location, in addition to placing it in the directory containing the firmware files. My understanding is that Debian is allowed to redistribute the firmware. A license agreement prompt (à la sun-java*) doesn't actually seems compulsory. Re-re-re-reading the agreement, the statement "Intel grants to you [..] nontransferable[..]" seems to break DFSG#8 (but it's non-free anyway). I'm not sure about the situation regarding derivatives distributions. Either : 1. We consider that Debian is _the_ "distributor" (ISV), and the derivatives is part of the redistribution chain to reach the end user. So the debian-derivative don't need to agree with the ISV license. This assumption would be based on the fact that distributors distribute our (so called) source package. 2. We consider that derivatives distributions are considered ISV. In the best situation, we need to add a prompt in the build process, to agree with the ISV license (ouch) In the worse situation, we need to strip the blob from the package, and download it manually before compiling the package. any opinion on that ? > > - If I provide a patch, do you think if have a chance to be in Lenny? > > Except if the license changed, no chance. That would be too bad... but only Intel should be blamed. [1] http://ipw2200.sourceforge.net/firmware.php?fid=7 [2] http://intellinuxwireless.org/?n=FAQ&s=license#license_1 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: firmware-nonfree : ipw2200 ?
On Fri, Oct 24, 2008 at 01:15:10AM +0200, Frank Lin PIAT wrote: > Hello, > > [CC'ing since someone may have the answer] > > I have just tested Lenny on a laptop[1] with an Intel Pro Wireless 2200 > chipset. As you probably known the kernel module ipw2200 requires a > non-free firmware. > > I'm wondering why it hasn't been packaged yet (since that card was > fairly common). > The license question was brought to debian-legal[1] and it seems there > was no barrier. > Of course, the boring part is that 1. It's non-free and 2. We must > prompt the user to approve the license. > > - Do you know why the firmware was never shipped in Debian? Because its license, contrary to other intel wireless firmware license forbids redistributing. Which means we can't even distribute it in non-free. > - If I provide a patch, do you think if have a chance to be in Lenny? Except if the license changed, no chance. Mike -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
firmware-nonfree : ipw2200 ?
Hello, [CC'ing since someone may have the answer] I have just tested Lenny on a laptop[1] with an Intel Pro Wireless 2200 chipset. As you probably known the kernel module ipw2200 requires a non-free firmware. I'm wondering why it hasn't been packaged yet (since that card was fairly common). The license question was brought to debian-legal[1] and it seems there was no barrier. Of course, the boring part is that 1. It's non-free and 2. We must prompt the user to approve the license. - Do you know why the firmware was never shipped in Debian? - If I provide a patch, do you think if have a chance to be in Lenny? Thanks, Franklin P.S. Kel, do you still have your package's source? [1] http://bugs.debian.org/503244 [2] http://lists.debian.org/debian-legal/2007/03/msg00034.html -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
