diff options
author | Fredrik Gustafsson <fredrik.gustafsson@axis.com> | 2020-07-24 16:42:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-27 19:58:10 +0100 |
commit | e9e2e329991a68832eff2b469101894aea1a9a9c (patch) | |
tree | c432e31972740e76708e7933092e92eec7dee918 /meta/lib/oe/sdk.py | |
parent | 6fd8b177480719f6dec6bdde15d01d19dbfb00c7 (diff) | |
download | poky-e9e2e329991a68832eff2b469101894aea1a9a9c.tar.gz |
rpm: Move sdk to its own dir
This is 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: 75066e78d92a23516fd9c6d538c4f991d1504839)
Signed-off-by: Fredrik Gustafsson <fredrigu@axis.com>
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 | 106 |
1 files changed, 1 insertions, 105 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index d02a274812..b675b6549c 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
@@ -110,111 +110,6 @@ class Sdk(object, metaclass=ABCMeta): | |||
110 | pass | 110 | pass |
111 | 111 | ||
112 | 112 | ||
113 | class RpmSdk(Sdk): | ||
114 | def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"): | ||
115 | super(RpmSdk, self).__init__(d, manifest_dir) | ||
116 | |||
117 | self.target_manifest = RpmManifest(d, self.manifest_dir, | ||
118 | Manifest.MANIFEST_TYPE_SDK_TARGET) | ||
119 | self.host_manifest = RpmManifest(d, self.manifest_dir, | ||
120 | Manifest.MANIFEST_TYPE_SDK_HOST) | ||
121 | |||
122 | rpm_repo_workdir = "oe-sdk-repo" | ||
123 | if "sdk_ext" in d.getVar("BB_RUNTASK"): | ||
124 | rpm_repo_workdir = "oe-sdk-ext-repo" | ||
125 | |||
126 | self.target_pm = RpmPM(d, | ||
127 | self.sdk_target_sysroot, | ||
128 | self.d.getVar('TARGET_VENDOR'), | ||
129 | 'target', | ||
130 | rpm_repo_workdir=rpm_repo_workdir | ||
131 | ) | ||
132 | |||
133 | self.host_pm = RpmPM(d, | ||
134 | self.sdk_host_sysroot, | ||
135 | self.d.getVar('SDK_VENDOR'), | ||
136 | 'host', | ||
137 | "SDK_PACKAGE_ARCHS", | ||
138 | "SDK_OS", | ||
139 | rpm_repo_workdir=rpm_repo_workdir | ||
140 | ) | ||
141 | |||
142 | def _populate_sysroot(self, pm, manifest): | ||
143 | pkgs_to_install = manifest.parse_initial_manifest() | ||
144 | |||
145 | pm.create_configs() | ||
146 | pm.write_index() | ||
147 | pm.update() | ||
148 | |||
149 | pkgs = [] | ||
150 | pkgs_attempt = [] | ||
151 | for pkg_type in pkgs_to_install: | ||
152 | if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY: | ||
153 | pkgs_attempt += pkgs_to_install[pkg_type] | ||
154 | else: | ||
155 | pkgs += pkgs_to_install[pkg_type] | ||
156 | |||
157 | pm.install(pkgs) | ||
158 | |||
159 | pm.install(pkgs_attempt, True) | ||
160 | |||
161 | def _populate(self): | ||
162 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND")) | ||
163 | |||
164 | bb.note("Installing TARGET packages") | ||
165 | self._populate_sysroot(self.target_pm, self.target_manifest) | ||
166 | |||
167 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | ||
168 | |||
169 | self.target_pm.run_intercepts(populate_sdk='target') | ||
170 | |||
171 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) | ||
172 | |||
173 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | ||
174 | self.target_pm.remove_packaging_data() | ||
175 | |||
176 | bb.note("Installing NATIVESDK packages") | ||
177 | self._populate_sysroot(self.host_pm, self.host_manifest) | ||
178 | self.install_locales(self.host_pm) | ||
179 | |||
180 | self.host_pm.run_intercepts(populate_sdk='host') | ||
181 | |||
182 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | ||
183 | |||
184 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | ||
185 | self.host_pm.remove_packaging_data() | ||
186 | |||
187 | # Move host RPM library data | ||
188 | native_rpm_state_dir = os.path.join(self.sdk_output, | ||
189 | self.sdk_native_path, | ||
190 | self.d.getVar('localstatedir_nativesdk').strip('/'), | ||
191 | "lib", | ||
192 | "rpm" | ||
193 | ) | ||
194 | self.mkdirhier(native_rpm_state_dir) | ||
195 | for f in glob.glob(os.path.join(self.sdk_output, | ||
196 | "var", | ||
197 | "lib", | ||
198 | "rpm", | ||
199 | "*")): | ||
200 | self.movefile(f, native_rpm_state_dir) | ||
201 | |||
202 | self.remove(os.path.join(self.sdk_output, "var"), True) | ||
203 | |||
204 | # Move host sysconfig data | ||
205 | native_sysconf_dir = os.path.join(self.sdk_output, | ||
206 | self.sdk_native_path, | ||
207 | self.d.getVar('sysconfdir', | ||
208 | True).strip('/'), | ||
209 | ) | ||
210 | self.mkdirhier(native_sysconf_dir) | ||
211 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): | ||
212 | self.movefile(f, native_sysconf_dir) | ||
213 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): | ||
214 | self.movefile(f, native_sysconf_dir) | ||
215 | self.remove(os.path.join(self.sdk_output, "etc"), True) | ||
216 | |||
217 | |||
218 | class OpkgSdk(Sdk): | 113 | class OpkgSdk(Sdk): |
219 | def __init__(self, d, manifest_dir=None): | 114 | def __init__(self, d, manifest_dir=None): |
220 | super(OpkgSdk, self).__init__(d, manifest_dir) | 115 | super(OpkgSdk, self).__init__(d, manifest_dir) |
@@ -409,6 +304,7 @@ def populate_sdk(d, manifest_dir=None): | |||
409 | env_bkp = os.environ.copy() | 304 | env_bkp = os.environ.copy() |
410 | 305 | ||
411 | img_type = d.getVar('IMAGE_PKGTYPE') | 306 | img_type = d.getVar('IMAGE_PKGTYPE') |
307 | from oe.package_manager.rpm.sdk import RpmSdk | ||
412 | if img_type == "rpm": | 308 | if img_type == "rpm": |
413 | RpmSdk(d, manifest_dir).populate() | 309 | RpmSdk(d, manifest_dir).populate() |
414 | elif img_type == "ipk": | 310 | elif img_type == "ipk": |