diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-09 11:20:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-11 10:26:06 +0000 |
| commit | 0d0984e1e616c9f1c211b7b980ba2ca54c096e6e (patch) | |
| tree | 1dcc5055444c172a1f432c7e032f41027230ee8f /meta/lib/oe/sdk.py | |
| parent | 1117f74385fe60d7eaeaef13ce5927e4798d6992 (diff) | |
| download | poky-0d0984e1e616c9f1c211b7b980ba2ca54c096e6e.tar.gz | |
nativesdk/sdk: Update sdk dummy providers
When we migrated rpm v5 -> v4, we lost the ability to drop "per file"
dependencies from the rpm backend for things like "/bin/bash" and
"/usr/bin/env" which meant the sdks were becomming 'bloated'.
This restores the functionality using a dummy package, similarly to
the way the buildtools perl issue was addressed. It also removes
the non-functional old code so as not to confuse people in future.
I ran into this problem trying to filter dependencies to only rpms
a build directly depends upon and it turns out we have some determinism issues
in this area so this is something key to fix.
(From OE-Core rev: 9d490dc01dcedb216129b22cbe17a6c99efc4f5c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/sdk.py')
| -rw-r--r-- | meta/lib/oe/sdk.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 30e1fb5316..dd02b8c12b 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
| @@ -93,34 +93,16 @@ class RpmSdk(Sdk): | |||
| 93 | self.host_manifest = RpmManifest(d, self.manifest_dir, | 93 | self.host_manifest = RpmManifest(d, self.manifest_dir, |
| 94 | Manifest.MANIFEST_TYPE_SDK_HOST) | 94 | Manifest.MANIFEST_TYPE_SDK_HOST) |
| 95 | 95 | ||
| 96 | target_providename = ['/bin/sh', | ||
| 97 | '/bin/bash', | ||
| 98 | '/usr/bin/env', | ||
| 99 | '/usr/bin/perl', | ||
| 100 | 'pkgconfig' | ||
| 101 | ] | ||
| 102 | |||
| 103 | self.target_pm = RpmPM(d, | 96 | self.target_pm = RpmPM(d, |
| 104 | self.sdk_target_sysroot, | 97 | self.sdk_target_sysroot, |
| 105 | self.d.getVar('TARGET_VENDOR'), | 98 | self.d.getVar('TARGET_VENDOR'), |
| 106 | 'target', | 99 | 'target', |
| 107 | target_providename | ||
| 108 | ) | 100 | ) |
| 109 | 101 | ||
| 110 | sdk_providename = ['/bin/sh', | ||
| 111 | '/bin/bash', | ||
| 112 | '/usr/bin/env', | ||
| 113 | '/usr/bin/perl', | ||
| 114 | 'pkgconfig', | ||
| 115 | 'libGL.so()(64bit)', | ||
| 116 | 'libGL.so' | ||
| 117 | ] | ||
| 118 | |||
| 119 | self.host_pm = RpmPM(d, | 102 | self.host_pm = RpmPM(d, |
| 120 | self.sdk_host_sysroot, | 103 | self.sdk_host_sysroot, |
| 121 | self.d.getVar('SDK_VENDOR'), | 104 | self.d.getVar('SDK_VENDOR'), |
| 122 | 'host', | 105 | 'host', |
| 123 | sdk_providename, | ||
| 124 | "SDK_PACKAGE_ARCHS", | 106 | "SDK_PACKAGE_ARCHS", |
| 125 | "SDK_OS" | 107 | "SDK_OS" |
| 126 | ) | 108 | ) |
