From: Timotheus Giuliani <timotheus.giuli...@philips.com>
Installing the linux-firmware-dev package fails because of the following
problem.
For each mediatek MT76x firmware a separate license package was declared.
In all these license packages the same file was referenced as the license file.
This meant that if several of these packages were used at the same time,
the license packages would be empty.
This commit defines a common license package for the mediatek MT76x packages,
which is then referenced by all of them.
Fixes: dfb7d2c426b4 ("linux-firmware: create separate packages")
Signed-off-by: Julian Haller <julian.hal...@philips.com>
---
.../linux-firmware/linux-firmware_20231211.bb | 23 ++++++-------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231211.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_20231211.bb
index 16cf8e241b..9347cde298 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231211.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231211.bb
@@ -263,9 +263,7 @@ do_install() {
PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
${PN}-cw1200-license ${PN}-cw1200 \
${PN}-ralink-license ${PN}-ralink \
- ${PN}-mt7601u-license ${PN}-mt7601u \
- ${PN}-mt7650-license ${PN}-mt7650 \
- ${PN}-mt76x2-license ${PN}-mt76x2 \
+ ${PN}-mt76x-license ${PN}-mt7601u ${PN}-mt7650 ${PN}-mt76x2 \
${PN}-radeon-license ${PN}-radeon \
${PN}-amdgpu-license ${PN}-amdgpu \
${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \
@@ -507,43 +505,36 @@ FILES:${PN}-ralink = " \
RDEPENDS:${PN}-ralink += "${PN}-ralink-license"
# For mediatek MT7601U
+LICENSE:${PN}-mt76x-license = "Firmware-ralink_a_mediatek_company_firmware"
+FILES:${PN}-mt76x-license =
"${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware"
+
LICENSE:${PN}-mt7601u = "Firmware-ralink_a_mediatek_company_firmware"
-LICENSE:${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware"
-FILES:${PN}-mt7601u-license =
"${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware"
FILES:${PN}-mt7601u = " \
${nonarch_base_libdir}/firmware/mediatek/mt7601u.bin \
${nonarch_base_libdir}/firmware/mt7601u.bin \
"
-RDEPENDS:${PN}-mt7601u += "${PN}-mt7601u-license"
+RDEPENDS:${PN}-mt7601u += "${PN}-mt76x-license"
# For MediaTek Bluetooth USB driver 7650
LICENSE:${PN}-mt7650 = "Firmware-ralink_a_mediatek_company_firmware"
-LICENSE:${PN}-mt7650-license = "Firmware-ralink_a_mediatek_company_firmware"
-FILES:${PN}-mt7650-license = " \
- ${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware \
-"
FILES:${PN}-mt7650 = " \
${nonarch_base_libdir}/firmware/mediatek/mt7650.bin \
${nonarch_base_libdir}/firmware/mt7650.bin \
"
-RDEPENDS:${PN}-mt7650 += "${PN}-mt7650-license"
+RDEPENDS:${PN}-mt7650 += "${PN}-mt76x-license"
# For MediaTek MT76x2 Wireless MACs
LICENSE:${PN}-mt76x2 = "Firmware-ralink_a_mediatek_company_firmware"
-LICENSE:${PN}-mt76x2-license = "Firmware-ralink_a_mediatek_company_firmware"
-FILES:${PN}-mt76x2-license = " \
- ${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware \
-"
FILES:${PN}-mt76x2 = " \
${nonarch_base_libdir}/firmware/mediatek/mt7662.bin \
${nonarch_base_libdir}/firmware/mt7662.bin \
${nonarch_base_libdir}/firmware/mediatek/mt7662_rom_patch.bin \
${nonarch_base_libdir}/firmware/mt7662_rom_patch.bin \
"
-RDEPENDS:${PN}-mt76x2 += "${PN}-mt76x2-license"
+RDEPENDS:${PN}-mt76x2 += "${PN}-mt76x-license"
# For MediaTek
LICENSE:${PN}-mediatek = "Firmware-mediatek"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193995):
https://lists.openembedded.org/g/openembedded-core/message/193995
Mute This Topic: https://lists.openembedded.org/mt/103813302/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
