From 0b1766627c4061c38d82a01515ba8897eb947239 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Thu, 27 May 2021 20:48:03 -0300 Subject: [PATCH] Do not ship liquidio/lio_23xx_vsw.bin firmware - Remove liquidio/lio_23xx_vsw.bin due GPL violation (rhbz 1959913) Resolves: rhbz#1959913 Signed-off-by: Herton R. Krzesinski --- linux-firmware.spec | 49 ++++++++++++++++++++++++++++----------------- sources | 2 +- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/linux-firmware.spec b/linux-firmware.spec index 78dd950..a013d9a 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,17 +1,20 @@ %global debug_package %{nil} -%global firmware_release 119 +%global firmware_release 120 %global _firmwarepath /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 Name: linux-firmware Version: 20210315 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Summary: Firmware files used by the Linux kernel License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted URL: http://www.kernel.org/ BuildArch: noarch +# The source below was edited to remove the liquidio/lio_23xx_vsw.bin file due +# missing sources for it (GPL violation), see bug 1959913. If you get a new +# tarball from upstream, make sure you remove the file above. Source0: https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz Patch1: 0001-Add-support-for-compressing-firmware-in-copy-firmwar.patch @@ -35,7 +38,7 @@ This package contains the WHENCE license file which documents the vendor license Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters License: Redistributable, no modification permitted Version: 39.31.5.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl100-firmware This package contains the firmware required by the Intel wireless drivers @@ -47,7 +50,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl105-firmware This package contains the firmware required by the Intel wireless drivers @@ -59,7 +62,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl135-firmware This package contains the firmware required by the Intel wireless drivers @@ -72,7 +75,7 @@ Summary: Firmware for Intel® PRO/Wireless 1000 B/G/N network adaptors License: Redistributable, no modification permitted Version: 39.31.5.1 Epoch: 1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl1000-firmware This package contains the firmware required by the Intel wireless drivers @@ -84,7 +87,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl2000-firmware This package contains the firmware required by the Intel wireless drivers @@ -96,7 +99,7 @@ LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl2030-firmware This package contains the firmware required by the Intel wireless drivers @@ -109,7 +112,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters License: Redistributable, no modification permitted Epoch: 1 Version: 25.30.13.0 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl3160-firmware This package contains the firmware required by the Intel wireless drivers @@ -120,7 +123,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors License: Redistributable, no modification permitted Version: 15.32.2.9 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl3945-firmware This package contains the firmware required by the iwl3945 driver @@ -131,7 +134,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors License: Redistributable, no modification permitted Version: 228.61.2.24 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl4965-firmware This package contains the firmware required by the iwl4965 driver @@ -142,7 +145,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors License: Redistributable, no modification permitted Version: 8.83.5.1_1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl5000-firmware This package contains the firmware required by the iwl5000 driver @@ -153,7 +156,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors License: Redistributable, no modification permitted Version: 8.24.2.2 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl5150-firmware This package contains the firmware required by the iwl5150 driver @@ -164,7 +167,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter License: Redistributable, no modification permitted Version: 9.221.4.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl6000-firmware This package contains the firmware required by the Intel wireless drivers @@ -175,7 +178,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl6000g2a-firmware This package contains the firmware required by the Intel wireless drivers @@ -186,7 +189,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters License: Redistributable, no modification permitted Version: 18.168.6.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl6000g2b-firmware This package contains the firmware required by the Intel wireless drivers @@ -197,7 +200,7 @@ contained inside the provided LICENSE file. Please read it carefully. Summary: Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters License: Redistributable, no modification permitted Version: 41.28.5.1 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl6050-firmware This package contains the firmware required by the Intel wireless drivers @@ -209,7 +212,7 @@ Summary: Firmware for Intel(R) Wireless WiFi Link 726x/8000/9000/AX200/AX201 Ser License: Redistributable, no modification permitted Epoch: 1 Version: 25.30.13.0 -Release: %{firmware_release}%{?dist}.1 +Release: %{firmware_release}%{?dist} Requires: linux-firmware-whence %description -n iwl7260-firmware This package contains the firmware required by the Intel wireless drivers @@ -263,6 +266,13 @@ Firmware for Netronome Smart NICs %prep %autosetup -p1 +# Due GPL violation, we don't want to ship this file even in the src.rpm, +# which means instead of removing it here, the tarball should not have it +if [ -f "liquidio/lio_23xx_vsw.bin" ]; then + echo "Error: lio_23xx_vsw.bin found, please remove it from the source" + exit 1 +fi + %build %install @@ -438,6 +448,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/netronome/* %changelog +* Thu May 27 2021 Herton R. Krzesinski - 20210315-120 +- Remove liquidio/lio_23xx_vsw.bin due GPL violation (rhbz 1959913) + * Fri Apr 16 2021 Mohan Boddu - 20210315-119.1 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index e1fa353..2b181c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (linux-firmware-20210315.tar.xz) = 499f0cd746f700ac95f8ca9947d1fb402f3bc53dd5302101ce94f0510ee013b5fa3b8cb6316ace93e3bb2df0a25fb53eb8099acc45c9bec051aa92986e9d188f +SHA512 (linux-firmware-20210315.tar.xz) = 3460a86376b871cdaf258b3573d868987832a852f7b2f5120c447f9be43aaf32e2d0126c2075068c985f22b7677aac0f2c67236ceeafbe5c914789a2f6e61e3b