summaryrefslogtreecommitdiffstats
path: root/meta/lib
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
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')
-rw-r--r--meta/lib/oe/package_manager.py5
-rw-r--r--meta/lib/oe/sdk.py13
2 files changed, 13 insertions, 5 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
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
index deb823b6ec..9fe1687ac3 100644
--- a/meta/lib/oe/sdk.py
+++ b/meta/lib/oe/sdk.py
@@ -85,7 +85,7 @@ class Sdk(object, metaclass=ABCMeta):
85 bb.warn("cannot remove SDK dir: %s" % path) 85 bb.warn("cannot remove SDK dir: %s" % path)
86 86
87class RpmSdk(Sdk): 87class RpmSdk(Sdk):
88 def __init__(self, d, manifest_dir=None): 88 def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"):
89 super(RpmSdk, self).__init__(d, manifest_dir) 89 super(RpmSdk, self).__init__(d, manifest_dir)
90 90
91 self.target_manifest = RpmManifest(d, self.manifest_dir, 91 self.target_manifest = RpmManifest(d, self.manifest_dir,
@@ -100,11 +100,17 @@ class RpmSdk(Sdk):
100 'pkgconfig' 100 'pkgconfig'
101 ] 101 ]
102 102
103 rpm_repo_workdir = "oe-sdk-repo"
104 if "sdk_ext" in d.getVar("BB_RUNTASK"):
105 rpm_repo_workdir = "oe-sdk-ext-repo"
106
107
103 self.target_pm = RpmPM(d, 108 self.target_pm = RpmPM(d,
104 self.sdk_target_sysroot, 109 self.sdk_target_sysroot,
105 self.d.getVar('TARGET_VENDOR'), 110 self.d.getVar('TARGET_VENDOR'),
106 'target', 111 'target',
107 target_providename 112 target_providename,
113 rpm_repo_workdir=rpm_repo_workdir
108 ) 114 )
109 115
110 sdk_providename = ['/bin/sh', 116 sdk_providename = ['/bin/sh',
@@ -122,7 +128,8 @@ class RpmSdk(Sdk):
122 'host', 128 'host',
123 sdk_providename, 129 sdk_providename,
124 "SDK_PACKAGE_ARCHS", 130 "SDK_PACKAGE_ARCHS",
125 "SDK_OS" 131 "SDK_OS",
132 rpm_repo_workdir=rpm_repo_workdir
126 ) 133 )
127 134
128 def _populate_sysroot(self, pm, manifest): 135 def _populate_sysroot(self, pm, manifest):