diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/lib/oe/rootfs.py | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r-- | meta/lib/oe/rootfs.py | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 74fc3bd256..d9a473006a 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -18,8 +18,8 @@ class Rootfs(object, metaclass=ABCMeta): | |||
18 | def __init__(self, d, progress_reporter=None, logcatcher=None): | 18 | def __init__(self, d, progress_reporter=None, logcatcher=None): |
19 | self.d = d | 19 | self.d = d |
20 | self.pm = None | 20 | self.pm = None |
21 | self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True) | 21 | self.image_rootfs = self.d.getVar('IMAGE_ROOTFS') |
22 | self.deploydir = self.d.getVar('IMGDEPLOYDIR', True) | 22 | self.deploydir = self.d.getVar('IMGDEPLOYDIR') |
23 | self.progress_reporter = progress_reporter | 23 | self.progress_reporter = progress_reporter |
24 | self.logcatcher = logcatcher | 24 | self.logcatcher = logcatcher |
25 | 25 | ||
@@ -72,7 +72,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
72 | else: | 72 | else: |
73 | msg = '%d %s messages' % (len(messages), type) | 73 | msg = '%d %s messages' % (len(messages), type) |
74 | msg = '[log_check] %s: found %s in the logfile:\n%s' % \ | 74 | msg = '[log_check] %s: found %s in the logfile:\n%s' % \ |
75 | (self.d.getVar('PN', True), msg, ''.join(messages)) | 75 | (self.d.getVar('PN'), msg, ''.join(messages)) |
76 | if type == 'error': | 76 | if type == 'error': |
77 | bb.fatal(msg) | 77 | bb.fatal(msg) |
78 | else: | 78 | else: |
@@ -103,7 +103,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
103 | pass | 103 | pass |
104 | 104 | ||
105 | def _setup_dbg_rootfs(self, dirs): | 105 | def _setup_dbg_rootfs(self, dirs): |
106 | gen_debugfs = self.d.getVar('IMAGE_GEN_DEBUGFS', True) or '0' | 106 | gen_debugfs = self.d.getVar('IMAGE_GEN_DEBUGFS') or '0' |
107 | if gen_debugfs != '1': | 107 | if gen_debugfs != '1': |
108 | return | 108 | return |
109 | 109 | ||
@@ -156,7 +156,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
156 | os.rename(self.image_rootfs + '-orig', self.image_rootfs) | 156 | os.rename(self.image_rootfs + '-orig', self.image_rootfs) |
157 | 157 | ||
158 | def _exec_shell_cmd(self, cmd): | 158 | def _exec_shell_cmd(self, cmd): |
159 | fakerootcmd = self.d.getVar('FAKEROOT', True) | 159 | fakerootcmd = self.d.getVar('FAKEROOT') |
160 | if fakerootcmd is not None: | 160 | if fakerootcmd is not None: |
161 | exec_cmd = [fakerootcmd, cmd] | 161 | exec_cmd = [fakerootcmd, cmd] |
162 | else: | 162 | else: |
@@ -171,14 +171,14 @@ class Rootfs(object, metaclass=ABCMeta): | |||
171 | 171 | ||
172 | def create(self): | 172 | def create(self): |
173 | bb.note("###### Generate rootfs #######") | 173 | bb.note("###### Generate rootfs #######") |
174 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True) | 174 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND") |
175 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) | 175 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND") |
176 | rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND', True) | 176 | rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND') |
177 | 177 | ||
178 | postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True) | 178 | postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR") |
179 | if not postinst_intercepts_dir: | 179 | if not postinst_intercepts_dir: |
180 | postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts") | 180 | postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts") |
181 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), | 181 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR'), |
182 | "intercept_scripts") | 182 | "intercept_scripts") |
183 | 183 | ||
184 | bb.utils.remove(intercepts_dir, True) | 184 | bb.utils.remove(intercepts_dir, True) |
@@ -201,10 +201,10 @@ class Rootfs(object, metaclass=ABCMeta): | |||
201 | # call the package manager dependent create method | 201 | # call the package manager dependent create method |
202 | self._create() | 202 | self._create() |
203 | 203 | ||
204 | sysconfdir = self.image_rootfs + self.d.getVar('sysconfdir', True) | 204 | sysconfdir = self.image_rootfs + self.d.getVar('sysconfdir') |
205 | bb.utils.mkdirhier(sysconfdir) | 205 | bb.utils.mkdirhier(sysconfdir) |
206 | with open(sysconfdir + "/version", "w+") as ver: | 206 | with open(sysconfdir + "/version", "w+") as ver: |
207 | ver.write(self.d.getVar('BUILDNAME', True) + "\n") | 207 | ver.write(self.d.getVar('BUILDNAME') + "\n") |
208 | 208 | ||
209 | execute_pre_post_process(self.d, rootfs_post_install_cmds) | 209 | execute_pre_post_process(self.d, rootfs_post_install_cmds) |
210 | 210 | ||
@@ -223,7 +223,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
223 | "offline and rootfs is read-only: %s" % | 223 | "offline and rootfs is read-only: %s" % |
224 | delayed_postinsts) | 224 | delayed_postinsts) |
225 | 225 | ||
226 | if self.d.getVar('USE_DEVFS', True) != "1": | 226 | if self.d.getVar('USE_DEVFS') != "1": |
227 | self._create_devfs() | 227 | self._create_devfs() |
228 | 228 | ||
229 | self._uninstall_unneeded() | 229 | self._uninstall_unneeded() |
@@ -235,7 +235,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
235 | 235 | ||
236 | self._run_ldconfig() | 236 | self._run_ldconfig() |
237 | 237 | ||
238 | if self.d.getVar('USE_DEPMOD', True) != "0": | 238 | if self.d.getVar('USE_DEPMOD') != "0": |
239 | self._generate_kernel_module_deps() | 239 | self._generate_kernel_module_deps() |
240 | 240 | ||
241 | self._cleanup() | 241 | self._cleanup() |
@@ -251,16 +251,16 @@ class Rootfs(object, metaclass=ABCMeta): | |||
251 | if delayed_postinsts is None: | 251 | if delayed_postinsts is None: |
252 | if os.path.exists(self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts")): | 252 | if os.path.exists(self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts")): |
253 | self._exec_shell_cmd(["update-rc.d", "-f", "-r", | 253 | self._exec_shell_cmd(["update-rc.d", "-f", "-r", |
254 | self.d.getVar('IMAGE_ROOTFS', True), | 254 | self.d.getVar('IMAGE_ROOTFS'), |
255 | "run-postinsts", "remove"]) | 255 | "run-postinsts", "remove"]) |
256 | 256 | ||
257 | image_rorfs = bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", | 257 | image_rorfs = bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", |
258 | True, False, self.d) | 258 | True, False, self.d) |
259 | image_rorfs_force = self.d.getVar('FORCE_RO_REMOVE', True) | 259 | image_rorfs_force = self.d.getVar('FORCE_RO_REMOVE') |
260 | 260 | ||
261 | if image_rorfs or image_rorfs_force == "1": | 261 | if image_rorfs or image_rorfs_force == "1": |
262 | # Remove components that we don't need if it's a read-only rootfs | 262 | # Remove components that we don't need if it's a read-only rootfs |
263 | unneeded_pkgs = self.d.getVar("ROOTFS_RO_UNNEEDED", True).split() | 263 | unneeded_pkgs = self.d.getVar("ROOTFS_RO_UNNEEDED").split() |
264 | pkgs_installed = image_list_installed_packages(self.d) | 264 | pkgs_installed = image_list_installed_packages(self.d) |
265 | pkgs_to_remove = [pkg for pkg in pkgs_installed if pkg in unneeded_pkgs] | 265 | pkgs_to_remove = [pkg for pkg in pkgs_installed if pkg in unneeded_pkgs] |
266 | 266 | ||
@@ -273,7 +273,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
273 | bb.warn("There are post install scripts " | 273 | bb.warn("There are post install scripts " |
274 | "in a read-only rootfs") | 274 | "in a read-only rootfs") |
275 | 275 | ||
276 | post_uninstall_cmds = self.d.getVar("ROOTFS_POSTUNINSTALL_COMMAND", True) | 276 | post_uninstall_cmds = self.d.getVar("ROOTFS_POSTUNINSTALL_COMMAND") |
277 | execute_pre_post_process(self.d, post_uninstall_cmds) | 277 | execute_pre_post_process(self.d, post_uninstall_cmds) |
278 | 278 | ||
279 | runtime_pkgmanage = bb.utils.contains("IMAGE_FEATURES", "package-management", | 279 | runtime_pkgmanage = bb.utils.contains("IMAGE_FEATURES", "package-management", |
@@ -283,12 +283,12 @@ class Rootfs(object, metaclass=ABCMeta): | |||
283 | self.pm.remove_packaging_data() | 283 | self.pm.remove_packaging_data() |
284 | 284 | ||
285 | def _run_intercepts(self): | 285 | def _run_intercepts(self): |
286 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), | 286 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR'), |
287 | "intercept_scripts") | 287 | "intercept_scripts") |
288 | 288 | ||
289 | bb.note("Running intercept scripts:") | 289 | bb.note("Running intercept scripts:") |
290 | os.environ['D'] = self.image_rootfs | 290 | os.environ['D'] = self.image_rootfs |
291 | os.environ['STAGING_DIR_NATIVE'] = self.d.getVar('STAGING_DIR_NATIVE', True) | 291 | os.environ['STAGING_DIR_NATIVE'] = self.d.getVar('STAGING_DIR_NATIVE') |
292 | for script in os.listdir(intercepts_dir): | 292 | for script in os.listdir(intercepts_dir): |
293 | script_full = os.path.join(intercepts_dir, script) | 293 | script_full = os.path.join(intercepts_dir, script) |
294 | 294 | ||
@@ -320,7 +320,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
320 | self._handle_intercept_failure(registered_pkgs) | 320 | self._handle_intercept_failure(registered_pkgs) |
321 | 321 | ||
322 | def _run_ldconfig(self): | 322 | def _run_ldconfig(self): |
323 | if self.d.getVar('LDCONFIGDEPEND', True): | 323 | if self.d.getVar('LDCONFIGDEPEND'): |
324 | bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new -v") | 324 | bb.note("Executing: ldconfig -r" + self.image_rootfs + "-c new -v") |
325 | self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c', | 325 | self._exec_shell_cmd(['ldconfig', '-r', self.image_rootfs, '-c', |
326 | 'new', '-v']) | 326 | 'new', '-v']) |
@@ -340,7 +340,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
340 | bb.note("No Kernel Modules found, not running depmod") | 340 | bb.note("No Kernel Modules found, not running depmod") |
341 | return | 341 | return |
342 | 342 | ||
343 | kernel_abi_ver_file = oe.path.join(self.d.getVar('PKGDATA_DIR', True), "kernel-depmod", | 343 | kernel_abi_ver_file = oe.path.join(self.d.getVar('PKGDATA_DIR'), "kernel-depmod", |
344 | 'kernel-abiversion') | 344 | 'kernel-abiversion') |
345 | if not os.path.exists(kernel_abi_ver_file): | 345 | if not os.path.exists(kernel_abi_ver_file): |
346 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) | 346 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) |
@@ -362,15 +362,15 @@ class Rootfs(object, metaclass=ABCMeta): | |||
362 | """ | 362 | """ |
363 | def _create_devfs(self): | 363 | def _create_devfs(self): |
364 | devtable_list = [] | 364 | devtable_list = [] |
365 | devtable = self.d.getVar('IMAGE_DEVICE_TABLE', True) | 365 | devtable = self.d.getVar('IMAGE_DEVICE_TABLE') |
366 | if devtable is not None: | 366 | if devtable is not None: |
367 | devtable_list.append(devtable) | 367 | devtable_list.append(devtable) |
368 | else: | 368 | else: |
369 | devtables = self.d.getVar('IMAGE_DEVICE_TABLES', True) | 369 | devtables = self.d.getVar('IMAGE_DEVICE_TABLES') |
370 | if devtables is None: | 370 | if devtables is None: |
371 | devtables = 'files/device_table-minimal.txt' | 371 | devtables = 'files/device_table-minimal.txt' |
372 | for devtable in devtables.split(): | 372 | for devtable in devtables.split(): |
373 | devtable_list.append("%s" % bb.utils.which(self.d.getVar('BBPATH', True), devtable)) | 373 | devtable_list.append("%s" % bb.utils.which(self.d.getVar('BBPATH'), devtable)) |
374 | 374 | ||
375 | for devtable in devtable_list: | 375 | for devtable in devtable_list: |
376 | self._exec_shell_cmd(["makedevs", "-r", | 376 | self._exec_shell_cmd(["makedevs", "-r", |
@@ -386,16 +386,16 @@ class RpmRootfs(Rootfs): | |||
386 | self.manifest = RpmManifest(d, manifest_dir) | 386 | self.manifest = RpmManifest(d, manifest_dir) |
387 | 387 | ||
388 | self.pm = RpmPM(d, | 388 | self.pm = RpmPM(d, |
389 | d.getVar('IMAGE_ROOTFS', True), | 389 | d.getVar('IMAGE_ROOTFS'), |
390 | self.d.getVar('TARGET_VENDOR', True) | 390 | self.d.getVar('TARGET_VENDOR') |
391 | ) | 391 | ) |
392 | 392 | ||
393 | self.inc_rpm_image_gen = self.d.getVar('INC_RPM_IMAGE_GEN', True) | 393 | self.inc_rpm_image_gen = self.d.getVar('INC_RPM_IMAGE_GEN') |
394 | if self.inc_rpm_image_gen != "1": | 394 | if self.inc_rpm_image_gen != "1": |
395 | bb.utils.remove(self.image_rootfs, True) | 395 | bb.utils.remove(self.image_rootfs, True) |
396 | else: | 396 | else: |
397 | self.pm.recovery_packaging_data() | 397 | self.pm.recovery_packaging_data() |
398 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) | 398 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True) |
399 | 399 | ||
400 | self.pm.create_configs() | 400 | self.pm.create_configs() |
401 | 401 | ||
@@ -429,8 +429,8 @@ class RpmRootfs(Rootfs): | |||
429 | 429 | ||
430 | def _create(self): | 430 | def _create(self): |
431 | pkgs_to_install = self.manifest.parse_initial_manifest() | 431 | pkgs_to_install = self.manifest.parse_initial_manifest() |
432 | rpm_pre_process_cmds = self.d.getVar('RPM_PREPROCESS_COMMANDS', True) | 432 | rpm_pre_process_cmds = self.d.getVar('RPM_PREPROCESS_COMMANDS') |
433 | rpm_post_process_cmds = self.d.getVar('RPM_POSTPROCESS_COMMANDS', True) | 433 | rpm_post_process_cmds = self.d.getVar('RPM_POSTPROCESS_COMMANDS') |
434 | 434 | ||
435 | # update PM index files | 435 | # update PM index files |
436 | self.pm.write_index() | 436 | self.pm.write_index() |
@@ -601,7 +601,7 @@ class DpkgOpkgRootfs(Rootfs): | |||
601 | pkg_list = [] | 601 | pkg_list = [] |
602 | 602 | ||
603 | pkgs = None | 603 | pkgs = None |
604 | if not self.d.getVar('PACKAGE_INSTALL', True).strip(): | 604 | if not self.d.getVar('PACKAGE_INSTALL').strip(): |
605 | bb.note("Building empty image") | 605 | bb.note("Building empty image") |
606 | else: | 606 | else: |
607 | pkgs = self._get_pkgs_postinsts(status_file) | 607 | pkgs = self._get_pkgs_postinsts(status_file) |
@@ -637,17 +637,17 @@ class DpkgRootfs(DpkgOpkgRootfs): | |||
637 | ] | 637 | ] |
638 | 638 | ||
639 | bb.utils.remove(self.image_rootfs, True) | 639 | bb.utils.remove(self.image_rootfs, True) |
640 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) | 640 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True) |
641 | self.manifest = DpkgManifest(d, manifest_dir) | 641 | self.manifest = DpkgManifest(d, manifest_dir) |
642 | self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS', True), | 642 | self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS'), |
643 | d.getVar('PACKAGE_ARCHS', True), | 643 | d.getVar('PACKAGE_ARCHS'), |
644 | d.getVar('DPKG_ARCH', True)) | 644 | d.getVar('DPKG_ARCH')) |
645 | 645 | ||
646 | 646 | ||
647 | def _create(self): | 647 | def _create(self): |
648 | pkgs_to_install = self.manifest.parse_initial_manifest() | 648 | pkgs_to_install = self.manifest.parse_initial_manifest() |
649 | deb_pre_process_cmds = self.d.getVar('DEB_PREPROCESS_COMMANDS', True) | 649 | deb_pre_process_cmds = self.d.getVar('DEB_PREPROCESS_COMMANDS') |
650 | deb_post_process_cmds = self.d.getVar('DEB_POSTPROCESS_COMMANDS', True) | 650 | deb_post_process_cmds = self.d.getVar('DEB_POSTPROCESS_COMMANDS') |
651 | 651 | ||
652 | alt_dir = self.d.expand("${IMAGE_ROOTFS}/var/lib/dpkg/alternatives") | 652 | alt_dir = self.d.expand("${IMAGE_ROOTFS}/var/lib/dpkg/alternatives") |
653 | bb.utils.mkdirhier(alt_dir) | 653 | bb.utils.mkdirhier(alt_dir) |
@@ -725,10 +725,10 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
725 | self.log_check_regex = '(exit 1|Collected errors)' | 725 | self.log_check_regex = '(exit 1|Collected errors)' |
726 | 726 | ||
727 | self.manifest = OpkgManifest(d, manifest_dir) | 727 | self.manifest = OpkgManifest(d, manifest_dir) |
728 | self.opkg_conf = self.d.getVar("IPKGCONF_TARGET", True) | 728 | self.opkg_conf = self.d.getVar("IPKGCONF_TARGET") |
729 | self.pkg_archs = self.d.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True) | 729 | self.pkg_archs = self.d.getVar("ALL_MULTILIB_PACKAGE_ARCHS") |
730 | 730 | ||
731 | self.inc_opkg_image_gen = self.d.getVar('INC_IPK_IMAGE_GEN', True) or "" | 731 | self.inc_opkg_image_gen = self.d.getVar('INC_IPK_IMAGE_GEN') or "" |
732 | if self._remove_old_rootfs(): | 732 | if self._remove_old_rootfs(): |
733 | bb.utils.remove(self.image_rootfs, True) | 733 | bb.utils.remove(self.image_rootfs, True) |
734 | self.pm = OpkgPM(d, | 734 | self.pm = OpkgPM(d, |
@@ -742,7 +742,7 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
742 | self.pkg_archs) | 742 | self.pkg_archs) |
743 | self.pm.recover_packaging_data() | 743 | self.pm.recover_packaging_data() |
744 | 744 | ||
745 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) | 745 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True) |
746 | 746 | ||
747 | def _prelink_file(self, root_dir, filename): | 747 | def _prelink_file(self, root_dir, filename): |
748 | bb.note('prelink %s in %s' % (filename, root_dir)) | 748 | bb.note('prelink %s in %s' % (filename, root_dir)) |
@@ -797,7 +797,7 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
797 | """ | 797 | """ |
798 | def _multilib_sanity_test(self, dirs): | 798 | def _multilib_sanity_test(self, dirs): |
799 | 799 | ||
800 | allow_replace = self.d.getVar("MULTILIBRE_ALLOW_REP", True) | 800 | allow_replace = self.d.getVar("MULTILIBRE_ALLOW_REP") |
801 | if allow_replace is None: | 801 | if allow_replace is None: |
802 | allow_replace = "" | 802 | allow_replace = "" |
803 | 803 | ||
@@ -829,12 +829,12 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
829 | files[key] = item | 829 | files[key] = item |
830 | 830 | ||
831 | def _multilib_test_install(self, pkgs): | 831 | def _multilib_test_install(self, pkgs): |
832 | ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS", True) | 832 | ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS") |
833 | bb.utils.mkdirhier(ml_temp) | 833 | bb.utils.mkdirhier(ml_temp) |
834 | 834 | ||
835 | dirs = [self.image_rootfs] | 835 | dirs = [self.image_rootfs] |
836 | 836 | ||
837 | for variant in self.d.getVar("MULTILIB_VARIANTS", True).split(): | 837 | for variant in self.d.getVar("MULTILIB_VARIANTS").split(): |
838 | ml_target_rootfs = os.path.join(ml_temp, variant) | 838 | ml_target_rootfs = os.path.join(ml_temp, variant) |
839 | 839 | ||
840 | bb.utils.remove(ml_target_rootfs, True) | 840 | bb.utils.remove(ml_target_rootfs, True) |
@@ -894,9 +894,9 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
894 | old_vars_list = open(vars_list_file, 'r+').read() | 894 | old_vars_list = open(vars_list_file, 'r+').read() |
895 | 895 | ||
896 | new_vars_list = '%s:%s:%s\n' % \ | 896 | new_vars_list = '%s:%s:%s\n' % \ |
897 | ((self.d.getVar('BAD_RECOMMENDATIONS', True) or '').strip(), | 897 | ((self.d.getVar('BAD_RECOMMENDATIONS') or '').strip(), |
898 | (self.d.getVar('NO_RECOMMENDATIONS', True) or '').strip(), | 898 | (self.d.getVar('NO_RECOMMENDATIONS') or '').strip(), |
899 | (self.d.getVar('PACKAGE_EXCLUDE', True) or '').strip()) | 899 | (self.d.getVar('PACKAGE_EXCLUDE') or '').strip()) |
900 | open(vars_list_file, 'w+').write(new_vars_list) | 900 | open(vars_list_file, 'w+').write(new_vars_list) |
901 | 901 | ||
902 | if old_vars_list != new_vars_list: | 902 | if old_vars_list != new_vars_list: |
@@ -906,11 +906,11 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
906 | 906 | ||
907 | def _create(self): | 907 | def _create(self): |
908 | pkgs_to_install = self.manifest.parse_initial_manifest() | 908 | pkgs_to_install = self.manifest.parse_initial_manifest() |
909 | opkg_pre_process_cmds = self.d.getVar('OPKG_PREPROCESS_COMMANDS', True) | 909 | opkg_pre_process_cmds = self.d.getVar('OPKG_PREPROCESS_COMMANDS') |
910 | opkg_post_process_cmds = self.d.getVar('OPKG_POSTPROCESS_COMMANDS', True) | 910 | opkg_post_process_cmds = self.d.getVar('OPKG_POSTPROCESS_COMMANDS') |
911 | 911 | ||
912 | # update PM index files, unless users provide their own feeds | 912 | # update PM index files, unless users provide their own feeds |
913 | if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS', True) or "") != "1": | 913 | if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS') or "") != "1": |
914 | self.pm.write_index() | 914 | self.pm.write_index() |
915 | 915 | ||
916 | execute_pre_post_process(self.d, opkg_pre_process_cmds) | 916 | execute_pre_post_process(self.d, opkg_pre_process_cmds) |
@@ -968,7 +968,7 @@ class OpkgRootfs(DpkgOpkgRootfs): | |||
968 | 968 | ||
969 | def _get_delayed_postinsts(self): | 969 | def _get_delayed_postinsts(self): |
970 | status_file = os.path.join(self.image_rootfs, | 970 | status_file = os.path.join(self.image_rootfs, |
971 | self.d.getVar('OPKGLIBDIR', True).strip('/'), | 971 | self.d.getVar('OPKGLIBDIR').strip('/'), |
972 | "opkg", "status") | 972 | "opkg", "status") |
973 | return self._get_delayed_postinsts_common(status_file) | 973 | return self._get_delayed_postinsts_common(status_file) |
974 | 974 | ||
@@ -993,14 +993,14 @@ def get_class_for_type(imgtype): | |||
993 | "deb": DpkgRootfs}[imgtype] | 993 | "deb": DpkgRootfs}[imgtype] |
994 | 994 | ||
995 | def variable_depends(d, manifest_dir=None): | 995 | def variable_depends(d, manifest_dir=None): |
996 | img_type = d.getVar('IMAGE_PKGTYPE', True) | 996 | img_type = d.getVar('IMAGE_PKGTYPE') |
997 | cls = get_class_for_type(img_type) | 997 | cls = get_class_for_type(img_type) |
998 | return cls._depends_list() | 998 | return cls._depends_list() |
999 | 999 | ||
1000 | def create_rootfs(d, manifest_dir=None, progress_reporter=None, logcatcher=None): | 1000 | def create_rootfs(d, manifest_dir=None, progress_reporter=None, logcatcher=None): |
1001 | env_bkp = os.environ.copy() | 1001 | env_bkp = os.environ.copy() |
1002 | 1002 | ||
1003 | img_type = d.getVar('IMAGE_PKGTYPE', True) | 1003 | img_type = d.getVar('IMAGE_PKGTYPE') |
1004 | if img_type == "rpm": | 1004 | if img_type == "rpm": |
1005 | RpmRootfs(d, manifest_dir, progress_reporter, logcatcher).create() | 1005 | RpmRootfs(d, manifest_dir, progress_reporter, logcatcher).create() |
1006 | elif img_type == "ipk": | 1006 | elif img_type == "ipk": |
@@ -1014,13 +1014,13 @@ def create_rootfs(d, manifest_dir=None, progress_reporter=None, logcatcher=None) | |||
1014 | 1014 | ||
1015 | def image_list_installed_packages(d, rootfs_dir=None): | 1015 | def image_list_installed_packages(d, rootfs_dir=None): |
1016 | if not rootfs_dir: | 1016 | if not rootfs_dir: |
1017 | rootfs_dir = d.getVar('IMAGE_ROOTFS', True) | 1017 | rootfs_dir = d.getVar('IMAGE_ROOTFS') |
1018 | 1018 | ||
1019 | img_type = d.getVar('IMAGE_PKGTYPE', True) | 1019 | img_type = d.getVar('IMAGE_PKGTYPE') |
1020 | if img_type == "rpm": | 1020 | if img_type == "rpm": |
1021 | return RpmPkgsList(d, rootfs_dir).list_pkgs() | 1021 | return RpmPkgsList(d, rootfs_dir).list_pkgs() |
1022 | elif img_type == "ipk": | 1022 | elif img_type == "ipk": |
1023 | return OpkgPkgsList(d, rootfs_dir, d.getVar("IPKGCONF_TARGET", True)).list_pkgs() | 1023 | return OpkgPkgsList(d, rootfs_dir, d.getVar("IPKGCONF_TARGET")).list_pkgs() |
1024 | elif img_type == "deb": | 1024 | elif img_type == "deb": |
1025 | return DpkgPkgsList(d, rootfs_dir).list_pkgs() | 1025 | return DpkgPkgsList(d, rootfs_dir).list_pkgs() |
1026 | 1026 | ||