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>
This commit is contained in:
parent
fcdaf96f93
commit
75883f84c8
|
@ -11,6 +11,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"):
|
if d.getVar("BAD_RECOMMENDATIONS"):
|
||||||
|
|
|
@ -15,6 +15,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 = ""
|
||||||
|
|
||||||
|
|
|
@ -461,7 +461,8 @@ class RpmPM(PackageManager):
|
||||||
task_name='target',
|
task_name='target',
|
||||||
providename=None,
|
providename=None,
|
||||||
arch_var=None,
|
arch_var=None,
|
||||||
os_var=None):
|
os_var=None,
|
||||||
|
rpm_repo_workdir="oe-rootfs-repo"):
|
||||||
super(RpmPM, self).__init__(d)
|
super(RpmPM, self).__init__(d)
|
||||||
self.target_rootfs = target_rootfs
|
self.target_rootfs = target_rootfs
|
||||||
self.target_vendor = target_vendor
|
self.target_vendor = target_vendor
|
||||||
|
@ -475,7 +476,7 @@ class RpmPM(PackageManager):
|
||||||
else:
|
else:
|
||||||
self.primary_arch = self.d.getVar('MACHINE_ARCH')
|
self.primary_arch = self.d.getVar('MACHINE_ARCH')
|
||||||
|
|
||||||
self.rpm_repo_dir = oe.path.join(self.d.getVar('WORKDIR'), "oe-rootfs-repo")
|
self.rpm_repo_dir = oe.path.join(self.d.getVar('WORKDIR'), rpm_repo_workdir)
|
||||||
bb.utils.mkdirhier(self.rpm_repo_dir)
|
bb.utils.mkdirhier(self.rpm_repo_dir)
|
||||||
oe.path.symlink(self.d.getVar('DEPLOY_DIR_RPM'), oe.path.join(self.rpm_repo_dir, "rpm"), True)
|
oe.path.symlink(self.d.getVar('DEPLOY_DIR_RPM'), oe.path.join(self.rpm_repo_dir, "rpm"), True)
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ class Sdk(object, metaclass=ABCMeta):
|
||||||
bb.warn("cannot remove SDK dir: %s" % path)
|
bb.warn("cannot remove SDK dir: %s" % path)
|
||||||
|
|
||||||
class RpmSdk(Sdk):
|
class RpmSdk(Sdk):
|
||||||
def __init__(self, d, manifest_dir=None):
|
def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"):
|
||||||
super(RpmSdk, self).__init__(d, manifest_dir)
|
super(RpmSdk, self).__init__(d, manifest_dir)
|
||||||
|
|
||||||
self.target_manifest = RpmManifest(d, self.manifest_dir,
|
self.target_manifest = RpmManifest(d, self.manifest_dir,
|
||||||
|
@ -100,11 +100,17 @@ class RpmSdk(Sdk):
|
||||||
'pkgconfig'
|
'pkgconfig'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
rpm_repo_workdir = "oe-sdk-repo"
|
||||||
|
if "sdk_ext" in d.getVar("BB_RUNTASK"):
|
||||||
|
rpm_repo_workdir = "oe-sdk-ext-repo"
|
||||||
|
|
||||||
|
|
||||||
self.target_pm = RpmPM(d,
|
self.target_pm = RpmPM(d,
|
||||||
self.sdk_target_sysroot,
|
self.sdk_target_sysroot,
|
||||||
self.d.getVar('TARGET_VENDOR'),
|
self.d.getVar('TARGET_VENDOR'),
|
||||||
'target',
|
'target',
|
||||||
target_providename
|
target_providename,
|
||||||
|
rpm_repo_workdir=rpm_repo_workdir
|
||||||
)
|
)
|
||||||
|
|
||||||
sdk_providename = ['/bin/sh',
|
sdk_providename = ['/bin/sh',
|
||||||
|
@ -122,7 +128,8 @@ class RpmSdk(Sdk):
|
||||||
'host',
|
'host',
|
||||||
sdk_providename,
|
sdk_providename,
|
||||||
"SDK_PACKAGE_ARCHS",
|
"SDK_PACKAGE_ARCHS",
|
||||||
"SDK_OS"
|
"SDK_OS",
|
||||||
|
rpm_repo_workdir=rpm_repo_workdir
|
||||||
)
|
)
|
||||||
|
|
||||||
def _populate_sysroot(self, pm, manifest):
|
def _populate_sysroot(self, pm, manifest):
|
||||||
|
|
Loading…
Reference in New Issue