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-18 19:22:26 +0100 |
commit | 346188f17636f321e07e37399536d04a124a0409 (patch) | |
tree | cb205fc296c49883a9099218d22f6b322bd7555d /meta | |
parent | 3b9a1144a54038db4d48ba1a955ef1ca8f8bf565 (diff) | |
download | poky-346188f17636f321e07e37399536d04a124a0409.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 master rev: 7d08d2d5c0ae686e3bb8732ea82f30fd189b1cd8)
(From OE-Core rev: 0f528bda0bac76e190b03764c603f199a6079fc6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 e86480cf25..d2de2c68ea 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -114,6 +114,9 @@ class Rootfs(object): | |||
114 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True) | 114 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True) |
115 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) | 115 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) |
116 | 116 | ||
117 | postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True) | ||
118 | if not postinst_intercepts_dir: | ||
119 | postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts") | ||
117 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), | 120 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), |
118 | "intercept_scripts") | 121 | "intercept_scripts") |
119 | 122 | ||
@@ -123,8 +126,7 @@ class Rootfs(object): | |||
123 | 126 | ||
124 | bb.utils.mkdirhier(self.deploy_dir_image) | 127 | bb.utils.mkdirhier(self.deploy_dir_image) |
125 | 128 | ||
126 | shutil.copytree(self.d.expand("${COREBASE}/scripts/postinst-intercepts"), | 129 | shutil.copytree(postinst_intercepts_dir, intercepts_dir) |
127 | intercepts_dir) | ||
128 | 130 | ||
129 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), | 131 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), |
130 | self.deploy_dir_image + | 132 | self.deploy_dir_image + |