Ubuntu
linux-firmware-nonfree package

Merge lp:~chasedouglas/ubuntu/lucid/linux-firmware-nonfree/updates into lp:ubuntu/lucid/linux-firmware-nonfree

  1. Lucid (10.04)
  2. updates
  3. Merge into lucid
Proposed by Chase Douglas
Status: Merged
Merge reported by: Chase Douglas
Merged at revision: not available
Proposed branch: lp:~chasedouglas/ubuntu/lucid/linux-firmware-nonfree/updates
Merge into: lp:ubuntu/lucid/linux-firmware-nonfree
Diff against target: 194 lines (+85/-4)
8 files modified
debian/changelog (+13/-0)
debian/control (+3/-2)
debian/copyright (+2/-0)
debian/rules (+3/-1)
debian/source/format (+1/-0)
firmware/crystalhd/BOM (+4/-0)
firmware/dvb/BOM (+13/-1)
firmware/dvb/Update_firmware (+46/-0)
To merge this branch: bzr merge lp:~chasedouglas/ubuntu/lucid/linux-firmware-nonfree/updates
Reviewer Review Type Date Requested Status
Andy Whitcroft Pending
Review via email: mp+22472@code.launchpad.net

Description of the change

  * Added dvb firmware for AVerTV HD A180 tuner card and derivatives
    -LP: #508317
  * Clean up packaging, fixing lintian warnings
    - Added packaging copyright assigned to Tim Gardner
  * Updated dvb-usb-af9015.fw to newer version
    -LP: #458444
  * Add Update_firmware script and many dvb firmware files

To post a comment you must log in.
lp:~chasedouglas/ubuntu/lucid/linux-firmware-nonfree/updates updated
12. By Chase Douglas

Add Update_firmware script and many dvb firmware files

13. By Chase Douglas

Add Broadcom Crystal HD firmware

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-04 12:57:03 +0000
+++ debian/changelog 2010-04-06 15:07:28 +0000
@@ -1,3 +1,16 @@
1linux-firmware-nonfree (1.8) lucid; urgency=low
2
3 * Added dvb firmware for AVerTV HD A180 tuner card and derivatives
4 -LP: #508317
5 * Clean up packaging, fixing lintian warnings
6 - Added packaging copyright assigned to Tim Gardner
7 * Updated dvb-usb-af9015.fw to newer version
8 -LP: #458444
9 * Add Update_firmware script and many dvb firmware files
10 * Add Broadcom Crystal HD firmware
11
12 -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 06 Apr 2010 10:59:46 -0400
13
1linux-firmware-nonfree (1.7) lucid; urgency=low14linux-firmware-nonfree (1.7) lucid; urgency=low
215
3 * Updated dvb-fe-cx24116.fw to 1.26.90.0, fixes previous corrupt file16 * Updated dvb-fe-cx24116.fw to 1.26.90.0, fixes previous corrupt file
417
=== modified file 'debian/control'
--- debian/control 2009-08-16 20:26:34 +0000
+++ debian/control 2010-04-06 15:07:28 +0000
@@ -2,14 +2,15 @@
2Section: kernel2Section: kernel
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>4Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
5Standards-Version: 3.8.35Standards-Version: 3.8.4
6Build-Depends: debhelper (>= 5)6Build-Depends: debhelper (>= 7)
77
8Package: linux-firmware-nonfree8Package: linux-firmware-nonfree
9Architecture: all9Architecture: all
10Conflicts: linux-firmware (<< 1.17)10Conflicts: linux-firmware (<< 1.17)
11Replaces: linux-firmware (<< 1.17)11Replaces: linux-firmware (<< 1.17)
12Priority: optional12Priority: optional
13Depends: ${misc:Depends}
13Description: Non-free firmware for Linux kernel drivers14Description: Non-free firmware for Linux kernel drivers
14 This package provides non-free firmware used by Linux kernel drivers.15 This package provides non-free firmware used by Linux kernel drivers.
15 .16 .
1617
=== modified file 'debian/copyright'
--- debian/copyright 2009-08-16 20:26:34 +0000
+++ debian/copyright 2010-04-06 15:07:28 +0000
@@ -9,6 +9,8 @@
9The firmware in this package is of dubious origin and has no9The firmware in this package is of dubious origin and has no
10licensing attached. Use at your own risk and disgression.10licensing attached. Use at your own risk and disgression.
1111
12The debian packaging is copyright (C) 2009-2010 Tim Gardner
13
12The firmware was downloaded from:14The firmware was downloaded from:
1315
14wget http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw16wget http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw
1517
=== modified file 'debian/rules'
--- debian/rules 2009-11-24 15:17:07 +0000
+++ debian/rules 2010-04-06 15:07:28 +0000
@@ -8,7 +8,8 @@
8install-indep: build-indep8install-indep: build-indep
9 dh_testdir9 dh_testdir
10 dh_testroot10 dh_testroot
11 dh_clean -k -i11 dh_prep
12 dh_clean -i
1213
13 install -d $(firm_dir)14 install -d $(firm_dir)
1415
@@ -40,6 +41,7 @@
40clean:41clean:
41 dh_testdir42 dh_testdir
42 dh_testroot43 dh_testroot
44 dh_prep
43 dh_clean45 dh_clean
4446
45.PHONY: clean binary build binary-indep install-indep binary-arch build-arch build-indep47.PHONY: clean binary build binary-indep install-indep binary-arch build-arch build-indep
4648
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2010-04-06 15:07:28 +0000
@@ -0,0 +1,1 @@
13.0 (native)
02
=== added directory 'firmware/crystalhd'
=== added file 'firmware/crystalhd/BOM'
--- firmware/crystalhd/BOM 1970-01-01 00:00:00 +0000
+++ firmware/crystalhd/BOM 2010-04-06 15:07:28 +0000
@@ -0,0 +1,4 @@
1Downloaded from Jarod Wilson's crystal hd git tree:
2http://git.wilsonet.com/crystalhd.git/ commit a8e27b2203eb2c1f0266176f5c70d8c5b6102c76
3firmware/fwbin/70012/bcm70012fw.bin
4firmware/fwbin/70015/bcm70015fw.bin
05
=== added file 'firmware/crystalhd/bcm70012fw.bin'
1Binary files firmware/crystalhd/bcm70012fw.bin 1970-01-01 00:00:00 +0000 and firmware/crystalhd/bcm70012fw.bin 2010-04-06 15:07:28 +0000 differ6Binary files firmware/crystalhd/bcm70012fw.bin 1970-01-01 00:00:00 +0000 and firmware/crystalhd/bcm70012fw.bin 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/crystalhd/bcm70015fw.bin'
2Binary files firmware/crystalhd/bcm70015fw.bin 1970-01-01 00:00:00 +0000 and firmware/crystalhd/bcm70015fw.bin 2010-04-06 15:07:28 +0000 differ7Binary files firmware/crystalhd/bcm70015fw.bin 1970-01-01 00:00:00 +0000 and firmware/crystalhd/bcm70015fw.bin 2010-04-06 15:07:28 +0000 differ
=== modified file 'firmware/dvb/BOM'
--- firmware/dvb/BOM 2010-03-04 12:57:03 +0000
+++ firmware/dvb/BOM 2010-04-06 15:07:28 +0000
@@ -1,4 +1,10 @@
1wget -NO dvb-usb-af9015.fw http://jusst.de/manu/fw/AFA/dvb-usb-af9015.fw_a-link1Most DVB firmware is retrieved using the latest get_dvb_firmware from the
2linux-2.6 git repository. The following lists firmware source for firmware
3retrieved elsewhere.
4
5AfaTech AF9015
6wget -N http://www.otit.fi/~crope/v4l-dvb/af9015/af9015_firmware_cutter/firmware_files/4.95.0/dvb-usb-af9015.fw
7echo "dccbc92c9168cc629a88b34ee67ede7b *dvb-usb-af9015.fw"|md5sum -c
28
3Hauppauge DVB-S2 PCI9Hauppauge DVB-S2 PCI
4wget -N http://www.wintvcd.co.uk/drivers/88x_2_124_27191_1_WHQL.zip10wget -N http://www.wintvcd.co.uk/drivers/88x_2_124_27191_1_WHQL.zip
@@ -12,3 +18,9 @@
12chmod a+x extract.sh18chmod a+x extract.sh
13./extract.sh19./extract.sh
14echo "b9fa8f284483480675d29d19e704f62c *dvb-fe-tda10048-1.0.fw"|md5sum -c20echo "b9fa8f284483480675d29d19e704f62c *dvb-fe-tda10048-1.0.fw"|md5sum -c
21
22AVerTV HD A180
23wget -N http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip
24unzip -oj AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip
25dd if=3xHybrid.sys of=dvb-fe-nxt2004.fw skip=465304 bs=1 count=9584
26echo "2a7e38d3ebc392264f840dcb89e08829 *dvb-fe-nxt2004.fw"|md5sum -c
1527
=== added file 'firmware/dvb/Update_firmware'
--- firmware/dvb/Update_firmware 1970-01-01 00:00:00 +0000
+++ firmware/dvb/Update_firmware 2010-04-06 15:07:28 +0000
@@ -0,0 +1,46 @@
1#!/bin/sh
2
3if [ $# -gt 1 ] || [ $# -eq 1 -a "$1" != "-u" ]; then
4 echo "Usage: $0 [-u]"
5 echo " -u: Update existing firmware files"
6 exit 1
7fi
8
9UPDATE=0
10EXCLUDE_FREE="(cx18|cx231xx|cx23885|pvrusb2)"
11
12if [ $# -eq 1 ]; then
13 UPDATE=1
14fi
15
16wget --quiet "http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/dvb/get_dvb_firmware;hb=HEAD" -O get_dvb_firmware
17chmod a+x get_dvb_firmware
18
19# Export FWS=<firmware> to test retrieving specific firmware
20if [ "x${FWS}" = "x" ]; then
21 FWS=`./get_dvb_firmware 2>&1 | grep "^ " | egrep -v "${EXCLUDE_FREE}"`
22fi
23
24for FW in ${FWS}; do
25 mkdir tmp-${FW}
26 cd tmp-${FW}
27
28 echo -n "Retrieving firmware for ${FW}..."
29 if ../get_dvb_firmware ${FW} >/dev/null 2>&1; then
30 if [ $UPDATE -eq 1 ]; then
31 cp *.fw ../
32 else
33 cp -n *.fw ../
34 fi
35
36 echo "success"
37 else
38 echo "failure"
39 fi
40
41 cd ..
42 rm -rf tmp-${FW}
43
44done
45
46rm get_dvb_firmware
047
=== added file 'firmware/dvb/dvb-cx18-mpc718-mt352.fw'
1Binary files firmware/dvb/dvb-cx18-mpc718-mt352.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-cx18-mpc718-mt352.fw 2010-04-06 15:07:28 +0000 differ48Binary files firmware/dvb/dvb-cx18-mpc718-mt352.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-cx18-mpc718-mt352.fw 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-dibusb-5.0.0.11.fw'
2Binary files firmware/dvb/dvb-dibusb-5.0.0.11.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-dibusb-5.0.0.11.fw 2010-04-06 15:07:28 +0000 differ49Binary files firmware/dvb/dvb-dibusb-5.0.0.11.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-dibusb-5.0.0.11.fw 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-fe-nxt2004.fw'
3Binary files firmware/dvb/dvb-fe-nxt2004.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-fe-nxt2004.fw 2010-04-06 15:07:28 +0000 differ50Binary files firmware/dvb/dvb-fe-nxt2004.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-fe-nxt2004.fw 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-ttusb-dec-2000t.fw'
4Binary files firmware/dvb/dvb-ttusb-dec-2000t.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-2000t.fw 2010-04-06 15:07:28 +0000 differ51Binary files firmware/dvb/dvb-ttusb-dec-2000t.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-2000t.fw 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-ttusb-dec-2540t.fw'
5Binary files firmware/dvb/dvb-ttusb-dec-2540t.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-2540t.fw 2010-04-06 15:07:28 +0000 differ52Binary files firmware/dvb/dvb-ttusb-dec-2540t.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-2540t.fw 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/dvb-ttusb-dec-3000s.fw'
6Binary files firmware/dvb/dvb-ttusb-dec-3000s.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-3000s.fw 2010-04-06 15:07:28 +0000 differ53Binary files firmware/dvb/dvb-ttusb-dec-3000s.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/dvb-ttusb-dec-3000s.fw 2010-04-06 15:07:28 +0000 differ
=== modified file 'firmware/dvb/dvb-usb-af9015.fw'
7Binary files firmware/dvb/dvb-usb-af9015.fw 2009-08-16 20:26:34 +0000 and firmware/dvb/dvb-usb-af9015.fw 2010-04-06 15:07:28 +0000 differ54Binary files firmware/dvb/dvb-usb-af9015.fw 2009-08-16 20:26:34 +0000 and firmware/dvb/dvb-usb-af9015.fw 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/ngene_15.fw'
8Binary files firmware/dvb/ngene_15.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/ngene_15.fw 2010-04-06 15:07:28 +0000 differ55Binary files firmware/dvb/ngene_15.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/ngene_15.fw 2010-04-06 15:07:28 +0000 differ
=== added file 'firmware/dvb/ngene_17.fw'
9Binary files firmware/dvb/ngene_17.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/ngene_17.fw 2010-04-06 15:07:28 +0000 differ56Binary files firmware/dvb/ngene_17.fw 1970-01-01 00:00:00 +0000 and firmware/dvb/ngene_17.fw 2010-04-06 15:07:28 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: