- moved bnx2 and bnx2x firmware to ethernet subpackage

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 1a76b1715b564abcb02e39a55069b4307792cb39..ccbe8ced2ddef45ca2048681fb24f75baca57ddf 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -72,22 +72,6 @@ Group:               Base/Kernel
 %description -n av-firmware
 Firmware for various audio/video devices
 
 %description -n av-firmware
 Firmware for various audio/video devices
 

-%package -n bnx2-firmware
-Summary:       Firmware for Broadcom NetXtremeII
-License:       Redistributable, no modification permitted
-Group:         Base/Kernel
-
-%description -n bnx2-firmware
-Firmware for Broadcom NetXtremeII
-
-%package -n bnx2x-firmware
-Summary:       Firmware for Broadcom NetXtreme II 10Gb
-License:       Redistributable, no modification permitted
-Group:         Base/Kernel
-
-%description -n bnx2x-firmware
-Firmware for Broadcom NetXtreme II 10Gb
-

 %package -n brcm-firmware
 Summary:       Firmware for Broadcom 802.11 wireless adapters
 License:       Redistributable, no modification permitted
 %package -n brcm-firmware
 Summary:       Firmware for Broadcom 802.11 wireless adapters
 License:       Redistributable, no modification permitted


@@ -643,16 +627,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/v4l-cx*.fw
 /lib/firmware/vicam
 
 /lib/firmware/v4l-cx*.fw
 /lib/firmware/vicam
 

-%files -n bnx2-firmware
-%defattr(644,root,root,755)
-%doc WHENCE
-/lib/firmware/bnx2
-
-%files -n bnx2x-firmware
-%defattr(644,root,root,755)
-%doc WHENCE
-/lib/firmware/bnx2x
-

 %files -n brcm-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.broadcom_bcm43xx LICENCE.cypress
 %files -n brcm-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.broadcom_bcm43xx LICENCE.cypress


@@ -678,6 +652,8 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/acenic
 /lib/firmware/adaptec
 /lib/firmware/airoha
 /lib/firmware/acenic
 /lib/firmware/adaptec
 /lib/firmware/airoha

+/lib/firmware/bnx2
+/lib/firmware/bnx2x

 /lib/firmware/e100
 %dir /lib/firmware/intel
 /lib/firmware/intel/ice
 /lib/firmware/e100
 %dir /lib/firmware/intel
 /lib/firmware/intel/ice