Control: tags -1 patch > Please provide a proper patch for firmware-nonfree to replace the > currently included firmware with a dependency. I couldn't figure out how to add a Recommends or a dependency; that templates are used to generate the control file seems to limit this. In any case I've sent an MR for firmware-linux-free to get the Recommends and would appreciate review of that. Here's a patch for the removal from non-free firmware-atheros.
diff -ru firmware-nonfree.orig/debian/changelog firmware-nonfree/debian/changelog
--- firmware-nonfree.orig/debian/changelog 2021-01-23 16:38:33.213649952 -0500
+++ firmware-nonfree/debian/changelog 2021-01-23 16:37:43.522844686 -0500
@@ -1,5 +1,10 @@
firmware-nonfree (20201218-3) UNRELEASED; urgency=medium
+ [ John Scott ]
+ * Remove the ath9k_htc firmware which is superceded by the free
+ firmware-ath9k-htc package.
+
+ [ maximilian attems ]
* Add Realtek rtl8822cu config (closes: #971791)
* Add Realtek RTL8812 firmwares (closes: #877667)
* Add Realtek rtl8822cs config
diff -ru firmware-nonfree.orig/debian/config/atheros/copyright firmware-nonfree/debian/config/atheros/copyright
--- firmware-nonfree.orig/debian/config/atheros/copyright 2021-01-23 16:38:33.217650180 -0500
+++ firmware-nonfree/debian/config/atheros/copyright 2021-01-23 16:27:08.961488347 -0500
@@ -45,121 +45,6 @@
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: ath9k_htc/htc_7010-1.4.0.fw, ath9k_htc/htc_9271-1.4.0.fw
-Copyright: 1998-2002, Red Hat, Inc.
- 2002, Gary Thomas
- 2002-2005, Sam Leffler, Errno Consulting
- 2002-2013, Qualcomm Atheros, Inc.
- 2013, Tensilica Inc.
-License: Open-ath9k-HTC-firmware
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted (subject to the limitations in the
- disclaimer below) provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- * Redistributions 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.
- .
- * Neither the name of Qualcomm Atheros nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
- .
- NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
- GRANTED BY THIS LICENSE. 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.
- .
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- .
- Redistribution and use in source and binary forms are permitted
- provided that the following conditions are met:
- 1. The materials contained herein are unmodified and are used
- unmodified.
- 2. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following NO
- ''WARRANTY'' disclaimer below (''Disclaimer''), without
- modification.
- 3. Redistributions in binary form must reproduce at minimum a
- disclaimer similar to the Disclaimer below and any redistribution
- must be conditioned upon including a substantially similar
- Disclaimer requirement for further binary redistribution.
- 4. Neither the names of the above-listed copyright holders nor the
- names of any contributors may be used to endorse or promote
- product derived from this software without specific prior written
- permission.
- .
- NO WARRANTY
- 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 NONINFRINGEMENT,
- MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
- FOR 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 DAMAGES.
- .
- eCos is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 2 or (at your option) any later version.
- .
- As a special exception, if other files instantiate templates or use macros
- or inline functions from this file, or you compile this file and link it
- with other works to produce a work based on this file, this file does not
- by itself cause the resulting work to be covered by the GNU General Public
- License. However the source code for this file must still be made available
- in accordance with section (3) of the GNU General Public License.
- .
- This exception does not invalidate any other reasons why a work based on
- this file might be covered by the GNU General Public License.
- .
- 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 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 THE AUTHORS OR COPYRIGHT HOLDERS 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: ath10k/QCA*/hw*/firmware-[45].bin
Copyright: 1986, Gary S. Brown
1988, 1990-1991, 1993, The Regents of the University of California
diff -ru firmware-nonfree.orig/debian/config/atheros/defines firmware-nonfree/debian/config/atheros/defines
--- firmware-nonfree.orig/debian/config/atheros/defines 2021-01-23 16:38:33.217650180 -0500
+++ firmware-nonfree/debian/config/atheros/defines 2021-01-23 16:26:05.533132908 -0500
@@ -119,8 +119,6 @@
ath6k/AR6004/hw1.2/fw-2.bin
ath6k/AR6004/hw1.3/bdata.bin
ath6k/AR6004/hw1.3/fw-3.bin
- ath9k_htc/htc_7010-1.4.0.fw
- ath9k_htc/htc_9271-1.4.0.fw
htc_7010.fw
htc_9271.fw
qca/crbtfw21.tlv
@@ -468,14 +466,6 @@
[ath3k-1.fw_base]
desc: Atheros AR3011 firmware
-[ath9k_htc/htc_7010-1.4.0.fw_base]
-desc: Atheros AR7010 firmware
-version: 1.4.0
-
-[ath9k_htc/htc_9271-1.4.0.fw_base]
-desc: Atheros AR9271 firmware
-version: 1.4.0
-
[htc_7010.fw_base]
desc: Atheros AR7010 firmware
version: 1.3.1
diff -ru firmware-nonfree.orig/debian/config/defines firmware-nonfree/debian/config/defines
--- firmware-nonfree.orig/debian/config/defines 2021-01-23 16:38:33.217650180 -0500
+++ firmware-nonfree/debian/config/defines 2021-01-23 16:28:43.352093859 -0500
@@ -74,6 +74,8 @@
amd-ucode/*
# No Debian release references these; obsoleted by ar9170.fw
ar9170-[12].fw
+# Packaged in src:open-ath9k-htc-firmware
+ ath9k_htc/*
# These are said to be related to the hci_uart driver, but it doesn't
# request them
ar3k/*/*
Attachment:
signature.asc
Description: This is a digitally signed message part.