summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorBill Randle <william.c.randle@intel.com>2016-04-12 15:10:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-14 10:58:27 +0100
commit8f2571881cd01ace88d282a63ad802cab4ab6940 (patch)
tree4381b1203c7b010e1f154564a6f213cace3be4ff /meta/lib/oe
parentbe7ff1741e8ab5f2724b3f64da1bed8b0d3dcb7c (diff)
downloadopenembedded-core-8f2571881cd01ace88d282a63ad802cab4ab6940.tar.gz
openembedded-core-8f2571881cd01ace88d282a63ad802cab4ab6940.tar.bz2
openembedded-core-8f2571881cd01ace88d282a63ad802cab4ab6940.zip
rootfs.py: apply ROOTFS_POSTINSTALL_COMMAND to all package formats
Previously, ROOTFS_POSTINSTALL_COMMAND was run only after the opkg rootfs install post processing phase. This patch makes it generic so it is run fter any package manager specific rootfs post processing, but before _run_intercepts(). [YOCTO #9248] Signed-off-by: Bill Randle <william.c.randle@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/rootfs.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index bfae1d8e89..a95e1b7391 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -173,6 +173,7 @@ class Rootfs(object):
bb.note("###### Generate rootfs #######")
pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True)
post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True)
+ rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND', True)
postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True)
if not postinst_intercepts_dir:
@@ -202,6 +203,8 @@ class Rootfs(object):
with open(sysconfdir + "/version", "w+") as ver:
ver.write(self.d.getVar('BUILDNAME', True) + "\n")
+ execute_pre_post_process(self.d, rootfs_post_install_cmds)
+
self._run_intercepts()
execute_pre_post_process(self.d, post_process_cmds)
@@ -877,7 +880,6 @@ class OpkgRootfs(DpkgOpkgRootfs):
pkgs_to_install = self.manifest.parse_initial_manifest()
opkg_pre_process_cmds = self.d.getVar('OPKG_PREPROCESS_COMMANDS', True)
opkg_post_process_cmds = self.d.getVar('OPKG_POSTPROCESS_COMMANDS', True)
- rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND', True)
# update PM index files, unless users provide their own feeds
if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS', True) or "") != "1":
@@ -908,7 +910,6 @@ class OpkgRootfs(DpkgOpkgRootfs):
self._setup_dbg_rootfs(['/var/lib/opkg'])
execute_pre_post_process(self.d, opkg_post_process_cmds)
- execute_pre_post_process(self.d, rootfs_post_install_cmds)
if self.inc_opkg_image_gen == "1":
self.pm.backup_packaging_data()