| Message ID | 20240826013909.353920-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Delegated to: | Steve Sakoman |
| Headers | show |
| Series | [scarthgap] linux-firmware: add a package for ath12k firmware | expand |
Hi Dmitry, On 8/26/24 3:39 AM, Dmitry Baryshkov via lists.openembedded.org wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > Add the firmware package for the ATH12K module. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../linux-firmware/linux-firmware_20240312.bb | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb > index ff79bb9b33c6..53851b58fede 100644 > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb > @@ -322,7 +322,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ > ${PN}-cnm-license ${PN}-cnm \ > ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ > ${PN}-carl9170 \ > - ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ > + ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-ath12k ${PN}-qca \ > \ > ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ > \ > @@ -487,6 +487,10 @@ FILES:${PN}-ath11k = " \ > ${nonarch_base_libdir}/firmware/ath11k \ > " > > +FILES:${PN}-ath12k = " \ > + ${nonarch_base_libdir}/firmware/ath12k \ > +" > + > FILES:${PN}-qca = " \ > ${nonarch_base_libdir}/firmware/qca \ > " > @@ -494,6 +498,7 @@ FILES:${PN}-qca = " \ > RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" > RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" > RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" > +RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license" I don't think this is appropriate for a release branch. This would break existing users by moving the same file to a different package. This is fine for the master branch, not release branches. Since I cannot see any firmware/ath12k paths in any FILES aside from the one added in this commit, I believe this directory was caught by the catch-all linux-firmware mega-package? If that is the case, then to still allow for backward compatibility, add the following: RDEPENDS:${PN] += "${PN}-ath12k" so that anyone installing/depending on linux-firmware package for this directory will still have it after updating. Cheers, Quentin
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb index ff79bb9b33c6..53851b58fede 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb @@ -322,7 +322,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-cnm-license ${PN}-cnm \ ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ ${PN}-carl9170 \ - ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ + ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-ath12k ${PN}-qca \ \ ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ \ @@ -487,6 +487,10 @@ FILES:${PN}-ath11k = " \ ${nonarch_base_libdir}/firmware/ath11k \ " +FILES:${PN}-ath12k = " \ + ${nonarch_base_libdir}/firmware/ath12k \ +" + FILES:${PN}-qca = " \ ${nonarch_base_libdir}/firmware/qca \ " @@ -494,6 +498,7 @@ FILES:${PN}-qca = " \ RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" +RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license" RDEPENDS:${PN}-qca += "${PN}-ath10k-license" # For ralink