From aaf52a5c6a2524b8a2e48ea9f9f60db24d8301ac Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 9 Oct 2011 12:06:41 +0200 Subject: linux-firmware: update, merge in OE classic updates, fix packaging Update: move to latest SRCREV, use non-kernel.org URI Merge: wl12xx symlink + packaging, install all firmwares Fix: * all entries in PACKAGES are in PROVIDES already * A package always RPROVIDES itself * A file can only get packaged *once* so only one rtlwifi package will get the license (From OE-Core rev: 8c7adb66d297ccf9f2f15eb311e5de7d5b07c6df) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- .../linux-firmware/linux-firmware_git.bb | 54 +++++++++------------- 1 file changed, 23 insertions(+), 31 deletions(-) (limited to 'meta/recipes-kernel/linux-firmware') diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 86d60b41cc..224cec0f82 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -1,32 +1,24 @@ DESCRIPTION = "Firmware files for use with Linux kernel" SECTION = "kernel" LICENSE = "Proprietary" -LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas" -LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware" -LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware" -LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware" LIC_FILES_CHKSUM = "file://LICENSE.radeon_rlc;md5=4c243f7854d2884b483abda991adef43 \ file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ file://LICENCE.qla2xxx;md5=4005328a134054f0fa077bdc37aa64f2 \ - file://LICENCE.mwl8k;md5=9ddea1734a4baf3c78d845151f42a37a \ - file://LICENCE.libertas;md5=2d2127d203ac000f1afabfce593659ce \ file://LICENCE.iwlwifi_firmware;md5=311cc823df5b1be4f00fbf0f17d96a6b \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ - file://LICENCE.atheros_firmware;md5=62748c8fecfa12010fd76409db4b5459 \ + file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ " -PROVIDES += "linux-firmware-sd8686 linux-firmware-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su" - -SRCREV = "40c0f950be7040614dc45df54e25e54d00e3b73b" +SRCREV = "d543c1d98fc240267ee59fff93f7a0f36d9e2fc3" PV = "0.0+git${SRCPV}" -PR = "r1" +PR = "r2" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git;protocol=git" +SRC_URI = "git://git.infradead.org/users/dwmw2/linux-firmware.git;protocol=git" S = "${WORKDIR}/git" @@ -38,45 +30,45 @@ do_compile() { do_install() { install -d ${D}/lib/firmware/ + cp -RpP * ${D}/lib/firmware/ + # Libertas sd8686 install -m 0644 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin install -m 0644 libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin - install -m 0644 LICENCE.libertas ${D}/lib/firmware/ + # Realtek rtl8192* - install -d ${D}/lib/firmware/rtlwifi/ - install -m 0644 rtlwifi/rtl8192cufw.bin ${D}/lib/firmware/rtlwifi/rtl8192cufw.bin - install -m 0644 rtlwifi/rtl8192cfw.bin ${D}/lib/firmware/rtlwifi/rtl8192cfw.bin - install -m 0644 rtlwifi/rtl8712u.bin ${D}/lib/firmware/rtlwifi/rtl8712u.bin install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt + + # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it + ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . ) } -PACKAGES = "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su" +PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx" +LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas" FILES_${PN}-sd8686 = "/lib/firmware/sd8686* /lib/firmware/LICENCE.libertas" -RPROVIDES_${PN}-sd8686 = "${PN}-sd8686" - -FILES_${PN}-rtl8192cu = " \ - /lib/firmware/rtlwifi/rtl8192cufw.bin \ - /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \ -" -RPROVIDES_${PN}-rtl8192cu = "${PN}-rtl8192cu" - +LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware" FILES_${PN}-rtl8192cu = " \ /lib/firmware/rtlwifi/rtl8192cufw.bin \ /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \ " -RPROVIDES_${PN}-rtl8192cu = "${PN}-rtl8192cu" +LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware" FILES_${PN}-rtl8192ce = " \ /lib/firmware/rtlwifi/rtl8192cfw.bin \ - /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \ " -RPROVIDES_${PN}-rtl8192ce = "${PN}-rtl8192ce" +LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware" FILES_${PN}-rtl8192su = " \ /lib/firmware/rtlwifi/rtl8712u.bin \ - /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \ " -RPROVIDES_${PN}-rtl8192su = "${PN}-rtl8192su" + +FILES_${PN}-wl12xx = " \ + /lib/firmware/wl12* \ + /lib/firmware/TI* \ + /lib/firmware/ti-connectivity \ +" + +FILES_${PN} += "/lib/firmware/*" -- cgit v1.2.3-54-g00ecf