From 5b0093ecee4b249da588524ec13c5a86029fe1c1 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 20 Apr 2022 13:11:28 +0300 Subject: [PATCH] linux-firmware: correct license for ar3k firmware According to the WHENCE file, some a3k firmware files are licensed under the special ar3k license, while others are licensed under the more generic Atheros license. Document this by adding extending the LICENSE_${PN}-ar3k and depending on both of them. (From OE-Core rev: 8c0aa16d76e5492f774fcfe08c829c877991afbd) Signed-off-by: Dmitry Baryshkov Signed-off-by: Luca Ceresoli (cherry picked from commit 8e651814af706285d64b532095fcd6f5f02629ba) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb index 04a6cefaa1..ad8dbac17f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb @@ -352,7 +352,7 @@ FILES_${PN}-carl9170 = " \ RDEPENDS_${PN}-carl9170 += "${PN}-gplv2-license" # For QualCommAthos -LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" +LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k & Firmware-atheros_firmware" LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" @@ -376,7 +376,7 @@ FILES_${PN}-qca = " \ ${nonarch_base_libdir}/firmware/qca \ " -RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" +RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license" RDEPENDS_${PN}-ath11k += "${PN}-ath10k-license" RDEPENDS_${PN}-qca += "${PN}-ath10k-license"