From: Rouven Czerwinski <[email protected]> The instance variable sdk_host_sysroot was always set to sdk_output, remove it and use sdk_output in its place.
No functional changes. Signed-off-by: Rouven Czerwinski <[email protected]> --- meta/lib/oe/package_manager/deb/sdk.py | 2 +- meta/lib/oe/package_manager/ipk/sdk.py | 4 ++-- meta/lib/oe/package_manager/rpm/sdk.py | 2 +- meta/lib/oe/sdk.py | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/package_manager/deb/sdk.py b/meta/lib/oe/package_manager/deb/sdk.py index 1169744674..690b10d2ba 100644 --- a/meta/lib/oe/package_manager/deb/sdk.py +++ b/meta/lib/oe/package_manager/deb/sdk.py @@ -35,7 +35,7 @@ class PkgSdk(Sdk): self.target_conf_dir, deb_repo_workdir=deb_repo_workdir) - self.host_pm = DpkgPM(d, self.sdk_host_sysroot, + self.host_pm = DpkgPM(d, self.sdk_output, self.d.getVar("SDK_PACKAGE_ARCHS"), self.d.getVar("DEB_SDK_ARCH"), self.host_conf_dir, diff --git a/meta/lib/oe/package_manager/ipk/sdk.py b/meta/lib/oe/package_manager/ipk/sdk.py index c39a32fa24..8dc01661ef 100644 --- a/meta/lib/oe/package_manager/ipk/sdk.py +++ b/meta/lib/oe/package_manager/ipk/sdk.py @@ -38,7 +38,7 @@ class PkgSdk(Sdk): self.d.getVar("ALL_MULTILIB_PACKAGE_ARCHS"), ipk_repo_workdir=ipk_repo_workdir) - self.host_pm = OpkgPM(d, self.sdk_host_sysroot, self.host_conf, + self.host_pm = OpkgPM(d, self.sdk_output, self.host_conf, self.d.getVar("SDK_PACKAGE_ARCHS"), ipk_repo_workdir=ipk_repo_workdir) @@ -91,7 +91,7 @@ class PkgSdk(Sdk): self.host_pm.remove_lists() target_sysconfdir = os.path.join(self.sdk_target_sysroot, self.sysconfdir) - host_sysconfdir = os.path.join(self.sdk_host_sysroot, self.sysconfdir) + host_sysconfdir = os.path.join(self.sdk_output, self.sysconfdir) self.mkdirhier(target_sysconfdir) shutil.copy(self.target_conf, target_sysconfdir) diff --git a/meta/lib/oe/package_manager/rpm/sdk.py b/meta/lib/oe/package_manager/rpm/sdk.py index ea79fe050b..7f586955fc 100644 --- a/meta/lib/oe/package_manager/rpm/sdk.py +++ b/meta/lib/oe/package_manager/rpm/sdk.py @@ -32,7 +32,7 @@ class PkgSdk(Sdk): ) self.host_pm = RpmPM(d, - self.sdk_host_sysroot, + self.sdk_output, self.d.getVar('SDK_VENDOR'), 'host', "SDK_PACKAGE_ARCHS", diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index c2c5431c0d..ff535b5489 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -20,7 +20,6 @@ class Sdk(object, metaclass=ABCMeta): self.sysconfdir = self.d.getVar('sysconfdir').strip('/') self.sdk_target_sysroot = os.path.join(self.sdk_output, self.target_path) - self.sdk_host_sysroot = self.sdk_output if manifest_dir is None: self.manifest_dir = self.d.getVar("SDK_DIR") @@ -97,7 +96,7 @@ class Sdk(object, metaclass=ABCMeta): lang for lang in linguas.split()]) # Generate a locale archive of them target_arch = self.d.getVar('SDK_ARCH') - rootfs = oe.path.join(self.sdk_host_sysroot, self.sdk_native_path) + rootfs = oe.path.join(self.sdk_output, self.sdk_native_path) localedir = oe.path.join(rootfs, self.d.getVar("libdir_nativesdk"), "locale") generate_locale_archive(self.d, rootfs, target_arch, localedir) # And now delete the binary locales -- 2.52.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#237822): https://lists.openembedded.org/g/openembedded-core/message/237822 Mute This Topic: https://lists.openembedded.org/mt/119586919/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
