diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-03 14:06:53 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-03 14:43:09 +0200 |
| commit | be7bca837405b36c0fdb62cbccf4dc5ee0a56255 (patch) | |
| tree | c26997beb853d39243541ba655780df588a49876 | |
| parent | 9b7bd08b10582056b9cecf7be694231cba75d992 (diff) | |
Revert "linux-firmware: add imx-firmware license"
linux-firmware create_spdx task fails because NO_GENERIC_LICENSE
is being set with a full path while it is expected to be under ${S}/.
Fix is not trivial and Torizon monthly release is ongoing, which
trigger create_spdx with building SBoM.
This revert 559619a7ac3c ("linux-firmware: add imx-firmware license")
while searching for proper solution.
Related-to: TOR-3159 ELB-5247
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
| -rw-r--r-- | recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index c1c2dba..418a2e9 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -9,10 +9,6 @@ SRCREV_imx-firmware = "f775d53ca3a478c85e8c8a880e44cc269bd14db0" SRCREV_FORMAT = "default_imx-firmware" do_install:append () { - # Install IMX Firmware EULA license - install -d ${D}${nonarch_base_libdir}/firmware - install -m 0644 ${WORKDIR}/imx-firmware/EULA.txt ${D}${nonarch_base_libdir}/firmware/LICENSE.imx - # Install common IMX firmware files install -d ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 ${WORKDIR}/imx-firmware/nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp @@ -31,33 +27,20 @@ do_install:append () { ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin } -LICENSE += " \ - & firmware-imx \ -" -LIC_FILES_CHKSUM += " \ - file://${WORKDIR}/imx-firmware/EULA.txt;md5=673fa34349fa40f59e0713cb0ac22b1f \ -" -NO_GENERIC_LICENSE[firmware-imx] = "${WORKDIR}/imx-firmware/EULA.txt" - PACKAGES =+ " \ ${PN}-imx-common \ - ${PN}-imx-license \ ${PN}-iw416 \ ${PN}-nxp89xx \ " FILES:${PN}-imx-common = "${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf" -FILES:${PN}-imx-license = "${nonarch_base_libdir}/firmware/LICENSE.imx" - FILES:${PN}-iw416 = " \ ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \ ${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin \ " -LICENSE:${PN}-iw416 = "firmware-imx" - -RDEPENDS:${PN}-iw416 += "${PN}-imx-common ${PN}-imx-license" +RDEPENDS:${PN}-iw416 += "${PN}-imx-common" FILES:${PN}-nxp89xx = " \ ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \ @@ -66,6 +49,4 @@ FILES:${PN}-nxp89xx = " \ ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \ " -LICENSE:${PN}-nxp89xx = "firmware-imx" - -RDEPENDS:${PN}-nxp89xx += "${PN}-imx-common ${PN}-imx-license" +RDEPENDS:${PN}-nxp89xx += "${PN}-imx-common" |