summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-29 14:01:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-30 11:50:12 +0000
commit32c500b8ea2c8c76edf35a860477be34af72c499 (patch)
tree0a7026e9e17e7b009db65885bf3435560d20534b
parent4c808e31ea3506e2f603e0afd068dd98af032f02 (diff)
downloadpoky-32c500b8ea2c8c76edf35a860477be34af72c499.tar.gz
meta/lib/oe/rootfs.py: do not execute defer_to_first_boot when processing postinst_intercept hooks
That hook is empty, and doesn't need to be executed; it merely indicates that packages that have used it are requesting to defer their postinst scripts to first boot unconditionally. (From OE-Core rev: 939f7f1a06cd2db05aeb5e75a66322314e10aa6d) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index d3ec8a56c4..8bf77aea49 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -324,6 +324,10 @@ class Rootfs(object, metaclass=ABCMeta):
324 if script == "postinst_intercept" or not os.access(script_full, os.X_OK): 324 if script == "postinst_intercept" or not os.access(script_full, os.X_OK):
325 continue 325 continue
326 326
327 if script == "delay_to_first_boot":
328 self._postpone_to_first_boot(script_full)
329 continue
330
327 bb.note("> Executing %s intercept ..." % script) 331 bb.note("> Executing %s intercept ..." % script)
328 332
329 try: 333 try: