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 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 +