diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/package_manager/rpm/sdk.py | 114 | ||||
-rw-r--r-- | meta/lib/oe/sdk.py | 106 |
2 files changed, 115 insertions, 105 deletions
diff --git a/meta/lib/oe/package_manager/rpm/sdk.py b/meta/lib/oe/package_manager/rpm/sdk.py new file mode 100644 index 0000000000..ab816f43df --- /dev/null +++ b/meta/lib/oe/package_manager/rpm/sdk.py | |||
@@ -0,0 +1,114 @@ | |||
1 | # | ||
2 | # SPDX-License-Identifier: GPL-2.0-only | ||
3 | # | ||
4 | |||
5 | from oe.utils import execute_pre_post_process | ||
6 | from oe.sdk import Sdk | ||
7 | from oe.manifest import Manifest | ||
8 | from oe.package_manager import RpmPM | ||
9 | import glob | ||
10 | |||
11 | class RpmSdk(Sdk): | ||
12 | def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"): | ||
13 | super(RpmSdk, self).__init__(d, manifest_dir) | ||
14 | |||
15 | from oe.package_manager.rpm.manifest import RpmManifest | ||
16 | self.target_manifest = RpmManifest(d, self.manifest_dir, | ||
17 | Manifest.MANIFEST_TYPE_SDK_TARGET) | ||
18 | self.host_manifest = RpmManifest(d, self.manifest_dir, | ||
19 | Manifest.MANIFEST_TYPE_SDK_HOST) | ||
20 | |||
21 | rpm_repo_workdir = "oe-sdk-repo" | ||
22 | if "sdk_ext" in d.getVar("BB_RUNTASK"): | ||
23 | rpm_repo_workdir = "oe-sdk-ext-repo" | ||
24 | |||
25 | self.target_pm = RpmPM(d, | ||
26 | self.sdk_target_sysroot, | ||
27 | self.d.getVar('TARGET_VENDOR'), | ||
28 | 'target', | ||
29 | rpm_repo_workdir=rpm_repo_workdir | ||
30 | ) | ||
31 | |||
32 | self.host_pm = RpmPM(d, | ||
33 | self.sdk_host_sysroot, | ||
34 | self.d.getVar('SDK_VENDOR'), | ||
35 | 'host', | ||
36 | "SDK_PACKAGE_ARCHS", | ||
37 | "SDK_OS", | ||
38 | rpm_repo_workdir=rpm_repo_workdir | ||
39 | ) | ||
40 | |||
41 | def _populate_sysroot(self, pm, manifest): | ||
42 | pkgs_to_install = manifest.parse_initial_manifest() | ||
43 | |||
44 | pm.create_configs() | ||
45 | pm.write_index() | ||
46 | pm.update() | ||
47 | |||
48 | pkgs = [] | ||
49 | pkgs_attempt = [] | ||
50 | for pkg_type in pkgs_to_install: | ||
51 | if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY: | ||
52 | pkgs_attempt += pkgs_to_install[pkg_type] | ||
53 | else: | ||
54 | pkgs += pkgs_to_install[pkg_type] | ||
55 | |||
56 | pm.install(pkgs) | ||
57 | |||
58 | pm.install(pkgs_attempt, True) | ||
59 | |||
60 | def _populate(self): | ||
61 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND")) | ||
62 | |||
63 | bb.note("Installing TARGET packages") | ||
64 | self._populate_sysroot(self.target_pm, self.target_manifest) | ||
65 | |||
66 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | ||
67 | |||
68 | self.target_pm.run_intercepts(populate_sdk='target') | ||
69 | |||
70 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) | ||
71 | |||
72 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | ||
73 | self.target_pm.remove_packaging_data() | ||
74 | |||
75 | bb.note("Installing NATIVESDK packages") | ||
76 | self._populate_sysroot(self.host_pm, self.host_manifest) | ||
77 | self.install_locales(self.host_pm) | ||
78 | |||
79 | self.host_pm.run_intercepts(populate_sdk='host') | ||
80 | |||
81 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | ||
82 | |||
83 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | ||
84 | self.host_pm.remove_packaging_data() | ||
85 | |||
86 | # Move host RPM library data | ||
87 | native_rpm_state_dir = os.path.join(self.sdk_output, | ||
88 | self.sdk_native_path, | ||
89 | self.d.getVar('localstatedir_nativesdk').strip('/'), | ||
90 | "lib", | ||
91 | "rpm" | ||
92 | ) | ||
93 | self.mkdirhier(native_rpm_state_dir) | ||
94 | for f in glob.glob(os.path.join(self.sdk_output, | ||
95 | "var", | ||
96 | "lib", | ||
97 | "rpm", | ||
98 | "*")): | ||
99 | self.movefile(f, native_rpm_state_dir) | ||
100 | |||
101 | self.remove(os.path.join(self.sdk_output, "var"), True) | ||
102 | |||
103 | # Move host sysconfig data | ||
104 | native_sysconf_dir = os.path.join(self.sdk_output, | ||
105 | self.sdk_native_path, | ||
106 | self.d.getVar('sysconfdir', | ||
107 | True).strip('/'), | ||
108 | ) | ||
109 | self.mkdirhier(native_sysconf_dir) | ||
110 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): | ||
111 | self.movefile(f, native_sysconf_dir) | ||
112 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): | ||
113 | self.movefile(f, native_sysconf_dir) | ||
114 | self.remove(os.path.join(self.sdk_output, "etc"), True) | ||
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": |