diff options
| -rw-r--r-- | meta/lib/oe/rootfs.py | 16 |
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): def _create(self): pkgs_to_install = self.manifest.parse_initial_manifest() + rpm_pre_process_cmds = self.d.getVar('RPM_PREPROCESS_COMMANDS', True) + rpm_post_process_cmds = self.d.getVar('RPM_POSTPROCESS_COMMANDS', True) # update PM index files self.pm.write_index() + execute_pre_post_process(self.d, rpm_pre_process_cmds) + self.pm.dump_all_available_pkgs() if self.inc_rpm_image_gen == "1": @@ -435,6 +439,10 @@ class RpmRootfs(Rootfs): self._setup_dbg_rootfs(['/etc/rpm', '/var/lib/rpm', '/var/lib/smart']) + execute_pre_post_process(self.d, rpm_post_process_cmds) + + self._log_check() + if self.inc_rpm_image_gen == "1": self.pm.backup_packaging_data() @@ -615,6 +623,8 @@ class DpkgRootfs(DpkgOpkgRootfs): def _create(self): pkgs_to_install = self.manifest.parse_initial_manifest() + deb_pre_process_cmds = self.d.getVar('DEB_PREPROCESS_COMMANDS', True) + deb_post_process_cmds = self.d.getVar('DEB_POSTPROCESS_COMMANDS', True) alt_dir = self.d.expand("${IMAGE_ROOTFS}/var/lib/dpkg/alternatives") bb.utils.mkdirhier(alt_dir) @@ -622,6 +632,8 @@ class DpkgRootfs(DpkgOpkgRootfs): # update PM index files self.pm.write_index() + execute_pre_post_process(self.d, deb_pre_process_cmds) + self.pm.update() for pkg_type in self.install_order: @@ -639,9 +651,11 @@ class DpkgRootfs(DpkgOpkgRootfs): self.pm.run_pre_post_installs() + execute_pre_post_process(self.d, deb_post_process_cmds) + @staticmethod def _depends_list(): - return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMAND'] + return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMANDS'] def _get_delayed_postinsts(self): status_file = self.image_rootfs + "/var/lib/dpkg/status" |