Bug#572438: linux-base: Empty LABEL= should no be used
Package: linux-base Version: 2.6.33-1~experimental.2 Severity: normal linux-base should not use LABEL=, in the case where blkid provide such data[1] In my /etc/fstab, linux-base has inserted: # /dev/sda6 /foobar vfat defaults 0 2 LABEL= /foobar vfat defaults 0 2 I haven't rebooted to try it, but it would be weird anyway. On my system: % blkid /dev/sda6 /dev/sda6: LABEL= UUID=68F6-270E TYPE=vfat Kudos for linux-base Franklin [1] util-linux: blkid should never report LABEL= http://bugs.debian.org/572435 -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing'), (101, 'unstable'), (10, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.30-1-686 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages linux-base depends on: ii debconf [debconf-2.0] 1.5.28 Debian configuration management sy ii libapt-pkg-perl 0.1.24 Perl interface to libapt-pkg linux-base recommends no packages. linux-base suggests no packages. -- debconf information: * linux-base/disk-id-manual: * linux-base/disk-id-convert-plan: true * linux-base/disk-id-convert-auto: true -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100304082518.13313.24996.report...@solid.paris.klabs.be
Bug#572436: linux-base: Corrupted debconf string
Package: linux-base Version: 2.6.33-1~experimental.2 Severity: normal Hello, In Linux-base and linux-image, I have weird prompts Yes and No prompts, like : Yes^X9 No│ Thanks, Franklin More screen shots: ┌── │ Configuring linux-base ├──┐ │ │ │ The new Linux kernel version provides different drivers for │ some PATA (IDE) controllers. The names of some hard disk, │ CD-ROM and tape devices may change. │ SNIP │ Update disk device ids in system configuration? │ │ Yes^X9 No│ │ └──┘ ┌───┤ Configuring linux-base ├───┐ ││ │ These devices will be relabelled: │ ││ │ These configuration files will be updated: │ ││ │ /etc/fstab, /etc/udev/rules.d/70-persistent-cd.rules │ ││ │ The device ids will be changed as follows: │ ││ │ /dev/sda6: LABEL= │ │ /dev/sda2: LABEL=BOOT │ ││ │ Apply these configuration changes to disk device ids? │ ││ │ Yes^X9�� No ││ └┘ ┌───┤ Configuring linux-base ├─┐ │ │ Please check these configuration files before rebooting │ │ These configuration files still use some device names that may change │ when using the new kernel: │ │ /etc/fstab: /dev/sr0 │ │ Ok^Q��Đ^P9�� │ └──┘ -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing'), (101, 'unstable'), (10, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.30-1-686 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages linux-base depends on: ii debconf [debconf-2.0] 1.5.28 Debian configuration management sy ii libapt-pkg-perl 0.1.24 Perl interface to libapt-pkg linux-base recommends no packages. linux-base suggests no packages. -- debconf information excluded -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100304082321.6857.40093.report...@solid.paris.klabs.be
Re: Linux image packages going to depend on python
On Sun, 2009-11-29 at 20:56 +0100, Frank Lin PIAT wrote:
On Sun, 2009-11-29 at 13:56 +0100, Marco d'Itri wrote:
On Nov 28, Bastian Blank wa...@debian.org wrote:
The Linux image packages needs to do some modifications to core
configuration files like fstab in the future to allow newer kernels to
work. To do this and the planned further extension I intend to make all
linux image packages depend on python.
FYI
As I were investigating an issue about volumes UUID, I noticed that
Ubuntu already had such transition, with this tool: volumeid[1]
It needed a minor update to use blkid instead of vol_id.
Franklin
[1] https://launchpad.net/ubuntu/gutsy/i386/volumeid/113-0ubuntu17.2
https://launchpad.net/ubuntu/+source/udev/113-0ubuntu17.2
#!/bin/sh -e
# Rewrite /etc/fstab so that filesystems are mounted by UUID
if [ -e /etc/fstab.pre-uuid ]; then
echo /etc/fstab.pre-uuid already exists 12
echo remove this file before running the script again 12
exit 1
fi
cp -a /etc/fstab /etc/fstab.pre-uuid
exec 90 81 /etc/fstab /etc/fstab.new
trap rm -f /etc/fstab.new 0
uuids=
old_IFS=$IFS
IFS=
while read LINE
do
IFS=$old_IFS
set -- $LINE
IFS=
DEV=$1 MTPT=$2 FSTYPE=$3 OPTS=$4
# Check the device is sane for conversion
case $DEV in
|\#*) # Preserve blank lines and user comments
echo $LINE
continue
;;
LABEL=*|UUID=*) # Already mounting by LABEL or UUID
echo $LINE
continue
;;
/dev/mapper/*_crypt)# DM-Crypt devices
echo $LINE
continue
;;
/dev/disk/*)# Already mounting by particulars
echo $LINE
continue
;;
/dev/fd[0-9]*) # Floppy devices, not mounted by filesystem
echo $LINE
continue
;;
/dev/*) # Ordinary devices -- we want to convert
if [ ! -b $DEV ]; then
echo $LINE
continue
fi
;;
*) # Anything else gets left alone
echo $LINE
continue
;;
esac
# Don't convert filesystem types that don't make sense
case $FSTYPE in
auto) # Auto detection -- implies non-fixed fs
echo $LINE
continue
;;
esac
# Check filesystem options also
case $OPTS in
noauto|*,noauto|noauto,*|*,noauto,*)# Implies non-fixed
echo $LINE
continue
;;
esac
# If we reach this point, we think we want to move the fstab
# entry over to mount-by-UUID. The first check is that the
# filesystem on the device *has* a uuid
UUID=$(/sbin/vol_id -u $DEV || true)
if [ -z $UUID ]; then
# Can we generate one?
if [ $FSTYPE = swap ]; then
REAL_FSTYPE=$(/sbin/vol_id -t $DEV || true)
case $REAL_FSTYPE in
swap) # is a swap device, add a UUID to it
UUID=$(uuidgen)
echo -n $UUID |
perl -ne 's/-//g;chomp;print pack H*,$_' |
dd conv=notrunc of=$DEV obs=1 seek=1036 2/dev/null
;;
swsusp) # contains a suspended image, mkswap it!
if ! mkswap $DEV /dev/null; then
echo Warning: unable to make swap $DEV 12
echo $LINE
continue
fi
UUID=$(/sbin/vol_id -u $DEV || true)
if [ -z $UUID ]; then
echo Warning: unable to generate uuid for $DEV 12
echo $LINE
continue
fi
;;
*)
echo Warning: $DEV is not a swap partition 12
echo $LINE
continue
;;
esac
else
echo Warning: unable to find a UUID for $DEV 12
echo $LINE
continue
fi
fi
# Check for duplicates
case $uuids in
$UUID | $UUID * | * $UUID | * $UUID *)
echo Error: duplicate UUID $UUID detected 12
echo Unable to migrate /etc/fstab to UUID-based mounting 12
exec 09 9- 18 8-
trap 0
rm -f /etc/fstab.new
exit 1
;;
*)
uuids=${uuids:+$uuids }$UUID
;;
esac
# Now write the new line out
shift
echo # $DEV -- converted during upgrade to edgy
echo UUID=$UUID $@
done
IFS=$old_IFS
exec 09 9- 18 8-
trap 0
#mv -f /etc/fstab.new /etc/fstab
exit 0
#!/bin/sh -e
# Rewrite /etc/fstab so that filesystems are mounted by UUID
if [ -e /etc/fstab.pre-uuid ]; then
echo /etc/fstab.pre-uuid already exists 12
echo remove this file before running the script again 12
exit 1
fi
cp
Re: Linux image packages going to depend on python
On Sun, 2009-11-29 at 13:56 +0100, Marco d'Itri wrote:
On Nov 28, Bastian Blank wa...@debian.org wrote:
The Linux image packages needs to do some modifications to core
configuration files like fstab in the future to allow newer kernels to
work. To do this and the planned further extension I intend to make all
linux image packages depend on python.
This is not justified.
I will be happy to rewrite in perl whatever you need.
Find attached an initial attempt to use shell only. Let me know if you
are interested.
The script is configurable, so a sysadmin can decide to re-rewrite fstab
using DM/LVM names rather than UUID, or volume LABEL, or legacy /dev/hd*
names.
Known bugs/limitation:
* Should accept command line arguments
* Some devices may need to be blacklisted
* What about removable media? (UUID of media in CDROM? ouch)
* Should actually write fstab ;)
I have hesitated to probe the current /dev or to use blkid... I can
change that easily.
I think this script should have a companion, to insert/update a comments
line above each fstab entry (à-la Debian-Installer)
Franklin
#!/bin/sh
set -e
# update-fstab-persistent-names - Rewrite current fstab
# (Using your prefered device naming).
#
# Copyright 2009, Frank Lin PIAT fp...@klabs.be
# Licensed under GPLv2 or later
#
# Known bugs/limitation
# * Should actually _write_ fstab ;)
# * Doesn't accept command line arguments
# * Some devices may need to be blacklisted
# * What about removable media?
# == User configurable variables == #
# Prefered device naming scheme to use in fstab. **Order matters**.
#dm : use /dev/grpname/logvolname for LVM volumes
# : or /dev/mapper/dmname for CRYPT and other.
#uuid : use UUID=cafecafe (based on the FS's volume UUID)
#label : use LABEL=foo (based on the FS's volume name)
#plaindev : use legacy /dev/ devices.
PREFERED_NAME='dm uuid label plaindev'
# Rewrite existing LABEL=foo lines in fstab
REWRITE_LABELS=1
# Rewrite existing UUID=foo lines in fstab
REWRITE_UUIDS=1
# == End of user configurable variables == #
# Let's declare some functions...
# Initialise a sed file to rewrite fstab, based on device major/minor IDs.
# (this temporary sed file search and replace all possible names for the
# local devices, with a fake unique ID #DEVICE=X.Y where X and Y are
# the device's major and minor numbers)
generate_simple_fstab_sed() {
# Sed rule to rewrite /dev/* entry as #DEVICE=X:Y
find /dev/ \( -type b -o -type l \) \
\! -path '/dev/.udev/*' \! -path '/dev/.static/*' \
-iregex '^[a-z0-9./_-]*$' -printf '%Y\t%p\n' \
| sed -n -e 's/^b\t\(.*\)/\1/p' \
| while read s ; do
printf 's\t^%s\\t#DEVICE=%d:%d\t\n' \
$s \
$(stat -L -c '0x%t' $s) \
$(stat -L -c '0x%T' $s)
done
# Sed rule to rewrite existing LABELS=* entry as #DEVICE=X:Y
if [ $REWRITE_LABELS = 1 -a -d /dev/disk/by-label ]; then
find /dev/disk/by-label/ -type l -iregex '^[a-z0-9./_-]*$' \
| while read s ; do \
printf 's\t^%s\\t#DEVICE=%d:%d\t\n' \
LABEL=$(basename $s) \
$(stat -L -c '0x%t' $s) \
$(stat -L -c '0x%T' $s)
done
fi
# Sed rule to rewrite existing UUID=* entry as #DEVICE=X:Y
if [ $REWRITE_UUIDS = 1 -a -d /dev/disk/by-uuid ]; then
find /dev/disk/by-uuid/ -type l -iregex '^[a-z0-9./_-]*$' \
| while read s ; do \
printf 's\t^%s\\t#DEVICE=%d:%d\tg\n' \
UUID=$(basename $s) \
$(stat -L -c '0x%t' $s) \
$(stat -L -c '0x%T' $s)
done
fi
}
# create a list of device-major-minor - /dev/vg/lv for LVM.
use_dm_legacy() {
which vgs 21 /dev/null || return 0
LVM_VGS=$(vgs --all -o vg_name --noheadings | sed -e 's#^\s*#/dev/#')
[ ! $LVM_VGS ] return 0
find $LVM_VGS -maxdepth 1 -type l -iregex '^[a-z0-9./_-]*$' \
| while read s ; do \
printf 's\t#DEVICE=%d:%d\t%s\t\n' \
$(stat -L -c '0x%t' $s) \
$(stat -L -c '0x%T' $s) \
$s
done
}
# create a list of device-major-minor - /dev/vg/lv
# or - /dev/mapper/name for dmsetup (LVM/DM/CRYPT...)
use_dm_new() {
which dmsetup 21 /dev/null || return 0
dmsetup info -c --noheadings --separator=$(printf \t) \
-o major,minor,name
Bug#457652: linux-2.6: lguest launcher
Hello, A quick note for those willing to play with lguest... I have been playing with lguest a little bit, for the fun. I don't believe that the lguest sample user land tools is worth being shipped and supported in Debian. Especially, the tool seems specific to the kernel version it was shipped with. For those willing to play with lguest too, I have written a script to build an lguest package, see [1]. Franklin [1] http://wiki.debian.org/Lguest -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Re: Proposed changes to linux-2.6
On Sat, 2009-05-23 at 22:57 +0200, Bastian Blank wrote: On Sat, May 23, 2009 at 04:41:16PM +0200, Bastian Blank wrote: On Wed, May 20, 2009 at 05:32:48PM +0200, Bastian Blank wrote: I intend to do the following changes to linux-2.6: * Change i386/686(-bigmem) to include generic optimizations, should work on all x86 then. Maybe rename them somehow later. I checked it again, this is incorrect. A generic optimized kernel with a 686 setting will not work on older cpus. Virtual machines (including those from Redmond) probably needs testing. Let me know when you have something I can test on Hyper-V, VirtualPC and ESX. (There are probably lots of candidates to test qemu, kvm, VirtualBox 12, vmware...) Franklin -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#497717: firmware-iwlwifi: Patch to support Intel WiFi 5000 cards.
Package: firmware-iwlwifi Version: 0.14 Followup-For: Bug #497717 I have prepared a tiny patch to add iwlwifi-5000-1.ucode firmware. The license is the same as iwl3945/iwl4965 firmware's license, so I have added the firmware in the same package (even though the module name is different). This firmware is only useful with linux kernel = 2.6.27 which has the appropriate driver. Franklin Index: iwlwifi/LICENSE === --- iwlwifi/LICENSE (revision 12608) +++ iwlwifi/LICENSE (working copy) @@ -1,4 +1,4 @@ -Copyright (c) 2006, Intel Corporation. +Copyright (c) 2006-2008, Intel Corporation. All rights reserved. Redistribution. Redistribution and use in binary form, without Index: iwlwifi/defines === --- iwlwifi/defines (revision 12608) +++ iwlwifi/defines (working copy) @@ -1,10 +1,11 @@ [base] -desc: Intel Wireless 3945 and 4965 +desc: Intel Wireless 3945, 4965 and 5000 cards files: iwlwifi-3945-1.ucode iwlwifi-4965-1.ucode iwlwifi-4965-2.ucode -longdesc: Intel Wireless 3945 and 4965 cards + iwlwifi-5000-1.ucode +longdesc: Intel Wireless 3945, 4965 cards, and the 5000 series. uri: http://intellinuxwireless.org/?p=iwlwifin=downloads [iwlwifi-3945-1.ucode_base] @@ -15,3 +16,6 @@ [iwlwifi-4965-2.ucode_base] desc: Intel Wireless 4965 firmware + +[iwlwifi-5000-1.ucode_base] +desc: Intel Wireless 5000 firmware (cards 5100 and 5300)
Bug#497717: firmware-iwlwifi: Patch to support Intel WiFi 5000 cards.
tag 497717 patch
--
On Sat, 2009-01-24 at 00:05 +0100, Frank Lin PIAT wrote:
I have prepared a tiny patch to add iwlwifi-5000-1.ucode firmware.
Here's an improved patch, which includes Evgeni Golov suggestion
should mention ${modulename} in the long description.
Franklin
Index: defines
===
--- defines (revision 12608)
+++ defines (working copy)
@@ -1,7 +1,23 @@
[base]
-packages:
- bnx2
- ipw2x00
- iwlwifi
- qlogic
- ralink
+desc: Intel Wireless 3945, 4965 and 5000 cards
+files:
+ iwlwifi-3945-1.ucode
+ iwlwifi-4965-1.ucode
+ iwlwifi-4965-2.ucode
+ iwlwifi-5000-1.ucode
+longdesc: Intel Wireless 3945, 4965 cards, and the 5000 series.
+ This package contains the firmwares loaded by the modules
+ iwl3945 and iwl4965/iwlagn.
+uri: http://intellinuxwireless.org/?p=iwlwifin=downloads
+
+[iwlwifi-3945-1.ucode_base]
+desc: Intel Wireless 3945 firmware
+
+[iwlwifi-4965-1.ucode_base]
+desc: Intel Wireless 4965 firmware
+
+[iwlwifi-4965-2.ucode_base]
+desc: Intel Wireless 4965 firmware
+
+[iwlwifi-5000-1.ucode_base]
+desc: Intel Wireless 5000 firmware.
Bug#497717: firmware-iwlwifi: Patch to support Intel WiFi 5000 cards.
On Sat, 2009-01-24 at 00:22 +0100, Frank Lin PIAT wrote:
On Sat, 2009-01-24 at 00:05 +0100, Frank Lin PIAT wrote:
I have prepared a tiny patch to add iwlwifi-5000-1.ucode firmware.
Here's an improved patch, which includes Evgeni Golov suggestion
should mention ${modulename} in the long description.
Well.. that patch version 2 was a crap.
Sorry,
Index: iwlwifi/LICENSE
===
--- iwlwifi/LICENSE (revision 12608)
+++ iwlwifi/LICENSE (working copy)
@@ -1,4 +1,4 @@
-Copyright (c) 2006, Intel Corporation.
+Copyright (c) 2006-2008, Intel Corporation.
All rights reserved.
Redistribution. Redistribution and use in binary form, without
Index: iwlwifi/defines
===
--- iwlwifi/defines (revision 12608)
+++ iwlwifi/defines (working copy)
@@ -1,10 +1,12 @@
[base]
-desc: Intel Wireless 3945 and 4965
+desc: Intel Wireless 3945, 4965 and 5000-series cards
files:
iwlwifi-3945-1.ucode
iwlwifi-4965-1.ucode
iwlwifi-4965-2.ucode
-longdesc: Intel Wireless 3945 and 4965 cards
+ iwlwifi-5000-1.ucode
+longdesc: Intel Wireless 3945, 4965, 5100 and 5300 cards.
+ The associated kernel modules are: iwl3945 and iwl4965/iwlagn
uri: http://intellinuxwireless.org/?p=iwlwifin=downloads
[iwlwifi-3945-1.ucode_base]
@@ -15,3 +17,6 @@
[iwlwifi-4965-2.ucode_base]
desc: Intel Wireless 4965 firmware
+
+[iwlwifi-5000-1.ucode_base]
+desc: Intel Wireless 5000 firmware
Bug#510220: firmware-ipw2x00:should mention ipw2100/ipw2200 in the long description
Evgeni Golov wrote: Currently, an `apt-cache search ipw2[12]00` does not find the firmware-ipw2x00 package... Here's an implementation for Evgeni's idea. Franklin Index: ipw2x00/defines === --- ipw2x00/defines (revision 12608) +++ ipw2x00/defines (working copy) @@ -10,6 +10,7 @@ license-accept: required license-title: Intel Pro Wireless 2100 and 2200/2915 License longdesc: Intel Pro Wireless 2100, 2200 and 2915 cards + The associated kernel modules are: ipw2100 and ipw2200 uri: http://ipw2100.sourceforge.net/firmware.php?fid=4, http://ipw2200.sourceforge.net/firmware.php?fid=7 [ipw2100-1.3.fw_base]
Bug#504668: firmware-nonfree: Add License handler in gencontrol.py
On Thu, 2008-11-06 at 01:47 +0100, Frank Lin PIAT wrote: The patch license.diff implements license=[required|no-preseed] and license_name entry in the firmware's define file. When used, those fields are used to generate a preinst script that present the license to the user. Note: If one gets the firmware-ipw2100 packages, then copy it on a usb key to provide the package to Debian-Installer (when DI detects the Wifi card), then the preinst script isn't displayed. Which means that the license isn't accepted. This behaviour shouldn't be a problem for ipw2100/ipw2200, since the license's FAQ handle this case (see Bug #504671 and 449235) Franklin -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#504668: firmware-nonfree: Add License handler in gencontrol.py
Package: firmware-nonfree
Severity: normal
Tags: patch
The two patches attaches allow gencontrol.py to handle licenses
in a way that complies with ipw2100 and ipw2200 firmware license.
The patch links.diff implements a links entry in the firmware's
define file. That entry is a list of source:target that is used
by gencontrol.py to generate ./debian/firmware-foobar.links
The patch license.diff implements license=[required|no-preseed]
and license_name entry in the firmware's define file.
When used, those fields are used to generate a preinst script
that present the license to the user.
If license=no-preseed, then the license acceptation can't be
accepted by using Debconf preseeding (!).
Franklin
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (990, 'testing'), (200, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 92f0017..f5d5cc9 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -134,6 +134,11 @@ class GenControl(object):
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 @@ class Config(dict):
schemas = {
'base': {
'files': SchemaItemList(),
+'links': SchemaItemList(),
'packages': SchemaItemList(),
'support': SchemaItemList(),
}
diff --git a/debian/changelog b/debian/changelog
index bbbe478..e871f01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+firmware-nonfree (0.14) unstable; urgency=low
+
+ * 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 --git a/debian/rules b/debian/rules
index 648d517..9a6f3fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,4 +12,5 @@ maintainerclean:
-rm debian/control debian/control.md5sum debian/rules.gen
-rm debian/*.copyright
-rm debian/*.hook.*
+ -rm debian/*.links
-rm debian/*.postinst
diff --git a/debian/rules.real b/debian/rules.real
index 7626ef5..83646f4 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -30,6 +30,7 @@ install:
fi
dh_installchangelogs
dh_installdocs
+ dh_link
dh_compress
dh_fixperms
dh_installdeb
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index f5d5cc9..b23cd51 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -83,6 +83,8 @@ class GenControl(object):
config_entry = self.config['base', package]
vars.update(config_entry)
vars['package'] = package
+vars['debconfpkg'] = firmware-%s % package
+vars['license_name'] = package
makeflags['PACKAGE'] = package
@@ -91,6 +93,11 @@ class GenControl(object):
vars['license'] = file(%s/LICENSE % package).read()
+regex=re.compile('^\s*$', re.MULTILINE)
+vars['license_indented'] = re.sub(regex, '.', vars['license'])
+regex=re.compile('^', re.MULTILINE)
+vars['license_indented'] = re.sub(regex, ' ', vars['license_indented'])
+
file(debian/firmware-%s.copyright % package, 'w').write(self.substitute(copyright, vars))
files_orig = config_entry['files']
@@ -139,6 +146,15 @@ class GenControl(object):
src,trg = l.split(':')
file(debian/firmware-%s.links % package, 'w').write(%s %s\n % (src, trg))
+if 'license_accept' in config_entry:
+preinst = self.templates['preinst.license']
+preinst_filename = debian/firmware-%s.preinst % package
+file(preinst_filename, 'w').write(self.substitute(preinst, vars))
+
+templates = self.templates['license.templates']
+templates_filename = debian/firmware-%s.templates % package
+file(templates_filename, 'w').write(self.substitute(templates, vars))
+
packages.extend(packages_binary)
makefile.add('binary-indep', cmds = [$(MAKE) -f debian/rules.real binary-indep %s % makeflags])
diff --git a/debian/changelog b/debian/changelog
index e871f01..756f9a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
firmware-nonfree (0.14) unstable; urgency=low
* gencontrol can generate links file.
+ * gencontrol can generate license
Bug#449235: firmware-nonfree: Please add ipw2200 firmware
Package: firmware-nonfree Followup-For: Bug #449235 Hello, I've attached a patch to add ipw2200 firmware. That license issue was discussed on debian-kernel and debian-legal[1] and in this bug. This patch depends on a feature that is added by a patch I've also submitted in bug #504668[2]. The License FAQ[3] states : 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. The license page is presented to the user, which must accept the license, or the installation fails. I think D-I don't honor preinst script when it installs the firmware from a removable media, but this seems to be allowed here. 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. Done. 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. A link is created from /lib/firmware/ipw2200.LICENSE to /usr/share/doc/firmware-ipw2200/copyright. I haven't attached the binary blobs. They are available from upstream website[4]. Franklin [1] http://lists.debian.org/debian-kernel/2008/10/msg00530.html [2] http://bugs.debian.org/504668 [3] http://intellinuxwireless.org/?n=FAQs=license#license_1 [4] http://ipw2200.sourceforge.net/firmware.php?fid=7 -- System Information: Debian Release: lenny/sid APT prefers testing APT policy: (990, 'testing'), (200, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.26-1-686 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#504671: firmware-nonfree: Please add ipw2100 firmware
Package: firmware-nonfree Severity: normal Tags: patch Hello, I've attached a patch to add ipw2100 firmware. That license[1] issue was discussed on debian-kernel and debian-legal[1] and it is very similar to the bug 449235 for ipw2200. This patch depends on a feature that is added by a patch I've also submitted in bug #504668[2]. Franklin [1] http://ipw2100.sourceforge.net/firmware.php?fid=4 [2] http://bugs.debian.org/504668 diff --git a/debian/changelog b/debian/changelog index 35eece4..6b79cdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ firmware-nonfree (0.14) unstable; urgency=low * gencontrol can generate license acceptation prompt, based on sun-java5 preinst script and template. * Added ipw2200 firwmare, version 3.0, + * Added ipw2100 firwmare, version 1.3, -- Frank Lin PIAT [EMAIL PROTECTED] Mon, 27 Oct 2008 00:05:03 +0100 diff --git a/defines b/defines index 85ee5cd..23debbe 100644 --- a/defines +++ b/defines @@ -4,4 +4,5 @@ packages: iwlwifi qlogic ralink + ipw2100 ipw2200 diff --git a/ipw2100/LICENSE b/ipw2100/LICENSE new file mode 100644 index 000..a3e83f5 --- /dev/null +++ b/ipw2100/LICENSE @@ -0,0 +1,207 @@ + 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 or disclose Software to +any third party. You may not, nor may you assist any other person or entity to +modify, translate, convert to another programming language, decompile, reverse +engineer, or disassemble any portion of the Software or otherwise attempt to +derive source code from any object code modules of the Software or any internal +data files generated by the Software. Your rights to redistribute the Software +shall be contingent upon your installation of this Agreement in its entirety in +the same directory as the Software. + +CONFIDENTIALITY. If you wish to have a third party consultant or subcontractor +(Contractor) perform work on your behalf which involves access to or use of +Software, you shall obtain a written confidentiality agreement from the +Contractor which contains provisions with respect to access to or use of the +Software no less restrictive than those set forth in this Agreement and +excluding any distribution rights, and use for any other purpose. Except as +expressly provided herein, you shall not disclose the terms or existence of +this Agreement or use Intel's name in any publications, advertisements, or +other announcements without Intel's prior written consent. You do not have any +rights to use any Intel trademarks or logos. + +OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Software and accompanying materials, if +any, are owned by Intel or its suppliers and licensors and may be protected by +copyright, trademark, patent and trade secret law and international treaties. +Any rights, express or implied, in the intellectual property embodied in the +foregoing, other than those specified in this Agreement, are reserved by Intel +and its suppliers and licensors or otherwise as set forth
Bug#449235: firmware-nonfree: Patch for ipw2200
Package: firmware-nonfree Version: 5 Followup-For: Bug #449235 Damn it, I forgot to attach the patch. Here it is. Franklin diff --git a/debian/changelog b/debian/changelog index 756f9a8..35eece4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ firmware-nonfree (0.14) unstable; urgency=low * gencontrol can generate links file. * gencontrol can generate license acceptation prompt, based on sun-java5 preinst script and template. + * Added ipw2200 firwmare, version 3.0, -- Frank Lin PIAT [EMAIL PROTECTED] Mon, 27 Oct 2008 00:05:03 +0100 diff --git a/defines b/defines index 5fe30b4..85ee5cd 100644 --- a/defines +++ b/defines @@ -4,3 +4,4 @@ packages: iwlwifi qlogic ralink + ipw2200 diff --git a/ipw2200/LICENSE b/ipw2200/LICENSE new file mode 100644 index 000..fa26c67 --- /dev/null +++ b/ipw2200/LICENSE @@ -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 or disclose Software to +any third party. You may not, nor may you assist any other person or entity to +modify, translate, convert to another programming language, decompile, reverse +engineer, or disassemble any portion of the Software or otherwise attempt to +derive source code from any object code modules of the Software or any internal +data files generated by the Software. Your rights to redistribute the Software +shall be contingent upon your installation of this Agreement in its entirety in +the same directory as the Software. + +CONTRACTORS. For the purpose of this Agreement, and notwithstanding anything +to the contrary hereunder, solely with respect to the requirements for +compliance with the terms hereunder, any contractors or consultants that You +use to perform the work or otherwise assist You in the development or products +using this Software shall be deemed to be End Users and accordingly, upon +receipt of the Software, shall be bound by the terms of Exhibit A, Software +License Agreement. No additional agreement between You and such consultants or +contractors is required under this Agreement to detail such compliance. + +TRADEMARKS. Except as expressly provided herein, you shall not use Intel's +name in any publications, advertisements, or other announcements without +Intel's prior written consent. You do not have any rights to use any Intel +trademarks or logos. + +OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Software and accompanying materials, if +any, are owned by Intel or its suppliers and licensors and may be protected by +copyright, trademark, patent and trade secret law and international treaties. +Any rights, express or implied, in the intellectual property embodied in the +foregoing, other than those specified in this Agreement, are reserved by Intel +and its suppliers and licensors or otherwise as set forth in any applicable +open source license agreement. You will keep the Software free of liens, +attachments, and other encumbrances. You agree not to remove any proprietary +notices and/or any
Re: firmware-nonfree : ipw2100 and ipw2200 in Lenny?
Hello, On Tue, 2008-10-28 at 23:05 +0100, Frank Lin PIAT wrote: On Tue, 2008-10-28 at 20:46 +0100, Frank Lin PIAT wrote: 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 I've attached the patch. I think it would be nice to have those firmware in Lenny. Even though it's very late in the release cycle, I assume the risk is add them is rather low since: 1. The firmware haven't changed for ages. 2. The packages will be in non-free (i.e not supported by Debian). Is there anything I could do to help? I assume I should open 2 bugs for the patches, right ? Franklin -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
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.0 +0100
@@ -0,0 +1,210
Re: firmware-nonfree : ipw2100 ?
On Tue, 2008-10-28 at 20:46 +0100, Frank Lin PIAT wrote: 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 license for ipw2100 is very similar to ipw2200 : --- ipw2200/LICENSE 2008-10-28 22:21:02.0 +0100 +++ ipw2100/LICENSE 2004-03-03 20:13:34.0 +0100 -CONTRACTORS. For the purpose of this Agreement, and notwithstanding anything -to the contrary hereunder, solely with respect to the requirements for -compliance with the terms hereunder, any contractors or consultants that You -use to perform the work or otherwise assist You in the development or products -using this Software shall be deemed to be End Users and accordingly, upon -receipt of the Software, shall be bound by the terms of Exhibit A, Software -License Agreement. No additional agreement between You and such consultants or -contractors is required under this Agreement to detail such compliance. - -TRADEMARKS. Except as expressly provided herein, you shall not use Intel's -name in any publications, advertisements, or other announcements without -Intel's prior written consent. You do not have any rights to use any Intel -trademarks or logos. +CONFIDENTIALITY. If you wish to have a third party consultant or subcontractor +(Contractor) perform work on your behalf which involves access to or use of +Software, you shall obtain a written confidentiality agreement from the +Contractor which contains provisions with respect to access to or use of the +Software no less restrictive than those set forth in this Agreement and +excluding any distribution rights, and use for any other purpose. Except as +expressly provided herein, you shall not disclose the terms or existence of +this Agreement or use Intel's name in any publications, advertisements, or +other announcements without Intel's prior written consent. You do not have any +rights to use any Intel trademarks or logos. I've attached the patch. The binary blob (v1.3) will have to be downloaded from upstream. I place the code I'm submitting is in the Public Domain. Franklin diff -N -r -u firmware-nonfree~2+ipw2200/debian/changelog firmware-nonfree~3+ipw2100/debian/changelog --- firmware-nonfree~2+ipw2200/debian/changelog 2008-10-28 20:16:02.0 +0100 +++ firmware-nonfree~3+ipw2100/debian/changelog 2008-10-28 22:56:25.0 +0100 @@ -1,6 +1,7 @@ firmware-nonfree (0.14) unstable; urgency=low * Added ipw2200 firwmare, version 3.0, + * Added ipw2100 firwmare, version 1.3, * gencontrol can generate links file. -- Frank Lin PIAT [EMAIL PROTECTED] Mon, 27 Oct 2008 00:05:03 +0100 diff -N -r -u firmware-nonfree~2+ipw2200/defines firmware-nonfree~3+ipw2100/defines --- firmware-nonfree~2+ipw2200/defines 2008-10-28 20:16:02.0 +0100 +++ firmware-nonfree~3+ipw2100/defines 2008-10-28 22:56:00.0 +0100 @@ -4,4 +4,5 @@ iwlwifi qlogic ralink + ipw2100 ipw2200 diff -N -r -u firmware-nonfree~2+ipw2200/ipw2100/defines firmware-nonfree~3+ipw2100/ipw2100/defines --- firmware-nonfree~2+ipw2200/ipw2100/defines 1970-01-01 01:00:00.0 +0100 +++ firmware-nonfree~3+ipw2100/ipw2100/defines 2008-10-28 22:57:12.0 +0100 @@ -0,0 +1,24 @@ +[base] +desc: Intel Pro Wireless 2100 +files: + ipw2100-1.3.fw + ipw2100-1.3-i.fw + ipw2100-1.3-p.fw +longdesc: Intel Pro Wireless 2100 cards. + Those firmware are covered by the Intel license, which is available + at /usr/share/doc/firmware-ipw2100/copyright +uri: http://ipw2100.sourceforge.net/firmware.php?fid=4 +links: + ../../usr/share/doc/firmware-ipw2100/copyright:/lib/firmware/ipw2100.LICENSE + +[ipw2100-1.3.fw_base] +desc: Intel Pro Wireless 2100 firmware (bootstrap) +version: 1.3 + +[ipw2100-1.3-i.fw_base] +desc: Intel Pro Wireless 2100 firmware (ibss mode) +version: 1.3 + +[ipw2100-1.3-p.fw_base] +desc: Intel Pro Wireless 2100 firmware (monitor mode) +version: 1.3 diff -N -r -u firmware-nonfree~2+ipw2200/ipw2100/LICENSE firmware-nonfree~3+ipw2100/ipw2100/LICENSE --- firmware-nonfree~2+ipw2200/ipw2100/LICENSE 1970-01-01 01:00:00.0 +0100 +++ firmware-nonfree~3+ipw2100/ipw2100/LICENSE 2008-10-28 22:56:00.0 +0100 @@ -0,0 +1,207 @@ + 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
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=faqs=license -- 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=FAQs=license#license_1 -- 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=faqs=license -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#501157: linux-image-2.6.26: New Intel Wifi Link 5100 and 5300.
Package: linux-image-2.6.26-1-686 Version: 2.6.26-5 Severity: wishlist Hello, Intel has a new wireless chipset. Laptops with those chipset are currently hitting the market, and we can assume they will replace the 3965/4965 soon. Are there any plan (and any chance) to have them supported in Lenny ? It seems that the driver is getting merged in upstream kernel 2.6.27. On August 13, 2008 Tomas Winkler Wrote (on linux-kernel[1] ): Intel would like to announce Linux support for Wifi Link 5000 and 5100 Series Adapters under iwlwifi driver (iwlagn.ko) The Intel(R) WiFi Link 5100 Series and 5300 is a families of IEEE 802.11a/b/g/Draft-N1 wireless network adapters that operate in both the 2.4 GHz and 5.0 GHz spectra. These adapters, available in both PCIe* Mini Card and Half Mini Card form factor 5100 1x2 MIMO up to 300Mbps 5300 3x3 MIMO up to 450Mbps A summary of this discussion will be available in the wiki page : http://wiki.debian.org/iwlwifi Thanks, Franklin -- [1] http://marc.info/?l=linux-wirelessm=121866189316587w=2 For reference, the models supported by iwl5000: 8086:4232 Wifi Link 5100 Wireless Adapter 8086 1201 5100ABGN Mini Card 8086 1205 5100BG Mini Card 8086 1206 5100ABG Mini Card 8086 1301 5100ABGN Half Mini Card 8086 1305 5100BG Half Mini Card 8086 1306 5100ABG Half Mini Card 8086 1321 5100ABGN Half Mini Card Dell 8086 1326 5100ABG Half Mini Card Dell 8086:4235 Wifi Link 5300 Wireless Adapter 8086 1001 5300ABGN Mini Card 8086 1101 5300ABGN Half Mini Card 8086 1121 5300ABGN Half Mini Card Dell 8086:4236 Wifi Link 5300 Wireless Adapter 8086 1011 5300ABGN Mini Card Lenovo 8086:4237 Wifi Link 5100 Wireless Adapter 8086 1211 5100ABGN Mini Card Lenovo 8086 1216 5100ABG Mini Card Lenovo -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
