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:04 +0000 |
| commit | 5e5569c962c9ebc898eeb5044214e95117b190e1 (patch) | |
| tree | 3482238b15d6df5863725cabe369017a7dec875c /meta/lib/oe/package_manager.py | |
| parent | 0b7a1a52e4640bb1f8a6fbe00db175df1356ebe1 (diff) | |
| download | openembedded-core-5e5569c962c9ebc898eeb5044214e95117b190e1.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 0f85f3fb7c..2a07f0e39a 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -461,7 +461,8 @@ class RpmPM(PackageManager): target_vendor, task_name='target', arch_var=None, - os_var=None): + os_var=None, + rpm_repo_workdir="oe-rootfs-repo"): super(RpmPM, self).__init__(d) self.target_rootfs = target_rootfs self.target_vendor = target_vendor @@ -475,7 +476,7 @@ class RpmPM(PackageManager): else: 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) oe.path.symlink(self.d.getVar('DEPLOY_DIR_RPM'), oe.path.join(self.rpm_repo_dir, "rpm"), True) |