From 07a482f3c37681afa3829c02b76577a0c95018be Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 May 2014 17:11:06 +0100 Subject: calgary-corpus: clean up unpack logic As with canterbury-corpus, use SRC_URI parameters to unpack correctly instead of doing it by hand. Signed-off-by: Ross Burton Acked-by: Ong Boon Leong Signed-off-by: Tom Zanussi --- .../calgary-corpus/calgary-corpus.bb | 24 ++++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/common/recipes-corpus/calgary-corpus/calgary-corpus.bb b/common/recipes-corpus/calgary-corpus/calgary-corpus.bb index 8c3aea8a..0a91387a 100644 --- a/common/recipes-corpus/calgary-corpus/calgary-corpus.bb +++ b/common/recipes-corpus/calgary-corpus/calgary-corpus.bb @@ -5,26 +5,18 @@ SECTION = "misc" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -S = "${WORKDIR}/corpus" - -SRC_URI = "http://corpus.canterbury.ac.nz/resources/calgary.tar.gz" - +# The tarball doesn't extract a directory, so ask bitbake to make one +SRC_URI = "http://corpus.canterbury.ac.nz/resources/calgary.tar.gz;subdir=${BP}" SRC_URI[md5sum] = "651d06b35d3d39522157cf8dc4a3d01c" SRC_URI[sha256sum] = "e109eebdc19c5cee533c58bd6a49a4be3a77cc52f84ba234a089148a4f2093b7" -do_unpack () { - mkdir -p ${S} - tar -xf ${DL_DIR}/calgary.tar.gz -C ${WORKDIR}/corpus -} - - -do_unpack_append () { - rm -rf ${WORKDIR}/corpus/patches -} - -FILES_${PN} = "/lib/firmware/*" - do_install () { + # do_unpack creates this directory but we don't want to install it, so + # delete it now. + rm -rf ${S}/patches + install -d ${D}/lib/firmware install -m 664 ${S}/* ${D}/lib/firmware } + +FILES_${PN} = "/lib/firmware/*" -- cgit v1.2.3-54-g00ecf