summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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):
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 +