mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
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: 04610f713e47cd5fc9e44e258589cb24f27bf1bc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -12,6 +12,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
|
|||||||
|
|
||||||
do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
|
do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
|
||||||
do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
|
do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
|
||||||
|
do_populate_sdk_ext[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
|
||||||
|
|
||||||
python rootfs_deb_bad_recommendations() {
|
python rootfs_deb_bad_recommendations() {
|
||||||
if d.getVar("BAD_RECOMMENDATIONS", True):
|
if d.getVar("BAD_RECOMMENDATIONS", True):
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
|
|||||||
|
|
||||||
do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
|
do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
|
||||||
do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
|
do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
|
||||||
|
do_populate_sdk_ext[lockfiles] += "${WORKDIR}/ipk.lock"
|
||||||
|
|
||||||
OPKG_PREPROCESS_COMMANDS = ""
|
OPKG_PREPROCESS_COMMANDS = ""
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,10 @@ do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
|
|||||||
do_rootfs[recrdeptask] += "do_package_write_rpm"
|
do_rootfs[recrdeptask] += "do_package_write_rpm"
|
||||||
do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
|
do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
|
||||||
|
|
||||||
|
do_rootfs[lockfiles] += "${WORKDIR}/rpm.lock"
|
||||||
|
do_populate_sdk[lockfiles] += "${WORKDIR}/rpm.lock"
|
||||||
|
do_populate_sdk_ext[lockfiles] += "${WORKDIR}/rpm.lock"
|
||||||
|
|
||||||
python () {
|
python () {
|
||||||
if d.getVar('BUILD_IMAGES_FROM_FEEDS', True):
|
if d.getVar('BUILD_IMAGES_FROM_FEEDS', True):
|
||||||
flags = d.getVarFlag('do_rootfs', 'recrdeptask', True)
|
flags = d.getVarFlag('do_rootfs', 'recrdeptask', True)
|
||||||
|
|||||||
Reference in New Issue
Block a user