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-19 11:51:33 +0100 |
commit | 2e6494e55a4f460cb7e8853fc7ff6da421b7a0fc (patch) | |
tree | 563e52a23b03a75073d074da39661451763f2169 /meta/lib/oe/rootfs.py | |
parent | 55fbde1fdec373a7f8f37981b67a0370175d0a14 (diff) | |
download | poky-2e6494e55a4f460cb7e8853fc7ff6da421b7a0fc.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)
(From OE-Core rev: 2374910466d82c817d74e9098a1636b21ff779af)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-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 c4735f2755..bbc37d3522 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -77,6 +77,9 @@ class Rootfs(object): | |||
77 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True) | 77 | pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True) |
78 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) | 78 | post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True) |
79 | 79 | ||
80 | postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True) | ||
81 | if not postinst_intercepts_dir: | ||
82 | postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts") | ||
80 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), | 83 | intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), |
81 | "intercept_scripts") | 84 | "intercept_scripts") |
82 | 85 | ||
@@ -86,8 +89,7 @@ class Rootfs(object): | |||
86 | 89 | ||
87 | bb.utils.mkdirhier(self.deploy_dir_image) | 90 | bb.utils.mkdirhier(self.deploy_dir_image) |
88 | 91 | ||
89 | shutil.copytree(self.d.expand("${COREBASE}/scripts/postinst-intercepts"), | 92 | shutil.copytree(postinst_intercepts_dir, intercepts_dir) |
90 | intercepts_dir) | ||
91 | 93 | ||
92 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), | 94 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), |
93 | self.deploy_dir_image + | 95 | self.deploy_dir_image + |