From: jhaller.oss@gmail.com
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][PATCH] linux-firmware: fix mediatek MT76x empty license package
Date: Thu, 18 Jan 2024 18:40:49 +0100 [thread overview]
Message-ID: <20240118174049.3517958-1-jhaller.oss@gmail.com> (raw)
From: Timotheus Giuliani <timotheus.giuliani@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.haller@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
reply other threads:[~2024-01-18 17:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240118174049.3517958-1-jhaller.oss@gmail.com \
--to=jhaller.oss@gmail.com \
--cc=julian.haller@philips.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox