summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2018-06-21 11:22:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-02 21:37:47 +0100
commit058119da17c3ceb35d5b9f106f410320bdf3986b (patch)
treed17563c35b36dc8ed689229620963d0b24d3a948 /meta/lib/oe
parent42b3761274d53802184f16efec73ab008feb6e3d (diff)
downloadpoky-058119da17c3ceb35d5b9f106f410320bdf3986b.tar.gz
postinst-intercepts: do not execute any variant of delay_to_first_boot
As of commit 2c5c6e3ff we create multilib variants of intercept hooks but we did not account for delay_to_first_boot variants. This was covered up until commit a335e7867, but will now cause an error. (From OE-Core rev: 77f7c75481dceec36b7373f277c3bac811de9ef2) Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 20a41d53f8..9aa5847c8a 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -382,7 +382,8 @@ class PackageManager(object, metaclass=ABCMeta):
382 if script == "postinst_intercept" or not os.access(script_full, os.X_OK): 382 if script == "postinst_intercept" or not os.access(script_full, os.X_OK):
383 continue 383 continue
384 384
385 if script == "delay_to_first_boot": 385 # we do not want to run any multilib variant of this
386 if script.startswith("delay_to_first_boot"):
386 self._postpone_to_first_boot(script_full) 387 self._postpone_to_first_boot(script_full)
387 continue 388 continue
388 389