summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-04-17 15:02:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 23:16:30 +0100
commita8c668c43a3f0e63d1072cf41a9427de2e665d36 (patch)
tree0f74f9705955db2305afd4d350de959abe836203 /meta
parent9656762e80c75df6b3fa2f6c717e92ddb53a6e2f (diff)
downloadpoky-a8c668c43a3f0e63d1072cf41a9427de2e665d36.tar.gz
self-hosted-image: remove BB_NO_NETWORK and update Poky SRCREV
Remove BB_NO_NETWORK because we can not guarentee that all downloads will be available in the self-hosted image for the possible targets being built. If this image is run with out networking, failures may be seen and BB_NO_NETWORK should be set via the Hob Update the Poky SRCREV so it has the latest set of fixes and patches. (From OE-Core rev: 70541d5e82ee05289eb0095bed4b121d12a00729) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/images/self-hosted-image.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
index 46e7209336..fbcdf4cc94 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8PR = "r11" 8PR = "r12"
9 9
10IMAGE_FEATURES += "x11-mini package-management" 10IMAGE_FEATURES += "x11-mini package-management"
11 11
@@ -19,7 +19,7 @@ IMAGE_FSTYPES = "vmdk"
19 19
20inherit core-image 20inherit core-image
21 21
22SRCREV = "8691a588267472eb5a32b978a0eb9ddfd0c91733" 22SRCREV = "20ff9db92165e6d16897671d2b1d370661962712"
23SRC_URI = "git://git.yoctoproject.org/poky;protocol=git" 23SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
24 24
25IMAGE_CMD_ext3_append () { 25IMAGE_CMD_ext3_append () {
@@ -43,7 +43,6 @@ fakeroot do_populate_poky_src () {
43 rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_* 43 rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
44 44
45 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone 45 echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
46 echo "BB_NO_NETWORK = \"1\"" > ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
47 echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf 46 echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
48 mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo 47 mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
49 echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc 48 echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc