[kernel] r11515 - in dists/etch/firmware-nonfree: . bnx2 debian debian/templates iwlwifi

Wed Jun 4 07:57:15 UTC 2008

Author: dannf
Date: Wed Jun  4 07:57:14 2008
New Revision: 11515

Log:
update some fw for etch/etchnhalf

Added:
   dists/etch/firmware-nonfree/bnx2/
      - copied from r11413, /dists/trunk/firmware-nonfree/bnx2/
   dists/etch/firmware-nonfree/iwlwifi/
   dists/etch/firmware-nonfree/iwlwifi/LICENSE
   dists/etch/firmware-nonfree/iwlwifi/defines
   dists/etch/firmware-nonfree/iwlwifi/iwlwifi-3945-1.ucode   (contents, props changed)
   dists/etch/firmware-nonfree/iwlwifi/iwlwifi-4965-1.ucode   (contents, props changed)
   dists/etch/firmware-nonfree/iwlwifi/update.sh   (contents, props changed)
Modified:
   dists/etch/firmware-nonfree/bnx2/defines
   dists/etch/firmware-nonfree/debian/changelog
   dists/etch/firmware-nonfree/debian/templates/postinst.initramfs-tools.in
   dists/etch/firmware-nonfree/defines

Modified: dists/etch/firmware-nonfree/bnx2/defines
==============================================================================

--- /dists/trunk/firmware-nonfree/bnx2/defines	(original)
+++ dists/etch/firmware-nonfree/bnx2/defines	Wed Jun  4 07:57:14 2008
@@ -4,6 +4,7 @@
  bnx2-06-4.0.5.fw
  bnx2-09-4.0.5.fw
 longdesc: Broadcom NetXtremeII network adapters
+support: initramfs-tools
 uri: http://ftp.debian.org/debian/pool/non-free/f/firmware-nonfree
 
 [bnx2-06-4.0.5.fw_base]

Modified: dists/etch/firmware-nonfree/debian/changelog
==============================================================================
--- dists/etch/firmware-nonfree/debian/changelog	(original)
+++ dists/etch/firmware-nonfree/debian/changelog	Wed Jun  4 07:57:14 2008
@@ -1,3 +1,13 @@
+firmware-nonfree (0.4+etchnhalf.1) UNRELEASED; urgency=low
+
+  * Backport iwlwifi and bnx2 firmware from 0.11 release, only used
+    in etch by drivers in the etchnhalf kernel.
+  * Add initramfs hook support for bnx2
+  * Correct path to initramfs.conf file in postinst which was preventing
+    initramfs updates for qlogic (and now bnx2) fw, closes: #432042
+
+ -- dann frazier <dannf at debian.org>  Wed, 04 Jun 2008 01:33:43 -0600
+
 firmware-nonfree (0.4etch1) stable; urgency=high
 
   * Build-depend on linux-support-2.6.18-6; closes: #468215.

Modified: dists/etch/firmware-nonfree/debian/templates/postinst.initramfs-tools.in
==============================================================================
--- dists/etch/firmware-nonfree/debian/templates/postinst.initramfs-tools.in	(original)
+++ dists/etch/firmware-nonfree/debian/templates/postinst.initramfs-tools.in	Wed Jun  4 07:57:14 2008
@@ -4,7 +4,7 @@
 
 case "$1" in
 	configure)
-		if [ -x /usr/sbin/update-initramfs -a -e /etc/mkinitramfs/initramfs.conf ] ; then
+		if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ] ; then
 			update-initramfs -u
 		fi
 	;;

Modified: dists/etch/firmware-nonfree/defines
==============================================================================
--- dists/etch/firmware-nonfree/defines	(original)
+++ dists/etch/firmware-nonfree/defines	Wed Jun  4 07:57:14 2008
@@ -1,4 +1,6 @@
 [base]
 packages:
+ bnx2
+ iwlwifi
  ipw3945
  qlogic

Added: dists/etch/firmware-nonfree/iwlwifi/LICENSE
==============================================================================
--- (empty file)
+++ dists/etch/firmware-nonfree/iwlwifi/LICENSE	Wed Jun  4 07:57:14 2008
@@ -0,0 +1,39 @@
+Copyright (c) 2006, Intel 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 Intel 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.  Intel 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.

Added: dists/etch/firmware-nonfree/iwlwifi/defines
==============================================================================
--- (empty file)
+++ dists/etch/firmware-nonfree/iwlwifi/defines	Wed Jun  4 07:57:14 2008
@@ -0,0 +1,13 @@
+[base]
+desc: Intel Wireless 3945 and 4965
+files:
+ iwlwifi-3945-1.ucode
+ iwlwifi-4965-1.ucode
+longdesc: Intel Wireless 3945 and 4965 cards
+uri: http://intellinuxwireless.org/?p=iwlwifi&n=downloads
+
+[iwlwifi-3945-1.ucode_base]
+desc: Intel Wireless 3945 firmware
+
+[iwlwifi-4965-1.ucode_base]
+desc: Intel Wireless 4965 firmware

Added: dists/etch/firmware-nonfree/iwlwifi/iwlwifi-3945-1.ucode
==============================================================================
Binary file. No diff available.

Added: dists/etch/firmware-nonfree/iwlwifi/iwlwifi-4965-1.ucode
==============================================================================
Binary file. No diff available.

Added: dists/etch/firmware-nonfree/iwlwifi/update.sh
==============================================================================
--- (empty file)
+++ dists/etch/firmware-nonfree/iwlwifi/update.sh	Wed Jun  4 07:57:14 2008
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+version="$1"
+url="$2"
+
+mkdir update
+curl -o update/ucode.tgz "$url"
+
+tar -C update -xzf update/ucode.tgz
+file="$(tar -tzf update/ucode.tgz | grep -e "\.ucode$")"
+file_real="${file#*/}"
+mv update/"$file" "$file_real"-"$version"
+
+rm update -rf

