From 19cd7a1776df6610cf9721275d6ef69115f9426a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 3 Apr 2018 18:45:19 +0300 Subject: package_manager.py: move postinst_intercept dir initialization from RootFS to PackageManager class This will allow handling postinst_intercepts when populating SDKs (which use PackageManager class directly, and do not utilize RootFS class). (From OE-Core rev: 9454fd328040fd58c981d028a74fcf181bde8e89) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'meta/lib/oe/rootfs.py') diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index bf2aea2b25..600a685d68 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -178,20 +178,10 @@ class Rootfs(object, metaclass=ABCMeta): post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND") rootfs_post_install_cmds = self.d.getVar('ROOTFS_POSTINSTALL_COMMAND') - postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR") - if not postinst_intercepts_dir: - postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts") - intercepts_dir = os.path.join(self.d.getVar('WORKDIR'), - "intercept_scripts") - - bb.utils.remove(intercepts_dir, True) - bb.utils.mkdirhier(self.image_rootfs) bb.utils.mkdirhier(self.deploydir) - shutil.copytree(postinst_intercepts_dir, intercepts_dir) - execute_pre_post_process(self.d, pre_process_cmds) if self.progress_reporter: @@ -312,8 +302,7 @@ class Rootfs(object, metaclass=ABCMeta): def _run_intercepts(self): - intercepts_dir = os.path.join(self.d.getVar('WORKDIR'), - "intercept_scripts") + intercepts_dir = self.pm.intercepts_dir bb.note("Running intercept scripts:") os.environ['D'] = self.image_rootfs -- cgit v1.2.3-54-g00ecf