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-07 16:10:45 +0100
commit7d08d2d5c0ae686e3bb8732ea82f30fd189b1cd8 (patch)
tree342b99d5612b1a2fc6cffba5f028f3222d2ec41c
parent8402958cd2cb87b8283c8ee4e2d08e1a6717d67a (diff)
downloadopenembedded-core-contrib-7d08d2d5c0ae686e3bb8732ea82f30fd189b1cd8.tar.gz
openembedded-core-contrib-7d08d2d5c0ae686e3bb8732ea82f30fd189b1cd8.tar.bz2
openembedded-core-contrib-7d08d2d5c0ae686e3bb8732ea82f30fd189b1cd8.zip
rootfs.py: Allow to override postinst-intercepts location
* useful when we need to overlay/extend intercept scripts from oe-core 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.py6
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):
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")
@@ -173,8 +176,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 +