diff options
author | Stephano Cetola <stephano.cetola@linux.intel.com> | 2016-08-10 13:03:16 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-12 15:25:22 +0100 |
commit | 6b66e9317f4ec3a69f98f29836aafa35b52f3fc7 (patch) | |
tree | e97a5f491be57a28ebbb334af7fc706e93884904 /meta/classes/rootfs_rpm.bbclass | |
parent | d11e8e1109c2c5a0cc3e4dea70cebe068b2a6ba1 (diff) | |
download | poky-6b66e9317f4ec3a69f98f29836aafa35b52f3fc7.tar.gz |
Allow for simultaneous do_rootfs tasks with rpmuninative-1.3
Give each rootfs its own RPM channel to use. This puts the RPM metadata
in a private subdirectory of $WORKDIR, rather than living in DEPLOY_DIR
where other tasks may race with it.
This allows us to reduce the time that the rpm.lock is held to only the
time needed to hardlink the RPMs, allowing the majority of the rootfs
operation to run in parallel.
Also, this fixes the smart tests by generating an index for all packages
at the time of the test, rather than using the one provided by the
rootfs process.
Original credit for the enhancement should go to Steven Walter
stevenrwalter@gmail.com.
(From OE-Core rev: a92c196449c516fe51786d429078bbb1213bb029)
Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 38b3c99495..37730a7104 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -24,11 +24,6 @@ do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}" | |||
24 | do_rootfs[recrdeptask] += "do_package_write_rpm" | 24 | do_rootfs[recrdeptask] += "do_package_write_rpm" |
25 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS" | 25 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS" |
26 | 26 | ||
27 | # RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files | ||
28 | # in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently | ||
29 | do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock" | ||
30 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock" | ||
31 | |||
32 | python () { | 27 | python () { |
33 | if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): | 28 | if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): |
34 | flags = d.getVarFlag('do_rootfs', 'recrdeptask', True) | 29 | flags = d.getVarFlag('do_rootfs', 'recrdeptask', True) |