Merge Marvell libertas WiFi firmware

Merge libertas into a single package as they're only 2mb.
This commit is contained in:
Peter Robinson 2023-08-04 08:32:07 +01:00
parent 8cbbfc97e7
commit 33ebd59622

View File

@ -94,8 +94,9 @@ Provides: iwl3945-firmware = %{version}-%{release}
Provides: iwl4965-firmware = %{version}-%{release} Provides: iwl4965-firmware = %{version}-%{release}
%description -n iwlegacy-firmware %description -n iwlegacy-firmware
This package contains the firmware required by the iwlegacy driver This package contains the firmware required by the iwlegacy driver
for Linux. Usage of the firmware is subject to the terms and conditions for Linux. This includes the 3945(A)BG and 4965AGN WiFi NICs. Usage
contained inside the provided LICENSE file. Please read it carefully. of the firmware is subject to the terms and conditions contained
inside the provided LICENSE file. Please read it carefully.
%package -n iwlwifi-dvm-firmware %package -n iwlwifi-dvm-firmware
Summary: DVM Firmware for Intel(R) Wireless WiFi adapters Summary: DVM Firmware for Intel(R) Wireless WiFi adapters
@ -127,7 +128,7 @@ Provides: iwl6000g2b-firmware = %{version}-%{release}
Provides: iwl6050-firmware = %{version}-%{release} Provides: iwl6050-firmware = %{version}-%{release}
%description -n iwlwifi-dvm-firmware %description -n iwlwifi-dvm-firmware
This package contains the firmware required by the iwlwifi driver This package contains the firmware required by the iwlwifi driver
for Linux built with DVM firmware support (CONFIG_IWLDVM=y/m). Usage of for Linux built with DVM firmware support (CONFIG_IWLDVM=y/m). Usage of
the firmware is subject to the terms and conditions contained inside the the firmware is subject to the terms and conditions contained inside the
provided LICENSE file. Please read it carefully. provided LICENSE file. Please read it carefully.
@ -147,35 +148,21 @@ for Linux built with MVM firmware support (CONFIG_IWLMVM=y/m). Usage of
the firmware is subject to the terms and conditions contained inside the the firmware is subject to the terms and conditions contained inside the
provided LICENSE file. Please read it carefully. provided LICENSE file. Please read it carefully.
%package -n libertas-sd8686-firmware %package -n libertas-firmware
Summary: Firmware for Marvell Libertas SD 8686 Network Adapter Summary: Firmware for Marvell Libertas SD/USB WiFi Network Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Requires: linux-firmware-whence Requires: linux-firmware-whence
%description -n libertas-sd8686-firmware Obsoletes: libertas-sd8686-firmware < %{version}-%{release}
Firmware for Marvell Libertas SD 8686 Network Adapter Obsoletes: libertas-sd8787-firmware < %{version}-%{release}
Obsoletes: libertas-usb8388-firmware < 2:%{version}-%{release}
%package -n libertas-sd8787-firmware Obsoletes: libertas-usb8388-olpc-firmware < %{version}-%{release}
Summary: Firmware for Marvell Libertas SD 8787 Network Adapter Provides: libertas-sd8686-firmware < %{version}-%{release}
License: Redistributable, no modification permitted Provides: libertas-sd8787-firmware < %{version}-%{release}
Requires: linux-firmware-whence Provides: libertas-usb8388-firmware < 2:%{version}-%{release}
%description -n libertas-sd8787-firmware Provides: libertas-usb8388-olpc-firmware < %{version}-%{release}
Firmware for Marvell Libertas SD 8787 Network Adapter %description -n libertas-firmware
Firmware for the Marvell Libertas series of WiFi Network Adapters
%package -n libertas-usb8388-firmware Including the SD 8686/8787 and USB 8388/8388.
Summary: Firmware for Marvell Libertas USB 8388 Network Adapter
License: Redistributable, no modification permitted
Epoch: 2
Requires: linux-firmware-whence
%description -n libertas-usb8388-firmware
Firmware for Marvell Libertas USB 8388 Network Adapter
%package -n libertas-usb8388-olpc-firmware
Summary: OLPC firmware for Marvell Libertas USB 8388 Network Adapter
License: Redistributable, no modification permitted
Requires: linux-firmware-whence
%description -n libertas-usb8388-olpc-firmware
Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh network
support.
%package -n mt7xxx-firmware %package -n mt7xxx-firmware
Summary: Firmware for Mediatek 7600/7900 series WiFi/Bluetooth adapters Summary: Firmware for Mediatek 7600/7900 series WiFi/Bluetooth adapters
@ -404,25 +391,14 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%{_firmwarepath}/iwlwifi-ty-a0* %{_firmwarepath}/iwlwifi-ty-a0*
%{_firmwarepath}/iwlwifi-so-a0* %{_firmwarepath}/iwlwifi-so-a0*
%files -n libertas-sd8686-firmware %files -n libertas-firmware
%license LICENCE.Marvell %license LICENCE.Marvell
%dir %{_firmwarepath}/libertas %dir %{_firmwarepath}/libertas
%{_firmwarepath}/libertas/sd8686*
%files -n libertas-sd8787-firmware
%license LICENCE.Marvell
%dir %{_firmwarepath}/mrvl %dir %{_firmwarepath}/mrvl
%{_firmwarepath}/mrvl/sd8787* %{_firmwarepath}/libertas/sd8686*
%files -n libertas-usb8388-firmware
%license LICENCE.Marvell
%dir %{_firmwarepath}/libertas
%{_firmwarepath}/libertas/usb8388_v9.bin*
%files -n libertas-usb8388-olpc-firmware
%license LICENCE.Marvell
%dir %{_firmwarepath}/libertas
%{_firmwarepath}/libertas/usb8388_olpc.bin* %{_firmwarepath}/libertas/usb8388_olpc.bin*
%{_firmwarepath}/libertas/usb8388_v9.bin*
%{_firmwarepath}/mrvl/sd8787*
%files -n mt7xxx-firmware %files -n mt7xxx-firmware
%license LICENCE.mediatek %license LICENCE.mediatek