summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-09-04 14:22:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-19 11:51:33 +0100
commit2e6494e55a4f460cb7e8853fc7ff6da421b7a0fc (patch)
tree563e52a23b03a75073d074da39661451763f2169
parent55fbde1fdec373a7f8f37981b67a0370175d0a14 (diff)
downloadpoky-2e6494e55a4f460cb7e8853fc7ff6da421b7a0fc.tar.gz
poky-2e6494e55a4f460cb7e8853fc7ff6da421b7a0fc.tar.bz2
poky-2e6494e55a4f460cb7e8853fc7ff6da421b7a0fc.zip
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>
-rw-r--r--meta/lib/oe/rootfs.py6
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):
pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True)
post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True)
+ postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True)
+ if not postinst_intercepts_dir:
+ postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts")
intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True),
"intercept_scripts")
@@ -86,8 +89,7 @@ class Rootfs(object):
bb.utils.mkdirhier(self.deploy_dir_image)
- shutil.copytree(self.d.expand("${COREBASE}/scripts/postinst-intercepts"),
- intercepts_dir)
+ shutil.copytree(postinst_intercepts_dir, intercepts_dir)
shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"),
self.deploy_dir_image +