summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-07 15:41:17 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-07 15:41:17 +0100
commit0e0fadb400b4656c4b15ae4120aa39ff8ed72985 (patch)
treeff7a68626867d8176f791bf95bce8ab64b147cf1 /meta
parentfafb40364dfc3951a1d62a49a412f0e15e284d03 (diff)
downloadpoky-0e0fadb400b4656c4b15ae4120aa39ff8ed72985.tar.gz
rootfs_rpm: Add lock file in the rpm deploy directory to allow mutliple rootfs creation tasks to coexist without breaking each other
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/rootfs_rpm.bbclass4
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1b34ac423b..3db34ac193 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -90,7 +90,7 @@ LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVa
90 90
91do_rootfs[nostamp] = "1" 91do_rootfs[nostamp] = "1"
92do_rootfs[dirs] = "${TOPDIR}" 92do_rootfs[dirs] = "${TOPDIR}"
93do_rootfs[lockfiles] = "${IMAGE_ROOTFS}.lock" 93do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
94do_build[nostamp] = "1" 94do_build[nostamp] = "1"
95 95
96# Must call real_do_rootfs() from inside here, rather than as a separate 96# Must call real_do_rootfs() from inside here, rather than as a separate
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index a57894ae5d..f82fcacf5d 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -28,6 +28,10 @@ opkglibdir = "${localstatedir}/lib/opkg"
28RPMOPTS="--dbpath ${rpmlibdir} --define='_openall_before_chroot 1'" 28RPMOPTS="--dbpath ${rpmlibdir} --define='_openall_before_chroot 1'"
29RPM="rpm ${RPMOPTS}" 29RPM="rpm ${RPMOPTS}"
30 30
31# RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files
32# in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently
33do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
34
31fakeroot rootfs_rpm_do_rootfs () { 35fakeroot rootfs_rpm_do_rootfs () {
32 set +x 36 set +x
33 37