summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/rootfs.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r--meta/lib/oe/rootfs.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 0bd1cf632f..8c8244c453 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -408,10 +408,14 @@ class RpmRootfs(Rootfs):
408 408
409 def _create(self): 409 def _create(self):
410 pkgs_to_install = self.manifest.parse_initial_manifest() 410 pkgs_to_install = self.manifest.parse_initial_manifest()
411 rpm_pre_process_cmds = self.d.getVar('RPM_PREPROCESS_COMMANDS', True)
412 rpm_post_process_cmds = self.d.getVar('RPM_POSTPROCESS_COMMANDS', True)
411 413
412 # update PM index files 414 # update PM index files
413 self.pm.write_index() 415 self.pm.write_index()
414 416
417 execute_pre_post_process(self.d, rpm_pre_process_cmds)
418
415 self.pm.dump_all_available_pkgs() 419 self.pm.dump_all_available_pkgs()
416 420
417 if self.inc_rpm_image_gen == "1": 421 if self.inc_rpm_image_gen == "1":
@@ -435,6 +439,10 @@ class RpmRootfs(Rootfs):
435 439
436 self._setup_dbg_rootfs(['/etc/rpm', '/var/lib/rpm', '/var/lib/smart']) 440 self._setup_dbg_rootfs(['/etc/rpm', '/var/lib/rpm', '/var/lib/smart'])
437 441
442 execute_pre_post_process(self.d, rpm_post_process_cmds)
443
444 self._log_check()
445
438 if self.inc_rpm_image_gen == "1": 446 if self.inc_rpm_image_gen == "1":
439 self.pm.backup_packaging_data() 447 self.pm.backup_packaging_data()
440 448
@@ -615,6 +623,8 @@ class DpkgRootfs(DpkgOpkgRootfs):
615 623
616 def _create(self): 624 def _create(self):
617 pkgs_to_install = self.manifest.parse_initial_manifest() 625 pkgs_to_install = self.manifest.parse_initial_manifest()
626 deb_pre_process_cmds = self.d.getVar('DEB_PREPROCESS_COMMANDS', True)
627 deb_post_process_cmds = self.d.getVar('DEB_POSTPROCESS_COMMANDS', True)
618 628
619 alt_dir = self.d.expand("${IMAGE_ROOTFS}/var/lib/dpkg/alternatives") 629 alt_dir = self.d.expand("${IMAGE_ROOTFS}/var/lib/dpkg/alternatives")
620 bb.utils.mkdirhier(alt_dir) 630 bb.utils.mkdirhier(alt_dir)
@@ -622,6 +632,8 @@ class DpkgRootfs(DpkgOpkgRootfs):
622 # update PM index files 632 # update PM index files
623 self.pm.write_index() 633 self.pm.write_index()
624 634
635 execute_pre_post_process(self.d, deb_pre_process_cmds)
636
625 self.pm.update() 637 self.pm.update()
626 638
627 for pkg_type in self.install_order: 639 for pkg_type in self.install_order:
@@ -639,9 +651,11 @@ class DpkgRootfs(DpkgOpkgRootfs):
639 651
640 self.pm.run_pre_post_installs() 652 self.pm.run_pre_post_installs()
641 653
654 execute_pre_post_process(self.d, deb_post_process_cmds)
655
642 @staticmethod 656 @staticmethod
643 def _depends_list(): 657 def _depends_list():
644 return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMAND'] 658 return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMANDS']
645 659
646 def _get_delayed_postinsts(self): 660 def _get_delayed_postinsts(self):
647 status_file = self.image_rootfs + "/var/lib/dpkg/status" 661 status_file = self.image_rootfs + "/var/lib/dpkg/status"