mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

oe.package_manager: support loading intercepts from multiple paths

Browse Source 
- if POSTINST_INTERCEPTS is set, use the listed intercept files, or
- if POSTINST_INTERCEPTS_PATH is set, load from the listed paths, or
- if POSTINST_INTERCEPTS_DIR is set, load from it (for compatibility), or
- load from ${COREBASE}/meta/postinst-intercepts

(From OE-Core rev: 9ba2f2b1df277b2b881f68166d9cd1c19db66e23)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Christopher Larson
2018-07-27 22:24:27 +05:00
committed by Richard Purdie
parent 9897d02e13
commit 85518a2001
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/package_manager.py
+13 -6
View File
@@ -379,17 +379,24 @@ class PackageManager(object, metaclass=ABCMeta):
def _initialize_intercepts(self):
bb.note("Initializing intercept dir for %s" % self.target_rootfs)
postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR")
if not postinst_intercepts_dir:
postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts")
# As there might be more than one instance of PackageManager operating at the same time
# we need to isolate the intercept_scripts directories from each other,
# hence the ugly hash digest in dir name.
self.intercepts_dir = os.path.join(self.d.getVar('WORKDIR'),
"intercept_scripts-%s" %(hashlib.sha256(self.target_rootfs.encode()).hexdigest()) )
self.intercepts_dir = os.path.join(self.d.getVar('WORKDIR'), "intercept_scripts-%s" %
(hashlib.sha256(self.target_rootfs.encode()).hexdigest()))
postinst_intercepts = (self.d.getVar("POSTINST_INTERCEPTS") or "").split()
if not postinst_intercepts:
postinst_intercepts_path = self.d.getVar("POSTINST_INTERCEPTS_PATH")
if not postinst_intercepts_path:
postinst_intercepts_path = self.d.getVar("POSTINST_INTERCEPTS_DIR") or self.d.expand("${COREBASE}/scripts/postinst-intercepts")
postinst_intercepts = oe.path.which_wild('*', postinst_intercepts_path)
bb.debug(1, 'Collected intercepts:\n%s' % ''.join(' %s\n' % i for i in postinst_intercepts))
bb.utils.remove(self.intercepts_dir, True)
shutil.copytree(postinst_intercepts_dir, self.intercepts_dir)
bb.utils.mkdirhier(self.intercepts_dir)
for intercept in postinst_intercepts:
bb.utils.copyfile(intercept, os.path.join(self.intercepts_dir, os.path.basename(intercept)))
@abstractmethod
def _handle_intercept_failure(self, failed_script):