diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-21 23:17:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-22 10:39:10 +0000 |
| commit | 902b77bf91d96517b935bce00a11003604dc3d54 (patch) | |
| tree | ae6155b48ba64d4a0f5acae99130963648d980c7 /meta/classes/rootfs_deb.bbclass | |
| parent | 3ef5e034c654996c6f8fb90f116bb91877c2758a (diff) | |
| download | poky-902b77bf91d96517b935bce00a11003604dc3d54.tar.gz | |
lib/oe/package_manager/sdk: Ensure do_populate_sdk_ext and do_populate_sdk repos don't conflict
The repository indexes updated during do_populate_sdk_ext and do_populate_sdk
can conflcit. Add the missing lockfile calls for deb/ipk and in the rpm case,
ensure different directories are used for the index for the two sdk cases.
(From OE-Core rev: 5e5569c962c9ebc898eeb5044214e95117b190e1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs_deb.bbclass')
| -rw-r--r-- | meta/classes/rootfs_deb.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 12002c49f3..9ee1dfc866 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
| @@ -11,6 +11,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS" | |||
| 11 | 11 | ||
| 12 | do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | 12 | do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" |
| 13 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | 13 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" |
| 14 | do_populate_sdk_ext[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | ||
| 14 | 15 | ||
| 15 | python rootfs_deb_bad_recommendations() { | 16 | python rootfs_deb_bad_recommendations() { |
| 16 | if d.getVar("BAD_RECOMMENDATIONS"): | 17 | if d.getVar("BAD_RECOMMENDATIONS"): |