aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-12-03 15:30:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 12:28:55 +0000
commite4423eef71c463efe7a1cdf1a426cc9619c78b8a (patch)
tree7054063b4dea399ce7be89d9265dc6105136374c /meta/recipes-kernel
parentf1638d3acbabe43f4909a6dc8de6158e1d8cb439 (diff)
downloadopenembedded-core-contrib-e4423eef71c463efe7a1cdf1a426cc9619c78b8a.tar.gz
openembedded-core-contrib-e4423eef71c463efe7a1cdf1a426cc9619c78b8a.tar.bz2
openembedded-core-contrib-e4423eef71c463efe7a1cdf1a426cc9619c78b8a.zip
linux-firmware: better packaging for TI wl12xx & wl18xx firmwares
Currently, the linux-firmware-wl12xx contains all wl12xx and wl18xx firmwares, except for the wl18xx compatibility symlinks for old kernels and the linux-firmware-wl18xx contains just those compatibility symlinks and nothing else. This doesn't make sense... Be more specific about what to package into each package, in particular because the existing wl12xx package is specific about symlinks already. At the same time, we split the common bits into a -wlcommon package, so that the wl18xx package doesn't need to depend on all the wl12xx firmwares, saving several MiB in the file system. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb17
1 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 2f2e780bd1..ef8bae9f0c 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -237,7 +237,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \
${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 ${PN}-sd8887 ${PN}-sd8897 \
${PN}-usb8997 \
- ${PN}-ti-connectivity-license ${PN}-wl12xx ${PN}-wl18xx \
+ ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \
${PN}-vt6656-license ${PN}-vt6656 \
${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \
${PN}-rtl8168 \
@@ -521,24 +521,27 @@ RDEPENDS_${PN}-rtl8821 += "${PN}-rtl-license"
RDEPENDS_${PN}-rtl8168 += "${PN}-whence-license"
# For ti-connectivity
+LICENSE_${PN}-wlcommon = "Firmware-ti-connectivity"
LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity"
LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity"
LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity"
FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity"
+FILES_${PN}-wlcommon = " \
+ ${nonarch_base_libdir}/firmware/TI* \
+ ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \
+"
FILES_${PN}-wl12xx = " \
${nonarch_base_libdir}/firmware/wl12* \
- ${nonarch_base_libdir}/firmware/TI* \
- ${nonarch_base_libdir}/firmware/ti-connectivity \
+ ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \
"
FILES_${PN}-wl18xx = " \
${nonarch_base_libdir}/firmware/wl18* \
- ${nonarch_base_libdir}/firmware/TI* \
- ${nonarch_base_libdir}/firmware/ti-connectivity \
+ ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \
"
-RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license"
-RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license"
+RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon"
+RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon"
# For vt6656
LICENSE_${PN}-vt6656 = "Firmware-via_vt6656"