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-10 22:14:52 +0000 |
| commit | 9d490dc01dcedb216129b22cbe17a6c99efc4f5c (patch) | |
| tree | 88826cf0a465900d63419d7ee8de6bccf08ac28f /meta/lib | |
| parent | fc08972688d784f561c8be88d3100d6baaf22070 (diff) | |
| download | openembedded-core-contrib-9d490dc01dcedb216129b22cbe17a6c99efc4f5c.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 1 | ||||
| -rw-r--r-- | meta/lib/oe/sdk.py | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index ea99165d61..0f85f3fb7c 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -460,7 +460,6 @@ class RpmPM(PackageManager): target_rootfs, target_vendor, task_name='target', - providename=None, arch_var=None, os_var=None): super(RpmPM, self).__init__(d) 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): self.host_manifest = RpmManifest(d, self.manifest_dir, Manifest.MANIFEST_TYPE_SDK_HOST) - target_providename = ['/bin/sh', - '/bin/bash', - '/usr/bin/env', - '/usr/bin/perl', - 'pkgconfig' - ] - self.target_pm = RpmPM(d, self.sdk_target_sysroot, self.d.getVar('TARGET_VENDOR'), 'target', - target_providename ) - sdk_providename = ['/bin/sh', - '/bin/bash', - '/usr/bin/env', - '/usr/bin/perl', - 'pkgconfig', - 'libGL.so()(64bit)', - 'libGL.so' - ] - self.host_pm = RpmPM(d, self.sdk_host_sysroot, self.d.getVar('SDK_VENDOR'), 'host', - sdk_providename, "SDK_PACKAGE_ARCHS", "SDK_OS" ) |