summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-05 07:51:00 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-05 07:51:00 +0000
commitf2f97b7c1597a4c482c788bf540f9a1ac441108f (patch)
tree905b76b554fbca122ac746c5b0aa4c91a2baa4fd
parent899c451a73cdb5fc7094626c8331a8a690a50d2c (diff)
downloadopenembedded-core-f2f97b7c1597a4c482c788bf540f9a1ac441108f.tar.gz
openembedded-core-f2f97b7c1597a4c482c788bf540f9a1ac441108f.tar.bz2
openembedded-core-f2f97b7c1597a4c482c788bf540f9a1ac441108f.zip
bitbake.conf: Add bzr fetcher support, give IMAGE_BASENAME a sane default
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2690 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 24c3aa1c72..acf48fb848 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -157,6 +157,7 @@ CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool
CVSDIR = "${DL_DIR}/cvs"
SVNDIR = "${DL_DIR}/svn"
GITDIR = "${DL_DIR}/git"
+BZRDIR = "${DL_DIR}/bzr"
STAMP = "${TMPDIR}/stamps/${PF}"
WORKDIR = "${TMPDIR}/work/${PF}"
@@ -203,7 +204,7 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
##################################################################
IMAGE_ROOTFS = "${TMPDIR}/rootfs"
-IMAGE_BASENAME = "rootfs"
+IMAGE_BASENAME = "${PN}"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
IMAGE_CMD = ""
@@ -372,6 +373,7 @@ KERNELORG_MIRROR = "http://kernel.org/"
FETCHCMD_svn = "/usr/bin/env svn"
FETCHCMD_cvs = "/usr/bin/env cvs"
FETCHCMD_wget = "/usr/bin/env wget -t 5"
+FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"