summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2012-03-30 17:31:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-02 04:31:48 +0100
commitcf6b3fb48286792272de0ae2c7f310e1cc66e899 (patch)
tree1e471a03b0985cc6b2baf18ff8f548f12a8e44c7
parent79c806cb404c2d85aeec45b40ea6adbeae9f6346 (diff)
downloadpoky-cf6b3fb48286792272de0ae2c7f310e1cc66e899.tar.gz
self-hosted-image: improve do_populate_poky_src
1) remove the assumption ${DL_DIR} ends with downloads/. Thanks Paul Eggleton for pointing this out. 2) remove downloads/git2_* tarballs to speed up the rootfs creation. This is ok since we still have the git2/. Thanks Richard Purdie for suggesting this. (From OE-Core rev: 58ba59f034941bf167e70ae6c08117e5184a20ec) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/images/self-hosted-image.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
index 5aa670d0d9..e962f3049c 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6 6
7PR = "r6" 7PR = "r7"
8 8
9CORE_IMAGE_EXTRA_INSTALL = "\ 9CORE_IMAGE_EXTRA_INSTALL = "\
10 task-self-hosted \ 10 task-self-hosted \
@@ -37,7 +37,12 @@ fakeroot do_populate_poky_src () {
37 cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky 37 cp -Rp ${WORKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
38 38
39 mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf 39 mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
40 cp -Rp ${DL_DIR} ${IMAGE_ROOTFS}/home/builder/poky/build 40 mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
41 cp -RpL ${DL_DIR}/* ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/
42
43 # Remove the git2_* tarballs -- this is ok since we still have the git2/.
44 rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
45
41 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone 46 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
42 echo "BB_NO_NETWORK = \"1\"" > ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf 47 echo "BB_NO_NETWORK = \"1\"" > ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
43 echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf 48 echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf