summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/package_manager.py
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:40:08 +0000
commit75883f84c89432e899f6194191438b6e54c01c23 (patch)
tree154510ce3fdd0a896bb6fbd1a332558889c60935 /meta/lib/oe/package_manager.py
parentfcdaf96f93d202fba89a83c51bc0e301e28d32e8 (diff)
downloadpoky-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/lib/oe/package_manager.py')
-rw-r--r--meta/lib/oe/package_manager.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 518cf8dbe3..3a2daadafa 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -461,7 +461,8 @@ class RpmPM(PackageManager):
461 task_name='target', 461 task_name='target',
462 providename=None, 462 providename=None,
463 arch_var=None, 463 arch_var=None,
464 os_var=None): 464 os_var=None,
465 rpm_repo_workdir="oe-rootfs-repo"):
465 super(RpmPM, self).__init__(d) 466 super(RpmPM, self).__init__(d)
466 self.target_rootfs = target_rootfs 467 self.target_rootfs = target_rootfs
467 self.target_vendor = target_vendor 468 self.target_vendor = target_vendor
@@ -475,7 +476,7 @@ class RpmPM(PackageManager):
475 else: 476 else:
476 self.primary_arch = self.d.getVar('MACHINE_ARCH') 477 self.primary_arch = self.d.getVar('MACHINE_ARCH')
477 478
478 self.rpm_repo_dir = oe.path.join(self.d.getVar('WORKDIR'), "oe-rootfs-repo") 479 self.rpm_repo_dir = oe.path.join(self.d.getVar('WORKDIR'), rpm_repo_workdir)
479 bb.utils.mkdirhier(self.rpm_repo_dir) 480 bb.utils.mkdirhier(self.rpm_repo_dir)
480 oe.path.symlink(self.d.getVar('DEPLOY_DIR_RPM'), oe.path.join(self.rpm_repo_dir, "rpm"), True) 481 oe.path.symlink(self.d.getVar('DEPLOY_DIR_RPM'), oe.path.join(self.rpm_repo_dir, "rpm"), True)
481 482