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:40:08 +0000 |
commit | 75883f84c89432e899f6194191438b6e54c01c23 (patch) | |
tree | 154510ce3fdd0a896bb6fbd1a332558889c60935 /meta/classes | |
parent | fcdaf96f93d202fba89a83c51bc0e301e28d32e8 (diff) | |
download | poky-75883f84c89432e899f6194191438b6e54c01c23.tar.gz |
lib/oe/package_manager/sdk: Ensure do_populate_sdk_ext and do_populate_sdk repos don't conflict
(From OE-Core rev: c9c0927bb6e71253cbdd5b6b780dca829526e1d8)
(From OE-Core rev: a18942b0b3b848ccfa4bc50c56a565c279da9d74)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 10af4b5ff0..262e3d555b 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"): |
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 | ||
16 | do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" | 16 | do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" |
17 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" | 17 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" |
18 | do_populate_sdk_ext[lockfiles] += "${WORKDIR}/ipk.lock" | ||
18 | 19 | ||
19 | OPKG_PREPROCESS_COMMANDS = "" | 20 | OPKG_PREPROCESS_COMMANDS = "" |
20 | 21 | ||