aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib
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 17:13:19 +0100
commit77f7c75481dceec36b7373f277c3bac811de9ef2 (patch)
tree3f2b59aafef2f9953cc84fa933649014ff58aef7 /meta/lib
parent07343ff6282dd18432ecee5d9b80ad1fb86217f1 (diff)
downloadopenembedded-core-contrib-77f7c75481dceec36b7373f277c3bac811de9ef2.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. Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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):
if script == "postinst_intercept" or not os.access(script_full, os.X_OK):
continue
- if script == "delay_to_first_boot":
+ # we do not want to run any multilib variant of this
+ if script.startswith("delay_to_first_boot"):
self._postpone_to_first_boot(script_full)
continue