summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-21 23:17:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:13:47 (GMT)
commit0200ab2a22c9d068e307d6e088264b88b662c1ab (patch)
tree201193b66eff0ec27337a1d4b93b018d30a2ec1e
parent55049700e498e5300fcafc2d2ed4f70920ebfb1b (diff)
downloadpoky-0200ab2a22c9d068e307d6e088264b88b662c1ab.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) (From OE-Core rev: 94e21cf21f8d8adad352ef2f94d4f75e36cd843a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Fixup do to merge conflicts] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py3
-rw-r--r--meta/lib/oe/sdk.py13
2 files changed, 12 insertions, 4 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index ede11b2..78d2421 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -656,7 +656,8 @@ class RpmPM(PackageManager):
656 task_name='target', 656 task_name='target',
657 providename=None, 657 providename=None,
658 arch_var=None, 658 arch_var=None,
659 os_var=None): 659 os_var=None,
660 rpm_repo_workdir="oe-rootfs-repo"):
660 super(RpmPM, self).__init__(d) 661 super(RpmPM, self).__init__(d)
661 self.target_rootfs = target_rootfs 662 self.target_rootfs = target_rootfs
662 self.target_vendor = target_vendor 663 self.target_vendor = target_vendor
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
index c74525f..af6ddc7 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", True):
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', True), 110 self.d.getVar('TARGET_VENDOR', True),
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):