From: Joe Slater Date: Thu, 21 Jun 2018 18:22:17 +0000 (-0700) Subject: postinst-intercepts: do not execute any variant of delay_to_first_boot X-Git-Tag: uninative-2.2~228 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=77f7c75481dceec36b7373f277c3bac811de9ef2;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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