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

Proposed by Chase Douglas on 2010-03-30
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 2010-03-30 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.
12. By Chase Douglas on 2010-04-02

Add Update_firmware script and many dvb firmware files

13. By Chase Douglas on 2010-04-06

Add Broadcom Crystal HD firmware

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-04 12:57:03 +0000
3+++ debian/changelog 2010-04-06 15:07:28 +0000
4@@ -1,3 +1,16 @@
5+linux-firmware-nonfree (1.8) lucid; urgency=low
6+
7+ * Added dvb firmware for AVerTV HD A180 tuner card and derivatives
8+ -LP: #508317
9+ * Clean up packaging, fixing lintian warnings
10+ - Added packaging copyright assigned to Tim Gardner
11+ * Updated dvb-usb-af9015.fw to newer version
12+ -LP: #458444
13+ * Add Update_firmware script and many dvb firmware files
14+ * Add Broadcom Crystal HD firmware
15+
16+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 06 Apr 2010 10:59:46 -0400
17+
18 linux-firmware-nonfree (1.7) lucid; urgency=low
19
20 * Updated dvb-fe-cx24116.fw to 1.26.90.0, fixes previous corrupt file
21
22=== modified file 'debian/control'
23--- debian/control 2009-08-16 20:26:34 +0000
24+++ debian/control 2010-04-06 15:07:28 +0000
25@@ -2,14 +2,15 @@
26 Section: kernel
27 Priority: optional
28 Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
29-Standards-Version: 3.8.3
30-Build-Depends: debhelper (>= 5)
31+Standards-Version: 3.8.4
32+Build-Depends: debhelper (>= 7)
33
34 Package: linux-firmware-nonfree
35 Architecture: all
36 Conflicts: linux-firmware (<< 1.17)
37 Replaces: linux-firmware (<< 1.17)
38 Priority: optional
39+Depends: ${misc:Depends}
40 Description: Non-free firmware for Linux kernel drivers
41 This package provides non-free firmware used by Linux kernel drivers.
42 .
43
44=== modified file 'debian/copyright'
45--- debian/copyright 2009-08-16 20:26:34 +0000
46+++ debian/copyright 2010-04-06 15:07:28 +0000
47@@ -9,6 +9,8 @@
48 The firmware in this package is of dubious origin and has no
49 licensing attached. Use at your own risk and disgression.
50
51+The debian packaging is copyright (C) 2009-2010 Tim Gardner
52+
53 The firmware was downloaded from:
54
55 wget http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw
56
57=== modified file 'debian/rules'
58--- debian/rules 2009-11-24 15:17:07 +0000
59+++ debian/rules 2010-04-06 15:07:28 +0000
60@@ -8,7 +8,8 @@
61 install-indep: build-indep
62 dh_testdir
63 dh_testroot
64- dh_clean -k -i
65+ dh_prep
66+ dh_clean -i
67
68 install -d $(firm_dir)
69
70@@ -40,6 +41,7 @@
71 clean:
72 dh_testdir
73 dh_testroot
74+ dh_prep
75 dh_clean
76
77 .PHONY: clean binary build binary-indep install-indep binary-arch build-arch build-indep
78
79=== added directory 'debian/source'
80=== added file 'debian/source/format'
81--- debian/source/format 1970-01-01 00:00:00 +0000
82+++ debian/source/format 2010-04-06 15:07:28 +0000
83@@ -0,0 +1,1 @@
84+3.0 (native)
85
86=== added directory 'firmware/crystalhd'
87=== added file 'firmware/crystalhd/BOM'
88--- firmware/crystalhd/BOM 1970-01-01 00:00:00 +0000
89+++ firmware/crystalhd/BOM 2010-04-06 15:07:28 +0000
90@@ -0,0 +1,4 @@
91+Downloaded from Jarod Wilson's crystal hd git tree:
92+http://git.wilsonet.com/crystalhd.git/ commit a8e27b2203eb2c1f0266176f5c70d8c5b6102c76
93+firmware/fwbin/70012/bcm70012fw.bin
94+firmware/fwbin/70015/bcm70015fw.bin
95
96=== added file 'firmware/crystalhd/bcm70012fw.bin'
97Binary 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
98=== added file 'firmware/crystalhd/bcm70015fw.bin'
99Binary 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
100=== modified file 'firmware/dvb/BOM'
101--- firmware/dvb/BOM 2010-03-04 12:57:03 +0000
102+++ firmware/dvb/BOM 2010-04-06 15:07:28 +0000
103@@ -1,4 +1,10 @@
104-wget -NO dvb-usb-af9015.fw http://jusst.de/manu/fw/AFA/dvb-usb-af9015.fw_a-link
105+Most DVB firmware is retrieved using the latest get_dvb_firmware from the
106+linux-2.6 git repository. The following lists firmware source for firmware
107+retrieved elsewhere.
108+
109+AfaTech AF9015
110+wget -N http://www.otit.fi/~crope/v4l-dvb/af9015/af9015_firmware_cutter/firmware_files/4.95.0/dvb-usb-af9015.fw
111+echo "dccbc92c9168cc629a88b34ee67ede7b *dvb-usb-af9015.fw"|md5sum -c
112
113 Hauppauge DVB-S2 PCI
114 wget -N http://www.wintvcd.co.uk/drivers/88x_2_124_27191_1_WHQL.zip
115@@ -12,3 +18,9 @@
116 chmod a+x extract.sh
117 ./extract.sh
118 echo "b9fa8f284483480675d29d19e704f62c *dvb-fe-tda10048-1.0.fw"|md5sum -c
119+
120+AVerTV HD A180
121+wget -N http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip
122+unzip -oj AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip
123+dd if=3xHybrid.sys of=dvb-fe-nxt2004.fw skip=465304 bs=1 count=9584
124+echo "2a7e38d3ebc392264f840dcb89e08829 *dvb-fe-nxt2004.fw"|md5sum -c
125
126=== added file 'firmware/dvb/Update_firmware'
127--- firmware/dvb/Update_firmware 1970-01-01 00:00:00 +0000
128+++ firmware/dvb/Update_firmware 2010-04-06 15:07:28 +0000
129@@ -0,0 +1,46 @@
130+#!/bin/sh
131+
132+if [ $# -gt 1 ] || [ $# -eq 1 -a "$1" != "-u" ]; then
133+ echo "Usage: $0 [-u]"
134+ echo " -u: Update existing firmware files"
135+ exit 1
136+fi
137+
138+UPDATE=0
139+EXCLUDE_FREE="(cx18|cx231xx|cx23885|pvrusb2)"
140+
141+if [ $# -eq 1 ]; then
142+ UPDATE=1
143+fi
144+
145+wget --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
146+chmod a+x get_dvb_firmware
147+
148+# Export FWS=<firmware> to test retrieving specific firmware
149+if [ "x${FWS}" = "x" ]; then
150+ FWS=`./get_dvb_firmware 2>&1 | grep "^ " | egrep -v "${EXCLUDE_FREE}"`
151+fi
152+
153+for FW in ${FWS}; do
154+ mkdir tmp-${FW}
155+ cd tmp-${FW}
156+
157+ echo -n "Retrieving firmware for ${FW}..."
158+ if ../get_dvb_firmware ${FW} >/dev/null 2>&1; then
159+ if [ $UPDATE -eq 1 ]; then
160+ cp *.fw ../
161+ else
162+ cp -n *.fw ../
163+ fi
164+
165+ echo "success"
166+ else
167+ echo "failure"
168+ fi
169+
170+ cd ..
171+ rm -rf tmp-${FW}
172+
173+done
174+
175+rm get_dvb_firmware
176
177=== added file 'firmware/dvb/dvb-cx18-mpc718-mt352.fw'
178Binary 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
179=== added file 'firmware/dvb/dvb-dibusb-5.0.0.11.fw'
180Binary 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
181=== added file 'firmware/dvb/dvb-fe-nxt2004.fw'
182Binary 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
183=== added file 'firmware/dvb/dvb-ttusb-dec-2000t.fw'
184Binary 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
185=== added file 'firmware/dvb/dvb-ttusb-dec-2540t.fw'
186Binary 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
187=== added file 'firmware/dvb/dvb-ttusb-dec-3000s.fw'
188Binary 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
189=== modified file 'firmware/dvb/dvb-usb-af9015.fw'
190Binary 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
191=== added file 'firmware/dvb/ngene_15.fw'
192Binary 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
193=== added file 'firmware/dvb/ngene_17.fw'
194Binary 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: