summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@dowhile0.org>2012-08-05 19:48:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 14:18:51 (GMT)
commitdb50930882898e537004ccb1dfaa2dac880c9c65 (patch)
tree7e245c1c03e2ff8d90b619a38657301bec8675a3
parent5b8a4798ea2ea7df66bb53c26448251ea7da3dd9 (diff)
downloadpoky-db50930882898e537004ccb1dfaa2dac880c9c65.tar.gz
linux-firware: use ${base_libdir} instead of /lib for packaging
It is considered good practice to use the build system provided variables instead of directly specify hardcoded paths. (From OE-Core rev: ce2665b6ae77770d69ffbc4d45c96ce829d16738) Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb36
1 files changed, 18 insertions, 18 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index a7e4ed6..5b93975 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \
22SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a" 22SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a"
23PE = "1" 23PE = "1"
24PV = "0.0+git${SRCPV}" 24PV = "0.0+git${SRCPV}"
25PR = "r2" 25PR = "r3"
26 26
27SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git" 27SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git"
28 28
@@ -35,50 +35,50 @@ do_compile() {
35} 35}
36 36
37do_install() { 37do_install() {
38 install -d ${D}/lib/firmware/ 38 install -d ${D}${base_libdir}/firmware/
39 cp -r * ${D}/lib/firmware/ 39 cp -r * ${D}${base_libdir}/firmware/
40 40
41 # Libertas sd8686 41 # Libertas sd8686
42 ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin 42 ln -sf libertas/sd8686_v9.bin ${D}${base_libdir}/firmware/sd8686.bin
43 ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin 43 ln -sf libertas/sd8686_v9_helper.bin ${D}${base_libdir}/firmware/sd8686_helper.bin
44 44
45 # Realtek rtl8192* 45 # Realtek rtl8192*
46 install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt 46 install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
47 47
48 # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it 48 # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it
49 ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . ) 49 ( cd ${D}${base_libdir}/firmware ; ln -sf ti-connectivity/* . )
50} 50}
51 51
52PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx" 52PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx"
53 53
54LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas" 54LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
55FILES_${PN}-sd8686 = " \ 55FILES_${PN}-sd8686 = " \
56 /lib/firmware/libertas/sd8686_v9* \ 56 ${base_libdir}/firmware/libertas/sd8686_v9* \
57 /lib/firmware/sd8686* \ 57 ${base_libdir}/firmware/sd8686* \
58 /lib/firmware/LICENCE.libertas \ 58 ${base_libdir}/firmware/LICENCE.libertas \
59" 59"
60 60
61LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware" 61LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware"
62FILES_${PN}-rtl8192cu = " \ 62FILES_${PN}-rtl8192cu = " \
63 /lib/firmware/rtlwifi/rtl8192cufw.bin \ 63 ${base_libdir}/firmware/rtlwifi/rtl8192cufw.bin \
64 /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \ 64 ${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
65" 65"
66 66
67LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware" 67LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware"
68FILES_${PN}-rtl8192ce = " \ 68FILES_${PN}-rtl8192ce = " \
69 /lib/firmware/rtlwifi/rtl8192cfw.bin \ 69 ${base_libdir}/firmware/rtlwifi/rtl8192cfw.bin \
70" 70"
71 71
72LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware" 72LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware"
73FILES_${PN}-rtl8192su = " \ 73FILES_${PN}-rtl8192su = " \
74 /lib/firmware/rtlwifi/rtl8712u.bin \ 74 ${base_libdir}/firmware/rtlwifi/rtl8712u.bin \
75" 75"
76 76
77FILES_${PN}-wl12xx = " \ 77FILES_${PN}-wl12xx = " \
78 /lib/firmware/wl12* \ 78 ${base_libdir}/firmware/wl12* \
79 /lib/firmware/TI* \ 79 ${base_libdir}/firmware/TI* \
80 /lib/firmware/ti-connectivity \ 80 ${base_libdir}/firmware/ti-connectivity \
81" 81"
82 82
83FILES_${PN} += "/lib/firmware/*" 83FILES_${PN} += "${base_libdir}/firmware/*"
84 84