diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2015-09-04 14:22:26 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-09 14:27:38 +0100 |
commit | ae00b5920062679f74d8a5eb0b472a6b5c320044 (patch) | |
tree | 774fdba10bd1d1f5e077c4717f6e88997b2d850a | |
parent | db92bc23880794be77373b0f2d8c26279dcecb84 (diff) | |
download | poky-ae00b5920062679f74d8a5eb0b472a6b5c320044.tar.gz |
rootfs.py: Allow to override postinst-intercepts location
* useful when we need to overlay/extend intercept scripts from oe-core
(From OE-Core rev: 7d08d2d5c0ae686e3bb8732ea82f30fd189b1cd8)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/rootfs.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index c29843b054..76950ec77a 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -164,6 +164,9 @@ class Rootfs(object): | |||
164 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True) | 164 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True) |
165 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) | 165 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) |
166 | 166 | ||
167 | postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True) | ||
168 | if not postinst_intercepts_dir: | ||
169 | postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts") | ||
167 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), | 170 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), |
168 | "intercept_scripts") | 171 | "intercept_scripts") |
169 | 172 | ||
@@ -173,8 +176,7 @@ class Rootfs(object): | |||
173 | 176 | ||
174 | bb.utils.mkdirhier(self.deploy_dir_image) | 177 | bb.utils.mkdirhier(self.deploy_dir_image) |
175 | 178 | ||
176 | shutil.copytree(self.d.expand("${COREBASE}/scripts/postinst-intercepts"), | 179 | shutil.copytree(postinst_intercepts_dir, intercepts_dir) |
177 | intercepts_dir) | ||
178 | 180 | ||
179 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), | 181 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), |
180 | self.deploy_dir_image + | 182 | self.deploy_dir_image + |