[firmware-nonfree] 14/24: linux-nonfree: Split into firmware-{amd-graphics, misc-nonfree} packages
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Oct 18 13:49:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository firmware-nonfree.
commit 97161b2b007e9296971e45ab55d6c1e3e90b181c
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Fri Oct 16 03:58:13 2015 +0100
linux-nonfree: Split into firmware-{amd-graphics,misc-nonfree} packages
Keep firmware-linux-nonfree as a meta-package.
---
debian/changelog | 1 +
debian/config/amd-graphics/LICENSE | 81 +++++++
.../config/{linux-nonfree => amd-graphics}/defines | 234 +--------------------
debian/config/defines | 3 +-
.../config/{linux-nonfree => misc-nonfree}/LICENSE | 106 ++--------
.../cxgb4/t4fw-1.12.25.0.bin | Bin
.../{linux-nonfree => misc-nonfree}/cxgb4/t4fw.bin | 0
.../cxgb4/t5fw-1.12.25.0.bin | Bin
.../{linux-nonfree => misc-nonfree}/cxgb4/t5fw.bin | 0
debian/config/misc-nonfree/defines | 234 +++++++++++++++++++++
debian/templates/control.binary.meta.in | 10 +
11 files changed, 343 insertions(+), 326 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ad16494..1347276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ firmware-nonfree (20151018-1) UNRELEASED; urgency=medium
* check_upstream.py: Reimplement check for unpackaged firmware
* debian/control: Set the upstream homepage URL to the current cgit page
for linux-firmware.git (except for ipw2x00 and ivtv packages)
+ * linux-nonfree: Split into firmware-{amd-graphics,misc-nonfree} packages
[ maximilian attems ]
* iwlwifi: Update Intel Wireless 3160, 7260, 7265 and 7265D firmware version
diff --git a/debian/config/amd-graphics/LICENSE b/debian/config/amd-graphics/LICENSE
new file mode 100644
index 0000000..164c379
--- /dev/null
+++ b/debian/config/amd-graphics/LICENSE
@@ -0,0 +1,81 @@
+Files: r128/r128_cce.bin, radeon/*_cp.bin,
+ radeon/R600_me.bin, radeon/R600_pfp.bin,
+ radeon/RS780_*.bin, radeon/RV*_me.bin,
+ radeon/RV*_pfp.bin
+Copyright: 2000-2009, Advanced Micro Devices, Inc.
+License: Binary redistribution (AMD permissive)
+ All Rights Reserved.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: radeon/*.bin
+Copyright: 2009-2014, Advanced Micro Devices, Inc.
+License: Binary redistribution (AMD restrictive)
+ All rights reserved.
+ .
+ REDISTRIBUTION: Permission is hereby granted, free of any license fees,
+ to any person obtaining a copy of this microcode (the "Software"), to
+ install, reproduce, copy and distribute copies, in binary form only, of
+ the Software and to permit persons to whom the Software is provided to
+ do the same, provided that the following conditions are met:
+ .
+ No reverse engineering, decompilation, or disassembly of this Software
+ is permitted.
+ .
+ Redistributions must reproduce the above copyright notice, this
+ permission notice, and the following disclaimers and notices in the
+ Software documentation and/or other materials provided with the
+ Software.
+ .
+ DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK. THE SOFTWARE
+ IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
+ HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
+ IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
+ MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
+ UNINTERRUPTED OR ERROR-FREE. THE ENTIRE RISK ASSOCIATED WITH THE USE OF
+ THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, COPYRIGHT HOLDER AND ITS
+ LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
+ OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
+ ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
+ .
+ DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
+ HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
+ ("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
+ SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
+ PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
+ LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
+ BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
+ INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
+ PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
+ REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN
+ NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
+ LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
+ CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
+ US$10.
+ .
+ Notice: The Software is subject to United States export laws and
+ regulations. You agree to comply with all domestic and international
+ export laws and regulations that apply to the Software, including but
+ not limited to the Export Administration Regulations administered by the
+ U.S. Department of Commerce and International Traffic in Arm Regulations
+ administered by the U.S. Department of State. These laws include
+ restrictions on destinations, end users and end use.
diff --git a/debian/config/linux-nonfree/defines b/debian/config/amd-graphics/defines
similarity index 80%
rename from debian/config/linux-nonfree/defines
rename to debian/config/amd-graphics/defines
index 2b35813..c7e3ce4 100644
--- a/debian/config/linux-nonfree/defines
+++ b/debian/config/amd-graphics/defines
@@ -1,56 +1,7 @@
[base]
-desc: various drivers in the Linux kernel
-longdesc:
- various drivers in the Linux kernel. This is a collection of firmware blobs
- which are not individually large enough to warrant a standalone package
-replaces: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~)
-breaks: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~)
+desc: AMD/ATI graphics chips
+longdesc: AMD/ATI graphics chips supported by the radeon and r128 drivers
files:
- 3com/typhoon.bin
- advansys/3550.bin
- advansys/38C0800.bin
- advansys/38C1600.bin
- advansys/mcode.bin
- agere_ap_fw.bin
- agere_sta_fw.bin
- cxgb3/ael2005_opt_edc.bin
- cxgb3/ael2005_twx_edc.bin
- cxgb3/ael2020_twx_edc.bin
- cxgb3/t3b_psram-1.1.0.bin
- cxgb3/t3c_psram-1.1.0.bin
- cxgb3/t3fw-7.4.0.bin
- cxgb3/t3fw-7.10.0.bin
- cxgb3/t3fw-7.12.0.bin
- cxgb4/t4fw.bin
- cxgb4/t4fw-1.12.25.0.bin
- cxgb4/t5fw.bin
- cxgb4/t5fw-1.12.25.0.bin
- dabusb/bitstream.bin
- dabusb/firmware.fw
- dvb-fe-xc4000-1.4.1.fw
- dvb-fe-xc5000-1.6.114.fw
- dvb-fe-xc5000c-4.1.30.7.fw
- dvb-usb-dib0700-1.20.fw
- dvb-usb-it9135-01.fw
- dvb-usb-it9135-02.fw
- e100/d101m_ucode.bin
- e100/d101s_ucode.bin
- e100/d102e_ucode.bin
- ene-ub6250/msp_rdwr.bin
- ene-ub6250/ms_init.bin
- ene-ub6250/ms_rdwr.bin
- ene-ub6250/sd_init1.bin
- ene-ub6250/sd_init2.bin
- ene-ub6250/sd_rdwr.bin
- kaweth/new_code.bin
- kaweth/new_code_fix.bin
- kaweth/trigger_code.bin
- kaweth/trigger_code_fix.bin
- matrox/g200_warp.fw
- matrox/g400_warp.fw
- mts_cdma.fw
- mts_edge.fw
- mts_gsm.fw
r128/r128_cce.bin
radeon/ARUBA_me.bin
radeon/ARUBA_pfp.bin
@@ -274,150 +225,7 @@ files:
radeon/VERDE_rlc.bin
radeon/verde_smc.bin
radeon/VERDE_smc.bin
- tehuti/bdx.bin
- tigon/tg3_tso.bin
- tigon/tg3.bin
- tigon/tg3_tso5.bin
- tigon/tg357766.bin
- v4l-cx231xx-avcore-01.fw
- v4l-cx23418-apu.fw
- v4l-cx23418-cpu.fw
- v4l-cx23418-dig.fw
- v4l-cx25840.fw
- v4l-cx23885-avcore-01.fw
- vntwusb.fw
-support: initramfs-tools
-
-[3com/typhoon.bin_base]
-desc: 3Com Typhoon firmware
-version: 03.001.008
-
-[advansys/3550.bin_base]
-desc: AdvanSys ASC-3550 firmware
-
-[advansys/38C0800.bin_base]
-desc: AdvanSys ASC-38C0800 firmware
-
-[advansys/38C1600.bin_base]
-desc: AdvanSys ASC-38C1600 firmware
-
-[advansys/mcode.bin_base]
-desc: AdvanSys SCSI controller microcode
-
-[agere_ap_fw.bin_base]
-desc: Agere/Prism/Symbol Orinoco firmware (AP mode)
-version: 9.48 Hermes I
-
-[agere_sta_fw.bin_base]
-desc: Agere/Prism/Symbol Orinoco firmware (STA mode)
-version: 9.48 Hermes I
-
-[cxgb3/ael2005_opt_edc.bin_base]
-desc: Chelsio T3 optical EDC firmware (AEL2005 PHY)
-
-[cxgb3/ael2005_twx_edc.bin_base]
-desc: Chelsio T3 twinax EDC firmware (AEL2005 PHY)
-
-[cxgb3/ael2020_twx_edc.bin_base]
-desc: Chelsio T3 twinax EDC firmware (AEL2020 PHY)
-
-[cxgb3/t3b_psram-1.1.0.bin_base]
-desc: Chelsio T3B protocol engine firmware
-version: 1.1.0
-
-[cxgb3/t3c_psram-1.1.0.bin_base]
-desc: Chelsio T3C protocol engine firmware
-version: 1.1.0
-
-[cxgb3/t3fw-7.4.0.bin_base]
-desc: Chelsio T3 main firmware
-version: 7.4.0
-
-[cxgb3/t3fw-7.10.0.bin_base]
-desc: Chelsio T3 main firmware
-version: 7.10.0
-
-[cxgb3/t3fw-7.12.0.bin_base]
-desc: Chelsio T3 main firmware
-version: 7.12.0
-
-[cxgb4/t4fw-1.12.25.0.bin_base]
-desc: Chelsio T4 firmware
-version: 1.12.25.0
-
-[cxgb4/t5fw-1.12.25.0.bin_base]
-desc: Chelsio T5 firmware
-version: 1.12.25.0
-
-[dabusb/firmware.fw_base]
-desc: DAB-USB firmware
-
-[dabusb/bitstream.bin_base]
-desc: DAB-USB FPGA bitfile
-
-[dvb-fe-xc4000-1.4.1.fw_base]
-desc: Xceive 4000 tuner firmware
-version: 1.4.1
-
-[dvb-fe-xc5000-1.6.114.fw_base]
-desc: Xceive 5000 tuner firmware
-version: 1.6.114
-
-[dvb-fe-xc5000c-4.1.30.7.fw_base]
-desc: Xceive 5000c tuner firmware
-version: 4.1.30.7
-
-[dvb-usb-dib0700-1.20.fw_base]
-desc: DiBcom dib0700 USB DVB bridge firmware
-version: 1.20
-
-[dvb-usb-it9135-01.fw_base]
-desc: DiBcom dib9135 DVB-T USB firmware
-
-[dvb-usb-it9135-02.fw_base]
-desc: DiBcom dib9135 DVB-T USB firmware
-
-[e100/d101m_ucode.bin_base]
-desc: Intel 82559 D101M microcode
-
-[e100/d101s_ucode.bin_base]
-desc: Intel 82559 D101S microcode
-
-[e100/d102e_ucode.bin_base]
-desc: Intel 82551-F and 82551-10 microcode
-
-[ene-ub6250/msp_rdwr.bin_base]
-desc: ENE UB6250 MS Pro read/write firmware
-
-[ene-ub6250/ms_init.bin_base]
-desc: ENE UB6250 MS init firmware
-
-[ene-ub6250/ms_rdwr.bin_base]
-desc: ENE UB6250 MS read/write firmware
-
-[ene-ub6250/sd_init1.bin_base]
-desc: ENE UB6250 SD init stage 1 firmware
-
-[ene-ub6250/sd_init2.bin_base]
-desc: ENE UB6250 SD init stage 2 firmware
-
-[ene-ub6250/sd_rdwr.bin_base]
-desc: ENE UB6250 SD read/write firmware
-
-[matrox/g200_warp.fw_base]
-desc: Matrox G200 WARP engine microcode
-
-[matrox/g400_warp.fw_base]
-desc: Matrox G400/G550 WARP engine microcode
-
-[mts_cdma.fw_base]
-desc: Multi-Tech USB CDMA modem firmware
-
-[mts_edge.fw_base]
-desc: Multi-Tech USB EDGE modem firmware
-
-[mts_gsm.fw_base]
-desc: Multi-Tech USB GPRS modem firmware
+uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
[r128/r128_cce.bin_base]
desc: Rage 128 CCE microcode
@@ -1103,39 +911,3 @@ desc: Radeon HD 7700 series SMC microcode
[radeon/VERDE_smc.bin_base]
desc: Radeon HD 7700 series SMC microcode
-
-[tehuti/bdx.bin_base]
-desc: Tehuti network card firmware
-
-[tigon/tg3_tso.bin_base]
-desc: Broadcom BCM5703/BCM5704 TSO firmware
-
-[tigon/tg3.bin_base]
-desc: Broadcom BCM5701A0 firmware
-
-[tigon/tg3_tso5.bin_base]
-desc: Broadcom BCM5705 TSO firmware
-
-[tigon/tg357766.bin_base]
-desc: Broadcom BCM57766 firmware
-
-[v4l-cx231xx-avcore-01.fw_base]
-desc: Conexant CX231xx core firmware
-
-[v4l-cx23418-apu.fw_base]
-desc: Conexant CX23418 APU firmware
-
-[v4l-cx23418-cpu.fw_base]
-desc: Conexant CX23418 CPU firmware
-
-[v4l-cx23418-dig.fw_base]
-desc: Conexant CX23418 ADEC firmware
-
-[v4l-cx25840.fw_base]
-desc: Conexant CX25840 firmware
-
-[v4l-cx23885-avcore-01.fw_base]
-desc: Conexant CX23885 core firmware
-
-[vntwusb.fw_base]
-desc: VIA VT6656 firmware
diff --git a/debian/config/defines b/debian/config/defines
index a0dffa5..5a25202 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,6 +1,7 @@
[base]
packages:
adi
+ amd-graphics
atheros
bnx2
bnx2x
@@ -10,7 +11,7 @@ packages:
ivtv
iwlwifi
libertas
- linux-nonfree
+ misc-nonfree
myricom
netxen
qlogic
diff --git a/debian/config/linux-nonfree/LICENSE b/debian/config/misc-nonfree/LICENSE
similarity index 76%
rename from debian/config/linux-nonfree/LICENSE
rename to debian/config/misc-nonfree/LICENSE
index 4dfe926..c4bd823 100644
--- a/debian/config/linux-nonfree/LICENSE
+++ b/debian/config/misc-nonfree/LICENSE
@@ -150,7 +150,7 @@ License: Binary redistribution (Chelsio)
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.
-Files: linux-nonfree/dabusb/*
+Files: dabusb/*
Copyright: 1999, BayCom GmbH
License: Permissive (BayCom)
Redistribution and use in source and binary forms, with or without
@@ -158,7 +158,7 @@ License: Permissive (BayCom)
code retain the above copyright notice and this comment without
modification.
-Files: linux-nonfree/dvb-fe-xc*
+Files: dvb-fe-xc*
Copyright: 2009, Xceive Corporation <info at xceive.com>
License: Binary redistribution (Xceive)
Permission to use, copy, modify, and/or distribute this software, only
@@ -174,7 +174,7 @@ License: Binary redistribution (Xceive)
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-Files: linux-nonfree/dvb-usb-dib0700-1.20.fw
+Files: dvb-usb-dib0700-1.20.fw
Copyright: 2009, DiBcom
License: Binary redistribution (DiBcom)
Permission to use, copy, modify, and/or distribute this software for
@@ -191,7 +191,7 @@ License: Binary redistribution (DiBcom)
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Files: linux-nonfree/dvb-usb-it9135*
+Files: dvb-usb-it9135*
Copyright: 2014, ITE Tech. Inc.
License: Binary redistribution (ITEtech)
Permission to use, copy, modify, and/or distribute this software for
@@ -208,7 +208,7 @@ License: Binary redistribution (ITEtech)
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Files: linux-nonfree/e100/*
+Files: e100/*
Copyright: 1999-2001, Intel Corporation
License: BSD (Intel)
All rights reserved.
@@ -238,7 +238,7 @@ License: BSD (Intel)
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: linux-nonfree/ene-ub6250/*
+Files: ene-ub6250/*
Copyright: 2011, ENE Technology Inc.
License: Binary redistribution (ENE)
Permission to use, copy, modify, and/or distribute this software for any
@@ -254,7 +254,7 @@ License: Binary redistribution (ENE)
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-Files: linux-nonfree/kaweth/*
+Files: kaweth/*
Copyright: 1999, Kawasaki LSI.
License: BSD 4-clause (Kawasaki LSI)
Redistribution and use in source and binary forms, with or without
@@ -284,7 +284,7 @@ License: BSD 4-clause (Kawasaki LSI)
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-Files: linux-nonfree/matrox/*
+Files: matrox/*
Copyright: 1999, Matrox Graphics Inc.
License: Binary redistribution (Matrox)
All Rights Reserved.
@@ -307,108 +307,26 @@ License: Binary redistribution (Matrox)
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Files: linux-nonfree/mts_*.fw
+Files: mts_*.fw
Copyright: 2005, Multi-Tech Systems, Inc.
License: Binary redistribution (MTS)
All firmware components are redistributable in binary form.
-Files: linux-nonfree/r128/r128_cce.bin, linux-nonfree/radeon/*_cp.bin,
- linux-nonfree/radeon/R600_me.bin, linux-nonfree/radeon/R600_pfp.bin,
- linux-nonfree/radeon/RS780_*.bin, linux-nonfree/radeon/RV*_me.bin,
- linux-nonfree/radeon/RV*_pfp.bin
-Copyright: 2000-2009, Advanced Micro Devices, Inc.
-License: Binary redistribution (AMD permissive)
- All Rights Reserved.
- .
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice (including the next
- paragraph) shall be included in all copies or substantial portions of the
- Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Files: linux-nonfree/radeon/*.bin
-Copyright: 2009-2014, Advanced Micro Devices, Inc.
-License: Binary redistribution (AMD restrictive)
- All rights reserved.
- .
- REDISTRIBUTION: Permission is hereby granted, free of any license fees,
- to any person obtaining a copy of this microcode (the "Software"), to
- install, reproduce, copy and distribute copies, in binary form only, of
- the Software and to permit persons to whom the Software is provided to
- do the same, provided that the following conditions are met:
- .
- No reverse engineering, decompilation, or disassembly of this Software
- is permitted.
- .
- Redistributions must reproduce the above copyright notice, this
- permission notice, and the following disclaimers and notices in the
- Software documentation and/or other materials provided with the
- Software.
- .
- DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK. THE SOFTWARE
- IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
- HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
- IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
- MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
- UNINTERRUPTED OR ERROR-FREE. THE ENTIRE RISK ASSOCIATED WITH THE USE OF
- THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, COPYRIGHT HOLDER AND ITS
- LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
- OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
- ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
- .
- DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
- HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
- ("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
- SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
- PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
- LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
- BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
- INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
- PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
- REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN
- NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
- LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
- CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
- US$10.
- .
- Notice: The Software is subject to United States export laws and
- regulations. You agree to comply with all domestic and international
- export laws and regulations that apply to the Software, including but
- not limited to the Export Administration Regulations administered by the
- U.S. Department of Commerce and International Traffic in Arm Regulations
- administered by the U.S. Department of State. These laws include
- restrictions on destinations, end users and end use.
-
-Files: linux-nonfree/tehuti/bdx.bin
+Files: tehuti/bdx.bin
Copyright: 2007, Tehuti Networks Ltd.
License: Binary redistribution
Permission is hereby granted for the distribution of this firmware
data in hexadecimal or equivalent format, provided this copyright
notice is accompanying it.
-Files: linux-nonfree/tigon/tg3*.bin
+Files: tigon/tg3*.bin
Copyright: 2000-2003, Broadcom Corporation.
License: Binary redistribution
Permission is hereby granted for the distribution of this firmware
data in hexadecimal or equivalent format, provided this copyright
notice is accompanying it.
-Files: linux-nonfree/v4l-cx*.fw
+Files: v4l-cx*.fw
License: Binary redistribution (Conexant)
Conexant grants permission to use and redistribute these firmware
files for use with Conexant devices, but not as a part of the Linux
diff --git a/debian/config/linux-nonfree/cxgb4/t4fw-1.12.25.0.bin b/debian/config/misc-nonfree/cxgb4/t4fw-1.12.25.0.bin
similarity index 100%
rename from debian/config/linux-nonfree/cxgb4/t4fw-1.12.25.0.bin
rename to debian/config/misc-nonfree/cxgb4/t4fw-1.12.25.0.bin
diff --git a/debian/config/linux-nonfree/cxgb4/t4fw.bin b/debian/config/misc-nonfree/cxgb4/t4fw.bin
similarity index 100%
rename from debian/config/linux-nonfree/cxgb4/t4fw.bin
rename to debian/config/misc-nonfree/cxgb4/t4fw.bin
diff --git a/debian/config/linux-nonfree/cxgb4/t5fw-1.12.25.0.bin b/debian/config/misc-nonfree/cxgb4/t5fw-1.12.25.0.bin
similarity index 100%
rename from debian/config/linux-nonfree/cxgb4/t5fw-1.12.25.0.bin
rename to debian/config/misc-nonfree/cxgb4/t5fw-1.12.25.0.bin
diff --git a/debian/config/linux-nonfree/cxgb4/t5fw.bin b/debian/config/misc-nonfree/cxgb4/t5fw.bin
similarity index 100%
rename from debian/config/linux-nonfree/cxgb4/t5fw.bin
rename to debian/config/misc-nonfree/cxgb4/t5fw.bin
diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines
new file mode 100644
index 0000000..9360f19
--- /dev/null
+++ b/debian/config/misc-nonfree/defines
@@ -0,0 +1,234 @@
+[base]
+desc: various drivers in the Linux kernel
+longdesc:
+ various drivers in the Linux kernel. This is a collection of firmware blobs
+ which are not individually large enough to warrant a standalone package
+replaces: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~)
+breaks: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~)
+files:
+ 3com/typhoon.bin
+ advansys/3550.bin
+ advansys/38C0800.bin
+ advansys/38C1600.bin
+ advansys/mcode.bin
+ agere_ap_fw.bin
+ agere_sta_fw.bin
+ cxgb3/ael2005_opt_edc.bin
+ cxgb3/ael2005_twx_edc.bin
+ cxgb3/ael2020_twx_edc.bin
+ cxgb3/t3b_psram-1.1.0.bin
+ cxgb3/t3c_psram-1.1.0.bin
+ cxgb3/t3fw-7.4.0.bin
+ cxgb3/t3fw-7.10.0.bin
+ cxgb3/t3fw-7.12.0.bin
+ cxgb4/t4fw.bin
+ cxgb4/t4fw-1.12.25.0.bin
+ cxgb4/t5fw.bin
+ cxgb4/t5fw-1.12.25.0.bin
+ dabusb/bitstream.bin
+ dabusb/firmware.fw
+ dvb-fe-xc4000-1.4.1.fw
+ dvb-fe-xc5000-1.6.114.fw
+ dvb-fe-xc5000c-4.1.30.7.fw
+ dvb-usb-dib0700-1.20.fw
+ dvb-usb-it9135-01.fw
+ dvb-usb-it9135-02.fw
+ e100/d101m_ucode.bin
+ e100/d101s_ucode.bin
+ e100/d102e_ucode.bin
+ ene-ub6250/msp_rdwr.bin
+ ene-ub6250/ms_init.bin
+ ene-ub6250/ms_rdwr.bin
+ ene-ub6250/sd_init1.bin
+ ene-ub6250/sd_init2.bin
+ ene-ub6250/sd_rdwr.bin
+ kaweth/new_code.bin
+ kaweth/new_code_fix.bin
+ kaweth/trigger_code.bin
+ kaweth/trigger_code_fix.bin
+ matrox/g200_warp.fw
+ matrox/g400_warp.fw
+ mts_cdma.fw
+ mts_edge.fw
+ mts_gsm.fw
+ tehuti/bdx.bin
+ tigon/tg3_tso.bin
+ tigon/tg3.bin
+ tigon/tg3_tso5.bin
+ tigon/tg357766.bin
+ v4l-cx231xx-avcore-01.fw
+ v4l-cx23418-apu.fw
+ v4l-cx23418-cpu.fw
+ v4l-cx23418-dig.fw
+ v4l-cx25840.fw
+ v4l-cx23885-avcore-01.fw
+ vntwusb.fw
+support: initramfs-tools
+uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+
+[3com/typhoon.bin_base]
+desc: 3Com Typhoon firmware
+version: 03.001.008
+
+[advansys/3550.bin_base]
+desc: AdvanSys ASC-3550 firmware
+
+[advansys/38C0800.bin_base]
+desc: AdvanSys ASC-38C0800 firmware
+
+[advansys/38C1600.bin_base]
+desc: AdvanSys ASC-38C1600 firmware
+
+[advansys/mcode.bin_base]
+desc: AdvanSys SCSI controller microcode
+
+[agere_ap_fw.bin_base]
+desc: Agere/Prism/Symbol Orinoco firmware (AP mode)
+version: 9.48 Hermes I
+
+[agere_sta_fw.bin_base]
+desc: Agere/Prism/Symbol Orinoco firmware (STA mode)
+version: 9.48 Hermes I
+
+[cxgb3/ael2005_opt_edc.bin_base]
+desc: Chelsio T3 optical EDC firmware (AEL2005 PHY)
+
+[cxgb3/ael2005_twx_edc.bin_base]
+desc: Chelsio T3 twinax EDC firmware (AEL2005 PHY)
+
+[cxgb3/ael2020_twx_edc.bin_base]
+desc: Chelsio T3 twinax EDC firmware (AEL2020 PHY)
+
+[cxgb3/t3b_psram-1.1.0.bin_base]
+desc: Chelsio T3B protocol engine firmware
+version: 1.1.0
+
+[cxgb3/t3c_psram-1.1.0.bin_base]
+desc: Chelsio T3C protocol engine firmware
+version: 1.1.0
+
+[cxgb3/t3fw-7.4.0.bin_base]
+desc: Chelsio T3 main firmware
+version: 7.4.0
+
+[cxgb3/t3fw-7.10.0.bin_base]
+desc: Chelsio T3 main firmware
+version: 7.10.0
+
+[cxgb3/t3fw-7.12.0.bin_base]
+desc: Chelsio T3 main firmware
+version: 7.12.0
+
+[cxgb4/t4fw-1.12.25.0.bin_base]
+desc: Chelsio T4 firmware
+version: 1.12.25.0
+
+[cxgb4/t5fw-1.12.25.0.bin_base]
+desc: Chelsio T5 firmware
+version: 1.12.25.0
+
+[dabusb/firmware.fw_base]
+desc: DAB-USB firmware
+
+[dabusb/bitstream.bin_base]
+desc: DAB-USB FPGA bitfile
+
+[dvb-fe-xc4000-1.4.1.fw_base]
+desc: Xceive 4000 tuner firmware
+version: 1.4.1
+
+[dvb-fe-xc5000-1.6.114.fw_base]
+desc: Xceive 5000 tuner firmware
+version: 1.6.114
+
+[dvb-fe-xc5000c-4.1.30.7.fw_base]
+desc: Xceive 5000c tuner firmware
+version: 4.1.30.7
+
+[dvb-usb-dib0700-1.20.fw_base]
+desc: DiBcom dib0700 USB DVB bridge firmware
+version: 1.20
+
+[dvb-usb-it9135-01.fw_base]
+desc: DiBcom dib9135 DVB-T USB firmware
+
+[dvb-usb-it9135-02.fw_base]
+desc: DiBcom dib9135 DVB-T USB firmware
+
+[e100/d101m_ucode.bin_base]
+desc: Intel 82559 D101M microcode
+
+[e100/d101s_ucode.bin_base]
+desc: Intel 82559 D101S microcode
+
+[e100/d102e_ucode.bin_base]
+desc: Intel 82551-F and 82551-10 microcode
+
+[ene-ub6250/msp_rdwr.bin_base]
+desc: ENE UB6250 MS Pro read/write firmware
+
+[ene-ub6250/ms_init.bin_base]
+desc: ENE UB6250 MS init firmware
+
+[ene-ub6250/ms_rdwr.bin_base]
+desc: ENE UB6250 MS read/write firmware
+
+[ene-ub6250/sd_init1.bin_base]
+desc: ENE UB6250 SD init stage 1 firmware
+
+[ene-ub6250/sd_init2.bin_base]
+desc: ENE UB6250 SD init stage 2 firmware
+
+[ene-ub6250/sd_rdwr.bin_base]
+desc: ENE UB6250 SD read/write firmware
+
+[matrox/g200_warp.fw_base]
+desc: Matrox G200 WARP engine microcode
+
+[matrox/g400_warp.fw_base]
+desc: Matrox G400/G550 WARP engine microcode
+
+[mts_cdma.fw_base]
+desc: Multi-Tech USB CDMA modem firmware
+
+[mts_edge.fw_base]
+desc: Multi-Tech USB EDGE modem firmware
+
+[mts_gsm.fw_base]
+desc: Multi-Tech USB GPRS modem firmware
+
+[tehuti/bdx.bin_base]
+desc: Tehuti network card firmware
+
+[tigon/tg3_tso.bin_base]
+desc: Broadcom BCM5703/BCM5704 TSO firmware
+
+[tigon/tg3.bin_base]
+desc: Broadcom BCM5701A0 firmware
+
+[tigon/tg3_tso5.bin_base]
+desc: Broadcom BCM5705 TSO firmware
+
+[tigon/tg357766.bin_base]
+desc: Broadcom BCM57766 firmware
+
+[v4l-cx231xx-avcore-01.fw_base]
+desc: Conexant CX231xx core firmware
+
+[v4l-cx23418-apu.fw_base]
+desc: Conexant CX23418 APU firmware
+
+[v4l-cx23418-cpu.fw_base]
+desc: Conexant CX23418 CPU firmware
+
+[v4l-cx23418-dig.fw_base]
+desc: Conexant CX23418 ADEC firmware
+
+[v4l-cx25840.fw_base]
+desc: Conexant CX25840 firmware
+
+[v4l-cx23885-avcore-01.fw_base]
+desc: Conexant CX23885 core firmware
+
+[vntwusb.fw_base]
+desc: VIA VT6656 firmware
diff --git a/debian/templates/control.binary.meta.in b/debian/templates/control.binary.meta.in
index da86ca2..4971599 100644
--- a/debian/templates/control.binary.meta.in
+++ b/debian/templates/control.binary.meta.in
@@ -8,3 +8,13 @@ Description: Binary firmware for various drivers in the Linux kernel (meta-packa
This package depends on both free and non-free firmware which may
be used with drivers in the Linux kernel.
+Package: firmware-linux-nonfree
+Section: non-free/metapackages
+Architecture: all
+Depends: firmware-misc-nonfree (= ${binary:Version}),
+ firmware-amd-graphics (= ${binary:Version}), ${misc:Depends}
+Recommends: intel-microcode, amd64-microcode
+Description: Binary firmware for various drivers in the Linux kernel (meta-package)
+ This package depends on non-free firmware which may be used with drivers
+ in the Linux kernel.
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git
More information about the Kernel-svn-changes
mailing list