mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
ipk: Move sdk to its own dir
This is a part of a refactor that will split the package manager code so that it's possible to use other package managers in other layers. (From OE-Core rev: 3f9cec50065eec5a02ffcc8ccc2986f2027b44b5) Signed-off-by: Fredrik Gustafsson <fredrigu@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fredrik Gustafsson
committed by
Richard Purdie
Richard Purdie
parent
e9e2e32999
commit
bfa8f4c098
@@ -0,0 +1,96 @@
|
|||||||
|
#
|
||||||
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
#
|
||||||
|
|
||||||
|
from oe.utils import execute_pre_post_process
|
||||||
|
from oe.sdk import Sdk
|
||||||
|
from oe.manifest import Manifest
|
||||||
|
from oe.package_manager import OpkgPM
|
||||||
|
import shutil
|
||||||
|
import glob
|
||||||
|
|
||||||
|
class OpkgSdk(Sdk):
|
||||||
|
def __init__(self, d, manifest_dir=None):
|
||||||
|
super(OpkgSdk, self).__init__(d, manifest_dir)
|
||||||
|
|
||||||
|
self.target_conf = self.d.getVar("IPKGCONF_TARGET")
|
||||||
|
self.host_conf = self.d.getVar("IPKGCONF_SDK")
|
||||||
|
|
||||||
|
from oe.package_manager.ipk.manifest import OpkgManifest
|
||||||
|
self.target_manifest = OpkgManifest(d, self.manifest_dir,
|
||||||
|
Manifest.MANIFEST_TYPE_SDK_TARGET)
|
||||||
|
self.host_manifest = OpkgManifest(d, self.manifest_dir,
|
||||||
|
Manifest.MANIFEST_TYPE_SDK_HOST)
|
||||||
|
|
||||||
|
ipk_repo_workdir = "oe-sdk-repo"
|
||||||
|
if "sdk_ext" in d.getVar("BB_RUNTASK"):
|
||||||
|
ipk_repo_workdir = "oe-sdk-ext-repo"
|
||||||
|
|
||||||
|
self.target_pm = OpkgPM(d, self.sdk_target_sysroot, self.target_conf,
|
||||||
|
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.d.getVar("SDK_PACKAGE_ARCHS"),
|
||||||
|
ipk_repo_workdir=ipk_repo_workdir)
|
||||||
|
|
||||||
|
def _populate_sysroot(self, pm, manifest):
|
||||||
|
pkgs_to_install = manifest.parse_initial_manifest()
|
||||||
|
|
||||||
|
if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS') or "") != "1":
|
||||||
|
pm.write_index()
|
||||||
|
|
||||||
|
pm.update()
|
||||||
|
|
||||||
|
for pkg_type in self.install_order:
|
||||||
|
if pkg_type in pkgs_to_install:
|
||||||
|
pm.install(pkgs_to_install[pkg_type],
|
||||||
|
[False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])
|
||||||
|
|
||||||
|
def _populate(self):
|
||||||
|
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND"))
|
||||||
|
|
||||||
|
bb.note("Installing TARGET packages")
|
||||||
|
self._populate_sysroot(self.target_pm, self.target_manifest)
|
||||||
|
|
||||||
|
self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY'))
|
||||||
|
|
||||||
|
self.target_pm.run_intercepts(populate_sdk='target')
|
||||||
|
|
||||||
|
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND"))
|
||||||
|
|
||||||
|
if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d):
|
||||||
|
self.target_pm.remove_packaging_data()
|
||||||
|
|
||||||
|
bb.note("Installing NATIVESDK packages")
|
||||||
|
self._populate_sysroot(self.host_pm, self.host_manifest)
|
||||||
|
self.install_locales(self.host_pm)
|
||||||
|
|
||||||
|
self.host_pm.run_intercepts(populate_sdk='host')
|
||||||
|
|
||||||
|
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND"))
|
||||||
|
|
||||||
|
if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d):
|
||||||
|
self.host_pm.remove_packaging_data()
|
||||||
|
|
||||||
|
target_sysconfdir = os.path.join(self.sdk_target_sysroot, self.sysconfdir)
|
||||||
|
host_sysconfdir = os.path.join(self.sdk_host_sysroot, self.sysconfdir)
|
||||||
|
|
||||||
|
self.mkdirhier(target_sysconfdir)
|
||||||
|
shutil.copy(self.target_conf, target_sysconfdir)
|
||||||
|
os.chmod(os.path.join(target_sysconfdir,
|
||||||
|
os.path.basename(self.target_conf)), 0o644)
|
||||||
|
|
||||||
|
self.mkdirhier(host_sysconfdir)
|
||||||
|
shutil.copy(self.host_conf, host_sysconfdir)
|
||||||
|
os.chmod(os.path.join(host_sysconfdir,
|
||||||
|
os.path.basename(self.host_conf)), 0o644)
|
||||||
|
|
||||||
|
native_opkg_state_dir = os.path.join(self.sdk_output, self.sdk_native_path,
|
||||||
|
self.d.getVar('localstatedir_nativesdk').strip('/'),
|
||||||
|
"lib", "opkg")
|
||||||
|
self.mkdirhier(native_opkg_state_dir)
|
||||||
|
for f in glob.glob(os.path.join(self.sdk_output, "var", "lib", "opkg", "*")):
|
||||||
|
self.movefile(f, native_opkg_state_dir)
|
||||||
|
|
||||||
|
self.remove(os.path.join(self.sdk_output, "var"), True)
|
||||||
+1
-86
@@ -110,92 +110,6 @@ class Sdk(object, metaclass=ABCMeta):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class OpkgSdk(Sdk):
|
|
||||||
def __init__(self, d, manifest_dir=None):
|
|
||||||
super(OpkgSdk, self).__init__(d, manifest_dir)
|
|
||||||
|
|
||||||
self.target_conf = self.d.getVar("IPKGCONF_TARGET")
|
|
||||||
self.host_conf = self.d.getVar("IPKGCONF_SDK")
|
|
||||||
|
|
||||||
self.target_manifest = OpkgManifest(d, self.manifest_dir,
|
|
||||||
Manifest.MANIFEST_TYPE_SDK_TARGET)
|
|
||||||
self.host_manifest = OpkgManifest(d, self.manifest_dir,
|
|
||||||
Manifest.MANIFEST_TYPE_SDK_HOST)
|
|
||||||
|
|
||||||
ipk_repo_workdir = "oe-sdk-repo"
|
|
||||||
if "sdk_ext" in d.getVar("BB_RUNTASK"):
|
|
||||||
ipk_repo_workdir = "oe-sdk-ext-repo"
|
|
||||||
|
|
||||||
self.target_pm = OpkgPM(d, self.sdk_target_sysroot, self.target_conf,
|
|
||||||
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.d.getVar("SDK_PACKAGE_ARCHS"),
|
|
||||||
ipk_repo_workdir=ipk_repo_workdir)
|
|
||||||
|
|
||||||
def _populate_sysroot(self, pm, manifest):
|
|
||||||
pkgs_to_install = manifest.parse_initial_manifest()
|
|
||||||
|
|
||||||
if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS') or "") != "1":
|
|
||||||
pm.write_index()
|
|
||||||
|
|
||||||
pm.update()
|
|
||||||
|
|
||||||
for pkg_type in self.install_order:
|
|
||||||
if pkg_type in pkgs_to_install:
|
|
||||||
pm.install(pkgs_to_install[pkg_type],
|
|
||||||
[False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])
|
|
||||||
|
|
||||||
def _populate(self):
|
|
||||||
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND"))
|
|
||||||
|
|
||||||
bb.note("Installing TARGET packages")
|
|
||||||
self._populate_sysroot(self.target_pm, self.target_manifest)
|
|
||||||
|
|
||||||
self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY'))
|
|
||||||
|
|
||||||
self.target_pm.run_intercepts(populate_sdk='target')
|
|
||||||
|
|
||||||
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND"))
|
|
||||||
|
|
||||||
if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d):
|
|
||||||
self.target_pm.remove_packaging_data()
|
|
||||||
|
|
||||||
bb.note("Installing NATIVESDK packages")
|
|
||||||
self._populate_sysroot(self.host_pm, self.host_manifest)
|
|
||||||
self.install_locales(self.host_pm)
|
|
||||||
|
|
||||||
self.host_pm.run_intercepts(populate_sdk='host')
|
|
||||||
|
|
||||||
execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND"))
|
|
||||||
|
|
||||||
if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d):
|
|
||||||
self.host_pm.remove_packaging_data()
|
|
||||||
|
|
||||||
target_sysconfdir = os.path.join(self.sdk_target_sysroot, self.sysconfdir)
|
|
||||||
host_sysconfdir = os.path.join(self.sdk_host_sysroot, self.sysconfdir)
|
|
||||||
|
|
||||||
self.mkdirhier(target_sysconfdir)
|
|
||||||
shutil.copy(self.target_conf, target_sysconfdir)
|
|
||||||
os.chmod(os.path.join(target_sysconfdir,
|
|
||||||
os.path.basename(self.target_conf)), 0o644)
|
|
||||||
|
|
||||||
self.mkdirhier(host_sysconfdir)
|
|
||||||
shutil.copy(self.host_conf, host_sysconfdir)
|
|
||||||
os.chmod(os.path.join(host_sysconfdir,
|
|
||||||
os.path.basename(self.host_conf)), 0o644)
|
|
||||||
|
|
||||||
native_opkg_state_dir = os.path.join(self.sdk_output, self.sdk_native_path,
|
|
||||||
self.d.getVar('localstatedir_nativesdk').strip('/'),
|
|
||||||
"lib", "opkg")
|
|
||||||
self.mkdirhier(native_opkg_state_dir)
|
|
||||||
for f in glob.glob(os.path.join(self.sdk_output, "var", "lib", "opkg", "*")):
|
|
||||||
self.movefile(f, native_opkg_state_dir)
|
|
||||||
|
|
||||||
self.remove(os.path.join(self.sdk_output, "var"), True)
|
|
||||||
|
|
||||||
|
|
||||||
class DpkgSdk(Sdk):
|
class DpkgSdk(Sdk):
|
||||||
def __init__(self, d, manifest_dir=None):
|
def __init__(self, d, manifest_dir=None):
|
||||||
super(DpkgSdk, self).__init__(d, manifest_dir)
|
super(DpkgSdk, self).__init__(d, manifest_dir)
|
||||||
@@ -305,6 +219,7 @@ def populate_sdk(d, manifest_dir=None):
|
|||||||
|
|
||||||
img_type = d.getVar('IMAGE_PKGTYPE')
|
img_type = d.getVar('IMAGE_PKGTYPE')
|
||||||
from oe.package_manager.rpm.sdk import RpmSdk
|
from oe.package_manager.rpm.sdk import RpmSdk
|
||||||
|
from oe.package_manager.ipk.sdk import OpkgSdk
|
||||||
if img_type == "rpm":
|
if img_type == "rpm":
|
||||||
RpmSdk(d, manifest_dir).populate()
|
RpmSdk(d, manifest_dir).populate()
|
||||||
elif img_type == "ipk":
|
elif img_type == "ipk":
|
||||||
|
|||||||
Reference in New Issue
Block a user