diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2007-09-05 09:04:35 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-09-05 09:04:35 +0000 |
| commit | 5d158d7d1127cbcf9075b2ebfb1f8d9271d969ad (patch) | |
| tree | 811de8a20632dc090c005d1f9d43a54fdab3439b | |
| parent | b8c7a56f1407155f1df69ce942ebef1a585d47dd (diff) | |
| parent | 7cb356bc5fbca281f08aa4fb9bbaa104c8a7698c (diff) | |
| download | openembedded-5d158d7d1127cbcf9075b2ebfb1f8d9271d969ad.tar.gz | |
merge of '13890ee4d20d70e06eada225797e62e3847248e9'
and '5337c2ae1bddb02aff4358e400f0a8697f0f961a'
| -rw-r--r-- | classes/image.bbclass | 2 | ||||
| -rw-r--r-- | conf/bitbake.conf | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 04e26e4b35..3420e3f53a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -4,7 +4,7 @@ LICENSE = "MIT" PACKAGES = "" RDEPENDS += "${IMAGE_INSTALL}" -export IMAGE_BASENAME ?= "${PN}" +IMAGE_BASENAME[export] = "1" export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" # We need to recursively follow RDEPENDS and RRECOMMENDS for images diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a72dd75fdc..232986827c 100644 --- a/conf/bitbake.conf +++ b/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}" |