summaryrefslogtreecommitdiffstats
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:33 +0100
commit967bc742202d6c213d3b2b005cb2b9a3ef330183 (patch)
tree4b85b517c4d1f191d9d0d4953f032c0c3c715433
parentf7352ca2c483ef695c7276296d1f08b3ff4c1d2e (diff)
downloadpoky-967bc742202d6c213d3b2b005cb2b9a3ef330183.tar.gz
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] (From OE-Core rev: 8f2571881cd01ace88d282a63ad802cab4ab6940) Signed-off-by: Bill Randle <william.c.randle@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
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", True)
175 post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) 175 post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True)
176 rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND', True)
176 177
177 postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True) 178 postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True)
178 if not postinst_intercepts_dir: 179 if not postinst_intercepts_dir:
@@ -202,6 +203,8 @@ class Rootfs(object):
202 with open(sysconfdir + "/version", "w+") as ver: 203 with open(sysconfdir + "/version", "w+") as ver:
203 ver.write(self.d.getVar('BUILDNAME', True) + "\n") 204 ver.write(self.d.getVar('BUILDNAME', True) + "\n")
204 205
206 execute_pre_post_process(self.d, rootfs_post_install_cmds)
207
205 self._run_intercepts() 208 self._run_intercepts()
206 209
207 execute_pre_post_process(self.d, post_process_cmds) 210 execute_pre_post_process(self.d, post_process_cmds)
@@ -877,7 +880,6 @@ class OpkgRootfs(DpkgOpkgRootfs):
877 pkgs_to_install = self.manifest.parse_initial_manifest() 880 pkgs_to_install = self.manifest.parse_initial_manifest()
878 opkg_pre_process_cmds = self.d.getVar('OPKG_PREPROCESS_COMMANDS', True) 881 opkg_pre_process_cmds = self.d.getVar('OPKG_PREPROCESS_COMMANDS', True)
879 opkg_post_process_cmds = self.d.getVar('OPKG_POSTPROCESS_COMMANDS', True) 882 opkg_post_process_cmds = self.d.getVar('OPKG_POSTPROCESS_COMMANDS', True)
880 rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND', True)
881 883
882 # update PM index files, unless users provide their own feeds 884 # update PM index files, unless users provide their own feeds
883 if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS', True) or "") != "1": 885 if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS', True) or "") != "1":
@@ -908,7 +910,6 @@ class OpkgRootfs(DpkgOpkgRootfs):
908 self._setup_dbg_rootfs(['/var/lib/opkg']) 910 self._setup_dbg_rootfs(['/var/lib/opkg'])
909 911
910 execute_pre_post_process(self.d, opkg_post_process_cmds) 912 execute_pre_post_process(self.d, opkg_post_process_cmds)
911 execute_pre_post_process(self.d, rootfs_post_install_cmds)
912 913
913 if self.inc_opkg_image_gen == "1": 914 if self.inc_opkg_image_gen == "1":
914 self.pm.backup_packaging_data() 915 self.pm.backup_packaging_data()