[oe-commits] Robert Yang : rootfs.py: fix PRE/POSTPROCESS_COMMANDS for rpm and deb
git at git.openembedded.org
git at git.openembedded.org
Sat Aug 1 21:25:13 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: aadfac366bd2cae37357e15bf4fc28c159d71b32
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=aadfac366bd2cae37357e15bf4fc28c159d71b32
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Mon Jul 27 20:10:50 2015 -0700
rootfs.py: fix PRE/POSTPROCESS_COMMANDS for rpm and deb
The rpm didn't run RPM_PREPROCESS_COMMANDS or RPM_POSTPROCESS_COMMANDS,
the similar to deb, this patch fix the problem.
And fix a typo:
DEB_POSTPROCESS_COMMAND -> DEB_POSTPROCESS_COMMANDS
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oe/rootfs.py | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 0bd1cf6..8c8244c 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"
More information about the Openembedded-commits
mailing list