summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-01-23 17:17:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-26 13:39:37 +0000
commit32309ba1de62aca484170a61c25cb595cc91812a (patch)
tree02eb2c3909b090f53ba875f0687e65851faa9bb2 /meta/lib
parent206ce1c31ca02dc6fea92ecb3acf57c2437d87fc (diff)
downloadpoky-32309ba1de62aca484170a61c25cb595cc91812a.tar.gz
lib/oe/package_manager: turn postinst_intercept warnings into failures for nativesdk
The few cases where they failed should be now all fixed. The only allowed exception is when building mingw32 SDKs, as there is currently no support for running postinst_intercepts through wine. (From OE-Core rev: 3dd2fea51110950ec3d8c444f599ff855b4b936c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 1087144d47..f26f597d03 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -439,6 +439,11 @@ class PackageManager(object, metaclass=ABCMeta):
439 self._postpone_to_first_boot(script_full) 439 self._postpone_to_first_boot(script_full)
440 continue 440 continue
441 441
442 if populate_sdk == 'host' and self.d.getVar('SDK_OS') == 'mingw32':
443 bb.warn("The postinstall intercept hook '%s' could not be executed due to missing wine support, details in %s/log.do_%s"
444 % (script, self.d.getVar('T'), self.d.getVar('BB_CURRENTTASK')))
445 continue
446
442 bb.note("> Executing %s intercept ..." % script) 447 bb.note("> Executing %s intercept ..." % script)
443 448
444 try: 449 try:
@@ -447,7 +452,7 @@ class PackageManager(object, metaclass=ABCMeta):
447 except subprocess.CalledProcessError as e: 452 except subprocess.CalledProcessError as e:
448 bb.note("Exit code %d. Output:\n%s" % (e.returncode, e.output.decode("utf-8"))) 453 bb.note("Exit code %d. Output:\n%s" % (e.returncode, e.output.decode("utf-8")))
449 if populate_sdk == 'host': 454 if populate_sdk == 'host':
450 bb.warn("The postinstall intercept hook '%s' failed, details in %s/log.do_%s" % (script, self.d.getVar('T'), self.d.getVar('BB_CURRENTTASK'))) 455 bb.fatal("The postinstall intercept hook '%s' failed, details in %s/log.do_%s" % (script, self.d.getVar('T'), self.d.getVar('BB_CURRENTTASK')))
451 elif populate_sdk == 'target': 456 elif populate_sdk == 'target':
452 if "qemuwrapper: qemu usermode is not supported" in e.output.decode("utf-8"): 457 if "qemuwrapper: qemu usermode is not supported" in e.output.decode("utf-8"):
453 bb.warn("The postinstall intercept hook '%s' could not be executed due to missing qemu usermode support, details in %s/log.do_%s" 458 bb.warn("The postinstall intercept hook '%s' could not be executed due to missing qemu usermode support, details in %s/log.do_%s"