summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-10-09 12:06:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:38 +0100
commitaaf52a5c6a2524b8a2e48ea9f9f60db24d8301ac (patch)
tree4e8df0452eb16d8420cfae5555cb843adfaa32bb
parentd824f46959f0097fc7e01938bf0e76ac69d52971 (diff)
downloadpoky-aaf52a5c6a2524b8a2e48ea9f9f60db24d8301ac.tar.gz
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 <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb54
1 files changed, 23 insertions, 31 deletions
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 @@
1DESCRIPTION = "Firmware files for use with Linux kernel" 1DESCRIPTION = "Firmware files for use with Linux kernel"
2SECTION = "kernel" 2SECTION = "kernel"
3LICENSE = "Proprietary" 3LICENSE = "Proprietary"
4LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
5LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware"
6LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware"
7LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware"
8 4
9LIC_FILES_CHKSUM = "file://LICENSE.radeon_rlc;md5=4c243f7854d2884b483abda991adef43 \ 5LIC_FILES_CHKSUM = "file://LICENSE.radeon_rlc;md5=4c243f7854d2884b483abda991adef43 \
10 file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ 6 file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \
11 file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ 7 file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
12 file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ 8 file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \
13 file://LICENCE.qla2xxx;md5=4005328a134054f0fa077bdc37aa64f2 \ 9 file://LICENCE.qla2xxx;md5=4005328a134054f0fa077bdc37aa64f2 \
14 file://LICENCE.mwl8k;md5=9ddea1734a4baf3c78d845151f42a37a \
15 file://LICENCE.libertas;md5=2d2127d203ac000f1afabfce593659ce \
16 file://LICENCE.iwlwifi_firmware;md5=311cc823df5b1be4f00fbf0f17d96a6b \ 10 file://LICENCE.iwlwifi_firmware;md5=311cc823df5b1be4f00fbf0f17d96a6b \
17 file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ 11 file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \
18 file://LICENCE.atheros_firmware;md5=62748c8fecfa12010fd76409db4b5459 \ 12 file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \
19 file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ 13 file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
20 file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ 14 file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \
21 " 15 "
22 16
23PROVIDES += "linux-firmware-sd8686 linux-firmware-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su" 17SRCREV = "d543c1d98fc240267ee59fff93f7a0f36d9e2fc3"
24
25SRCREV = "40c0f950be7040614dc45df54e25e54d00e3b73b"
26PV = "0.0+git${SRCPV}" 18PV = "0.0+git${SRCPV}"
27PR = "r1" 19PR = "r2"
28 20
29SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git;protocol=git" 21SRC_URI = "git://git.infradead.org/users/dwmw2/linux-firmware.git;protocol=git"
30 22
31S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
32 24
@@ -38,45 +30,45 @@ do_compile() {
38 30
39do_install() { 31do_install() {
40 install -d ${D}/lib/firmware/ 32 install -d ${D}/lib/firmware/
33 cp -RpP * ${D}/lib/firmware/
34
41 # Libertas sd8686 35 # Libertas sd8686
42 install -m 0644 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin 36 install -m 0644 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
43 install -m 0644 libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin 37 install -m 0644 libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
44 install -m 0644 LICENCE.libertas ${D}/lib/firmware/ 38
45 # Realtek rtl8192* 39 # Realtek rtl8192*
46 install -d ${D}/lib/firmware/rtlwifi/
47 install -m 0644 rtlwifi/rtl8192cufw.bin ${D}/lib/firmware/rtlwifi/rtl8192cufw.bin
48 install -m 0644 rtlwifi/rtl8192cfw.bin ${D}/lib/firmware/rtlwifi/rtl8192cfw.bin
49 install -m 0644 rtlwifi/rtl8712u.bin ${D}/lib/firmware/rtlwifi/rtl8712u.bin
50 install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt 40 install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
41
42 # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it
43 ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . )
51} 44}
52 45
53PACKAGES = "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su" 46PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx"
54 47
48LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
55FILES_${PN}-sd8686 = "/lib/firmware/sd8686* /lib/firmware/LICENCE.libertas" 49FILES_${PN}-sd8686 = "/lib/firmware/sd8686* /lib/firmware/LICENCE.libertas"
56 50
57RPROVIDES_${PN}-sd8686 = "${PN}-sd8686" 51LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware"
58
59FILES_${PN}-rtl8192cu = " \
60 /lib/firmware/rtlwifi/rtl8192cufw.bin \
61 /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
62"
63RPROVIDES_${PN}-rtl8192cu = "${PN}-rtl8192cu"
64
65FILES_${PN}-rtl8192cu = " \ 52FILES_${PN}-rtl8192cu = " \
66 /lib/firmware/rtlwifi/rtl8192cufw.bin \ 53 /lib/firmware/rtlwifi/rtl8192cufw.bin \
67 /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \ 54 /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
68" 55"
69RPROVIDES_${PN}-rtl8192cu = "${PN}-rtl8192cu"
70 56
57LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware"
71FILES_${PN}-rtl8192ce = " \ 58FILES_${PN}-rtl8192ce = " \
72 /lib/firmware/rtlwifi/rtl8192cfw.bin \ 59 /lib/firmware/rtlwifi/rtl8192cfw.bin \
73 /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
74" 60"
75RPROVIDES_${PN}-rtl8192ce = "${PN}-rtl8192ce"
76 61
62LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware"
77FILES_${PN}-rtl8192su = " \ 63FILES_${PN}-rtl8192su = " \
78 /lib/firmware/rtlwifi/rtl8712u.bin \ 64 /lib/firmware/rtlwifi/rtl8712u.bin \
79 /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
80" 65"
81RPROVIDES_${PN}-rtl8192su = "${PN}-rtl8192su" 66
67FILES_${PN}-wl12xx = " \
68 /lib/firmware/wl12* \
69 /lib/firmware/TI* \
70 /lib/firmware/ti-connectivity \
71"
72
73FILES_${PN} += "/lib/firmware/*"
82 74