linux-firmware:
cover linux-firmware:
This is a small series to fixup up linux-firmware packaging:
The first adds some .pnvm files needed along with the .ucode by newer iwlwifi cards to the linux-firmware-iwlwifi-misc package.
The second renames s/bnx2-mips/bnx2/ and includes more files needed by the driver.
The third creates a new bnx2x package.
Jason Andryuk (3):
linux-firmware: Package iwlwifi .pnvm files
linux-firmware: Change bnx2 packaging
linux-firmware: Create bnx2x subpackage
.../linux-firmware/linux-firmware_20231030.bb | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/3 linux-firmware: Package iwlwifi .pnvm files
The iwlwifi uses the .pnvm files for newer AX210+ cards, so package them into the iwlwifi-misc subpackage.
--- .../recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +4 -1
@@ -1187,7 +1187,10 @@ FILES:${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.u FILES:${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode" FILES:${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" FILES:${PN}-iwlwifi-9000 = "${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode" -FILES:${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" +FILES:${PN}-iwlwifi-misc = " \ + ${nonarch_base_libdir}/firmware/iwlwifi-*.ucode \ + ${nonarch_base_libdir}/firmware/iwlwifi-*.pnvm \ +" RDEPENDS:${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" RDEPENDS:${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license"
Signature · 1 line
2.43.0
PATCH 2/3 linux-firmware: Change bnx2 packaging
In reply to Jason AndryukThe bnx2 module uses both the mips and rv2p files, so package them all together. Remove -mips from the package name, but add an RPROVIDES for compatibility.
--- .../linux-firmware/linux-firmware_20231030.bb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +9 -5
@@ -340,7 +340,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-ice-license ${PN}-ice \ ${PN}-ice-enhanced-license ${PN}-ice-enhanced \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ - ${PN}-bnx2-mips \ + ${PN}-bnx2 \ ${PN}-liquidio \ ${PN}-nvidia-license \ ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \
@@ -1087,18 +1087,22 @@ RDEPENDS:${PN}-bcm4356-pcie += "${PN}-cypress-license" LICENSE:${PN}-bcm4373 = "Firmware-cypress" RDEPENDS:${PN}-bcm4373 += "${PN}-cypress-license" -# For Broadcom bnx2-mips +# For Broadcom bnx2 # # which is a separate case to the other Broadcom firmwares since its # license is contained in the shared WHENCE file. -LICENSE:${PN}-bnx2-mips = "WHENCE" +LICENSE:${PN}-bnx2 = "WHENCE" LICENSE:${PN}-whence-license = "WHENCE" -FILES:${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" +FILES:${PN}-bnx2 = " \ + ${nonarch_base_libdir}/firmware/bnx2/bnx2-mips*.fw \ + ${nonarch_base_libdir}/firmware/bnx2/bnx2-rv2p*.fw \ +" FILES:${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" -RDEPENDS:${PN}-bnx2-mips += "${PN}-whence-license" +RDEPENDS:${PN}-bnx2 += "${PN}-whence-license" +RPROVIDES:${PN}-bnx2 = "${PN}-bnx2-mips" # For cirrus LICENSE:${PN}-cirrus = "Firmware-cirrus"
Signature · 1 line
2.43.0
PATCH 3/3 linux-firmware: Create bnx2x subpackage
In reply to Jason Andryukbnx2x is another broadcom ethernet adapter with its own firmware. Place it into its own subpackage.
--- .../linux-firmware/linux-firmware_20231030.bb | 7 +++++++ 1 file changed, 7 insertions(+)
meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +7 -0
@@ -341,6 +341,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-ice-enhanced-license ${PN}-ice-enhanced \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ ${PN}-bnx2 \ + ${PN}-bnx2x \ ${PN}-liquidio \ ${PN}-nvidia-license \ ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \
@@ -1104,6 +1105,12 @@ FILES:${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" RDEPENDS:${PN}-bnx2 += "${PN}-whence-license" RPROVIDES:${PN}-bnx2 = "${PN}-bnx2-mips" +LICENSE:${PN}-bnx2x = "WHENCE" + +FILES:${PN}-bnx2x = "${nonarch_base_libdir}/firmware/bnx2x/bnx2x*.fw" + +RDEPENDS:${PN}-bnx2x += "${PN}-whence-license" + # For cirrus LICENSE:${PN}-cirrus = "Firmware-cirrus" LICENSE:${PN}-cirrus-license = "Firmware-cirrus"
Signature · 1 line
2.43.0