mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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>
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user