summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-21 23:17:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-22 10:39:10 +0000
commit902b77bf91d96517b935bce00a11003604dc3d54 (patch)
treeae6155b48ba64d4a0f5acae99130963648d980c7 /meta/classes
parent3ef5e034c654996c6f8fb90f116bb91877c2758a (diff)
downloadpoky-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')
-rw-r--r--meta/classes/rootfs_deb.bbclass1
-rw-r--r--meta/classes/rootfs_ipk.bbclass1
2 files changed, 2 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
12do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 12do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
13do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 13do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
14do_populate_sdk_ext[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
14 15
15python rootfs_deb_bad_recommendations() { 16python rootfs_deb_bad_recommendations() {
16 if d.getVar("BAD_RECOMMENDATIONS"): 17 if d.getVar("BAD_RECOMMENDATIONS"):
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index a57b1d34f7..52b468d85b 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -15,6 +15,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
15 15
16do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" 16do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
17do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" 17do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
18do_populate_sdk_ext[lockfiles] += "${WORKDIR}/ipk.lock"
18 19
19OPKG_PREPROCESS_COMMANDS = "" 20OPKG_PREPROCESS_COMMANDS = ""
20 21