summaryrefslogtreecommitdiffstats
path: root/common/recipes-corpus
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-20 15:37:38 (GMT)
committerTom Zanussi <tom.zanussi@linux.intel.com>2014-05-22 01:21:23 (GMT)
commit3971a857ebfe612620c7dffdd678932e7b3ac353 (patch)
treedcd96355d294439b40abcff3419aa853fc1fd511 /common/recipes-corpus
parentcfcbb7eaf706bba4012c62e4a856f89fc3adc6ef (diff)
downloadmeta-intel-3971a857ebfe612620c7dffdd678932e7b3ac353.tar.gz
canterbury-corpus: rationalise unpack logic
Instead of manually unpacking, use the subdir parameter to put the tarball into the right directory. Signed-off-by: Ross Burton <ross.burton@intel.com> Acked-by: Ong Boon Leong <boon.leong.ong@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'common/recipes-corpus')
-rw-r--r--common/recipes-corpus/canterbury-corpus/canterbury-corpus.bb19
1 files changed, 6 insertions, 13 deletions
diff --git a/common/recipes-corpus/canterbury-corpus/canterbury-corpus.bb b/common/recipes-corpus/canterbury-corpus/canterbury-corpus.bb
index 97f3b85..5b5e608 100644
--- a/common/recipes-corpus/canterbury-corpus/canterbury-corpus.bb
+++ b/common/recipes-corpus/canterbury-corpus/canterbury-corpus.bb
@@ -10,25 +10,18 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
10 10
11PR = "r0" 11PR = "r0"
12 12
13S = "${WORKDIR}/canterbury-corpus" 13# The tarball doesn't extract a directory, so ask bitbake to make one
14 14SRC_URI = "http://corpus.canterbury.ac.nz/resources/cantrbry.tar.gz;subdir=${BP}"
15SRC_URI = "http://corpus.canterbury.ac.nz/resources/cantrbry.tar.gz"
16
17SRC_URI[md5sum] = "442e56cfffdf460d25b0b91650a55908" 15SRC_URI[md5sum] = "442e56cfffdf460d25b0b91650a55908"
18SRC_URI[sha256sum] = "f140e8a5b73d3f53198555a63bfb827889394a42f20825df33c810c3d5e3f8fb" 16SRC_URI[sha256sum] = "f140e8a5b73d3f53198555a63bfb827889394a42f20825df33c810c3d5e3f8fb"
19 17
20do_unpack () {
21 mkdir -p ${S}
22 tar -xf ${DL_DIR}/cantrbry.tar.gz -C ${S}
23}
24
25do_unpack_append () {
26 rm -rf ${S}/patches
27}
28
29FILES_${PN} = "/lib/firmware/*" 18FILES_${PN} = "/lib/firmware/*"
30 19
31do_install () { 20do_install () {
21 # do_unpack creates this directory but we don't want to install it, so
22 # delete it now.
23 rm -rf ${S}/patches
24
32 install -d ${D}${base_libdir}/firmware 25 install -d ${D}${base_libdir}/firmware
33 install -m 644 ${S}/* ${D}${base_libdir}/firmware 26 install -m 644 ${S}/* ${D}${base_libdir}/firmware
34} 27}