From 99980f4a7e4d66d6c03541b8d17f648a0a394f2f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 7 Sep 2023 13:21:25 -0700 Subject: firmware-nxp-wifi: Fix overlap with linux-firmware Now that the firmware packages provided are also upstreamed to linux-firmware, fix the overlap error like: ``` * check_data_file_clashes: Package linux-firmware wants to install file ...1.0-r0/rootfs/lib/firmware/nxp/uartuart8997_bt_v4.bin But that file is already provided by package * firmware-nxp-wifi-nxp8997-common ``` Fixes: 1639 Signed-off-by: Tom Hochstein --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 34 ++++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb index 38cb4751..f4d99666 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -1,10 +1,9 @@ # Copyright 2020-2023 NXP SUMMARY = "Wi-Fi firmware redistributed by NXP" -DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP, \ -which is not covered by linux-firmware package. Once package becomes \ -available as a part of linux-firmware - it can be dropped from this \ -recipe in favor of upstream." +DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \ +is available in linux-firmware, but what is here is the latest and \ +should be preferred." SECTION = "kernel" LICENSE = "Proprietary" @@ -121,6 +120,9 @@ FILES:${PN}-nxp8987-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/*8987* \ " RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-common" +RPROVIDES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio" +RREPLACES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio" +RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio" FILES:${PN}-nxp8997-common = " \ ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \ @@ -128,16 +130,25 @@ FILES:${PN}-nxp8997-common = " \ ${nonarch_base_libdir}/firmware/nxp/uartuart8997_bt_v4.bin \ " RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common" +RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" +RREPLACES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" +RCONFLICTS:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" FILES:${PN}-nxp8997-pcie = " \ ${nonarch_base_libdir}/firmware/nxp/pci*8997* \ " RDEPENDS:${PN}-nxp8997-pcie += "${PN}-nxp8997-common" +RPROVIDES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie" +RREPLACES:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie" +RCONFLICTS:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie" FILES:${PN}-nxp8997-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sdio*8997* \ " RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common" +RPROVIDES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" +RREPLACES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" +RCONFLICTS:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" FILES:${PN}-nxp9098-common = " \ ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \ @@ -145,21 +156,33 @@ FILES:${PN}-nxp9098-common = " \ ${nonarch_base_libdir}/firmware/nxp/uartuart9098_bt_v1.bin \ " RDEPENDS:${PN}-nxp9098-common += "${PN}-nxp-common" +RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" +RREPLACES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" +RCONFLICTS:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" FILES:${PN}-nxp9098-pcie = " \ ${nonarch_base_libdir}/firmware/nxp/pcie*9098* \ " RDEPENDS:${PN}-nxp9098-pcie += "${PN}-nxp9098-common" +RPROVIDES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie" +RREPLACES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie" +RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie" FILES:${PN}-nxp9098-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sdio*9098* \ " RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common" +RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio" +RREPLACES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio" +RCONFLICTS:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio" FILES:${PN}-nxpiw416-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/*iw416* \ " RDEPENDS:${PN}-nxpiw416-sdio += "${PN}-nxp-common" +RPROVIDES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" +RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" +RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" FILES:${PN}-nxpiw612-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \ @@ -168,3 +191,6 @@ FILES:${PN}-nxpiw612-sdio = " \ ${nonarch_base_libdir}/firmware/nxp/IW612_SD_RFTest/ \ " RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common" +RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio" +RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio" +RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio" -- cgit v1.2.3-54-g00ecf