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:40:15 +0000 |
commit | 4b3ceb3bbaff12cdf7a2d915afbb9e55a747d683 (patch) | |
tree | 656c025ec56457197c19bf60b766dbb4032f1274 /meta/lib/oe | |
parent | ad24cc9ba5c79ae0a860fd3b87205f4c0953d5f3 (diff) | |
download | poky-4b3ceb3bbaff12cdf7a2d915afbb9e55a747d683.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: c7610e993ae69a3163f76a26b6b4cb091cdd6458)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/package_manager.py | 5 | ||||
-rw-r--r-- | meta/lib/oe/sdk.py | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index ef69b18b64..0c5d907ff1 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -462,7 +462,8 @@ class RpmPM(PackageManager): | |||
462 | task_name='target', | 462 | task_name='target', |
463 | providename=None, | 463 | providename=None, |
464 | arch_var=None, | 464 | arch_var=None, |
465 | os_var=None): | 465 | os_var=None, |
466 | rpm_repo_workdir="oe-rootfs-repo"): | ||
466 | super(RpmPM, self).__init__(d) | 467 | super(RpmPM, self).__init__(d) |
467 | self.target_rootfs = target_rootfs | 468 | self.target_rootfs = target_rootfs |
468 | self.target_vendor = target_vendor | 469 | self.target_vendor = target_vendor |
@@ -476,7 +477,7 @@ class RpmPM(PackageManager): | |||
476 | else: | 477 | else: |
477 | self.primary_arch = self.d.getVar('MACHINE_ARCH') | 478 | self.primary_arch = self.d.getVar('MACHINE_ARCH') |
478 | 479 | ||
479 | self.rpm_repo_dir = oe.path.join(self.d.getVar('WORKDIR'), "oe-rootfs-repo") | 480 | self.rpm_repo_dir = oe.path.join(self.d.getVar('WORKDIR'), rpm_repo_workdir) |
480 | bb.utils.mkdirhier(self.rpm_repo_dir) | 481 | bb.utils.mkdirhier(self.rpm_repo_dir) |
481 | oe.path.symlink(self.d.getVar('DEPLOY_DIR_RPM'), oe.path.join(self.rpm_repo_dir, "rpm"), True) | 482 | oe.path.symlink(self.d.getVar('DEPLOY_DIR_RPM'), oe.path.join(self.rpm_repo_dir, "rpm"), True) |
482 | 483 | ||
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 30e1fb5316..a3a6c39172 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 | ||
87 | class RpmSdk(Sdk): | 87 | class 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): |