summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2009-04-23 15:23:03 +0400
committerRoman I Khimov <khimov@altell.ru>2009-04-23 18:00:43 +0400
commit2343808f7386cbd4c7b43f1b24e65e173f5ddf15 (patch)
tree9b1045a312abf6e6ada5630000c571fcca056aca
parenta292887f0a0534d65336fac3131325742256cbfd (diff)
bitbake.conf: use rootfs/${PN} for IMAGE_ROOTFS
Allows parallel build for different images. Acked-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--classes/image.bbclass1
-rw-r--r--conf/bitbake.conf2
2 files changed, 1 insertions, 2 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index cbbbbd13d6..89d27120c1 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -104,7 +104,6 @@ LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVa
do_rootfs[nostamp] = "1"
do_rootfs[dirs] = "${TOPDIR}"
-do_rootfs[lockfiles] = "${IMAGE_ROOTFS}.lock"
do_build[nostamp] = "1"
do_install[nostamp] = "1"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f53f7d690f..9e026e44c4 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -329,7 +329,7 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel"
# Specific image creation and rootfs population info.
##################################################################
-IMAGE_ROOTFS = "${TMPDIR}/rootfs"
+IMAGE_ROOTFS = "${TMPDIR}/rootfs/${PN}"
IMAGE_BASENAME = "${PN}"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"