[firmware-nonfree] 03/03: adi, ralink: Merge into the firmware-misc-nonfree package
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Oct 18 15:56:36 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 f66aea3539b493a1aacf05e2625c8cd8a5c10797
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Oct 18 16:47:48 2015 +0100
adi, ralink: Merge into the firmware-misc-nonfree package
---
debian/changelog | 1 +
debian/config/adi/LICENSE | 35 -----------------
debian/config/adi/defines | 17 --------
debian/config/defines | 2 -
debian/config/misc-nonfree/LICENSE | 79 ++++++++++++++++++++++++++++++++++++++
debian/config/misc-nonfree/defines | 58 +++++++++++++++++++++++++++-
debian/config/ralink/LICENSE | 39 -------------------
debian/config/ralink/defines | 51 ------------------------
8 files changed, 137 insertions(+), 145 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9a73c7a..e576df0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ firmware-nonfree (20151018-1) UNRELEASED; urgency=medium
GO7007SB video encoder, Intel "Skylake" and "Broxton" video
interfaces, MediaTek MT7630/MT7650 Bluetooth adapters, Nvidia Tegra
GPU and XHCI interfaces, and Intel QAT DH895xCC crypto-accelerators
+ * adi, ralink: Merge into the firmware-misc-nonfree package
[ maximilian attems ]
* iwlwifi: Update Intel Wireless 3160, 7260, 7265 and 7265D firmware version
diff --git a/debian/config/adi/LICENSE b/debian/config/adi/LICENSE
deleted file mode 100644
index a052931..0000000
--- a/debian/config/adi/LICENSE
+++ /dev/null
@@ -1,35 +0,0 @@
-Copyright 2006 Ikanos Communications, Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following
-conditions are met:
-
-* Redistribution of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistribution in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided
-with the distribution.
-
-* The name of Ikanos Corporation may not be used to endorse
- or promote products derived from this source code without specific
- prior written consent of Ikanos Corporation.
-
-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.
-USER ACKNOWLEDGES AND AGREES THAT THE PURCHASE OR USE OF THIS
-SOFTWARE WILL NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY
-IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY INTELLECTUAL PROPERTY
-RIGHTS (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER
-PROPRIETARY RIGHT) EMBODIED IN ANY OTHER IKANOS HARDWARE OR SOFTWARE
-EITHER SOLELY OR IN COMBINATION WITH THIS SOFTWARE.
diff --git a/debian/config/adi/defines b/debian/config/adi/defines
deleted file mode 100644
index 6438160..0000000
--- a/debian/config/adi/defines
+++ /dev/null
@@ -1,17 +0,0 @@
-[base]
-desc: Analog Devices Inc. DSL modem chips
-files:
- ueagle-atm/CMV4p.bin.v2
- ueagle-atm/DSP4p.bin
- ueagle-atm/eagleIV.fw
-longdesc: USB DSL modems with the Analog Devices Inc. Eagle IV chip,
- supported by the ueagle-atm driver
-
-[ueagle-atm/CMV4p.bin.v2_base]
-desc: Eagle IV ADSL configuration, generic
-
-[ueagle-atm/DSP4p.bin_base]
-desc: Eagle IV ADSL DSP firmware
-
-[ueagle-atm/eagleIV.fw_base]
-desc: Eagle IV firmware
diff --git a/debian/config/defines b/debian/config/defines
index abaf498..cf0a9b5 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,6 +1,5 @@
[base]
packages:
- adi
amd-graphics
atheros
bnx2
@@ -15,7 +14,6 @@ packages:
myricom
netxen
qlogic
- ralink
realtek
samsung
ti-connectivity
diff --git a/debian/config/misc-nonfree/LICENSE b/debian/config/misc-nonfree/LICENSE
index 62c19a4..808f6a5 100644
--- a/debian/config/misc-nonfree/LICENSE
+++ b/debian/config/misc-nonfree/LICENSE
@@ -622,6 +622,48 @@ Files: qat_*.bin
Copyright: 2014, Intel Corporation.
License: Binary redistribution (Intel)
+Files: rt*.bin
+Copyright: 2007, Ralink Technology Corporation
+License: Binary redistribution (Ralink)
+ 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 Ralink Technology 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. Ralink Technology 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.
+
Files: tehuti/bdx.bin
Copyright: 2007, Tehuti Networks Ltd.
License: Binary redistribution
@@ -636,6 +678,43 @@ License: Binary redistribution
data in hexadecimal or equivalent format, provided this copyright
notice is accompanying it.
+Files: ueagle-atm/*
+Copyright: 2006, Ikanos Communications, Inc.
+License: BSD (Ikanos)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following
+ conditions are met:
+ .
+ * Redistribution of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ * Redistribution in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ .
+ * The name of Ikanos Corporation may not be used to endorse
+ or promote products derived from this source code without specific
+ prior written consent of Ikanos Corporation.
+ .
+ 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.
+ USER ACKNOWLEDGES AND AGREES THAT THE PURCHASE OR USE OF THIS
+ SOFTWARE WILL NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY
+ IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY INTELLECTUAL PROPERTY
+ RIGHTS (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER
+ PROPRIETARY RIGHT) EMBODIED IN ANY OTHER IKANOS HARDWARE OR SOFTWARE
+ EITHER SOLELY OR IN COMBINATION WITH THIS SOFTWARE.
+
Files: v4l-cx*.fw
License: Binary redistribution (Conexant)
Conexant grants permission to use and redistribute these firmware
diff --git a/debian/config/misc-nonfree/defines b/debian/config/misc-nonfree/defines
index 04548c6..b471cc7 100644
--- a/debian/config/misc-nonfree/defines
+++ b/debian/config/misc-nonfree/defines
@@ -3,8 +3,10 @@ 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~)
+replaces: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~), firmware-adi, firmware-ralink
+conflicts: firmware-adi, firmware-ralink
breaks: firmware-linux (<< 0.19), firmware-ivtv (<< 0.38~)
+provides: firmware-adi, firmware-ralink
files:
3com/typhoon.bin
advansys/3550.bin
@@ -89,6 +91,16 @@ files:
nvidia/tegra210/xusb.bin
qat_895xcc.bin
qat_mmp.bin
+ rt2561.bin
+ rt2561s.bin
+ rt2661.bin
+ rt2860.bin
+ rt2870.bin
+ rt3070.bin
+ rt3071.bin
+ rt3090.bin
+ rt3290.bin
+ rt73.bin
s2250.fw
s2250_loader.fw
tehuti/bdx.bin
@@ -96,6 +108,9 @@ files:
tigon/tg3.bin
tigon/tg3_tso5.bin
tigon/tg357766.bin
+ ueagle-atm/CMV4p.bin.v2
+ ueagle-atm/DSP4p.bin
+ ueagle-atm/eagleIV.fw
v4l-cx231xx-avcore-01.fw
v4l-cx23418-apu.fw
v4l-cx23418-cpu.fw
@@ -348,6 +363,38 @@ desc: Intel QAT DH895xCC UOF firmware
[qat_mmp.bin_base]
desc: Intel QAT DH895xCC MMP firmware
+[rt2561.bin_base]
+desc: Ralink RT2561 (RT2501/RT5201 chipset) firmware
+version: 1.2
+
+[rt2561s.bin_base]
+desc: Ralink RT2561S (RT2501 Turbo/RT5201 Turbo chipset) firmware
+version: 1.2
+
+[rt2661.bin_base]
+desc: Ralink RT2661 (RT2600/RT5600 chipset) firmware
+version: 1.2
+
+[rt2860.bin_base]
+desc: Ralink RT2760/RT2790/RT2860/RT2890/RT3090 (RT2700P[D]/RT2700E[D]/RT2800P[D]/RT2800E[D]/RT3000E[D] chipset) firmware
+version: 34
+
+[rt2870.bin_base]
+desc: Ralink RT2870/RT3070/RT3071/RT3072 (RT2800U[D] chipset) firmware
+version: 29
+
+[rt3071.bin_base]
+desc: Ralink RT3071/RT3072 firmware
+version: 29
+
+[rt3290.bin_base]
+desc: Ralink RT3290 firmware
+version: 1
+
+[rt73.bin_base]
+desc: Ralink RT2571W/RT2671 (RT2501USB/RT5201USB chipset) firmware
+version: 1.8
+
[tehuti/bdx.bin_base]
desc: Tehuti network card firmware
@@ -363,6 +410,15 @@ desc: Broadcom BCM5705 TSO firmware
[tigon/tg357766.bin_base]
desc: Broadcom BCM57766 firmware
+[ueagle-atm/CMV4p.bin.v2_base]
+desc: ADI Eagle IV ADSL configuration, generic
+
+[ueagle-atm/DSP4p.bin_base]
+desc: ADI Eagle IV ADSL DSP firmware
+
+[ueagle-atm/eagleIV.fw_base]
+desc: ADI Eagle IV firmware
+
[v4l-cx231xx-avcore-01.fw_base]
desc: Conexant CX231xx core firmware
diff --git a/debian/config/ralink/LICENSE b/debian/config/ralink/LICENSE
deleted file mode 100644
index 69b27e9..0000000
--- a/debian/config/ralink/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-Copyright (c) 2007, Ralink Technology 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 Ralink Technology 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. Ralink Technology 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.
diff --git a/debian/config/ralink/defines b/debian/config/ralink/defines
deleted file mode 100644
index 04493a2..0000000
--- a/debian/config/ralink/defines
+++ /dev/null
@@ -1,51 +0,0 @@
-[base]
-desc: Ralink wireless cards
-files:
- rt2561.bin
- rt2561s.bin
- rt2661.bin
- rt2860.bin
- rt2870.bin
- rt3070.bin
- rt3071.bin
- rt3090.bin
- rt3290.bin
- rt73.bin
-longdesc: wireless network cards with the Ralink RT2501 [Turbo], RT2600,
- RT5201 [Turbo], RT5600, RT5201USB, RT2800P[D], RT2700P[D], RT2700E[D],
- RT2800E[D], RT2800U[D] or RT3000E[D] chipsets or RT3070/RT3071/RT3072
- chips, supported by the
- rt61/rt61pci, rt73/rt73usb, rt2860sta, rt2870sta/rt2870, rt3070sta or
- rt3090sta drivers
-
-[rt2561.bin_base]
-desc: Ralink RT2561 (RT2501/RT5201 chipset) firmware
-version: 1.2
-
-[rt2561s.bin_base]
-desc: Ralink RT2561S (RT2501 Turbo/RT5201 Turbo chipset) firmware
-version: 1.2
-
-[rt2661.bin_base]
-desc: Ralink RT2661 (RT2600/RT5600 chipset) firmware
-version: 1.2
-
-[rt2860.bin_base]
-desc: Ralink RT2760/RT2790/RT2860/RT2890/RT3090 (RT2700P[D]/RT2700E[D]/RT2800P[D]/RT2800E[D]/RT3000E[D] chipset) firmware
-version: 34
-
-[rt2870.bin_base]
-desc: Ralink RT2870/RT3070/RT3071/RT3072 (RT2800U[D] chipset) firmware
-version: 29
-
-[rt3071.bin_base]
-desc: Ralink RT3071/RT3072 firmware
-version: 29
-
-[rt3290.bin_base]
-desc: Ralink RT3290 firmware
-version: 1
-
-[rt73.bin_base]
-desc: Ralink RT2571W/RT2671 (RT2501USB/RT5201USB chipset) firmware
-version: 1.8
--
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