summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-29 14:01:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-30 11:50:12 +0000
commit7bc55b29609765904af9f330600229e96cc044cf (patch)
tree2132f0703d295c3b234d3c56bb288f8f1b975ad9
parent6ca669105ff7f405e85142d1aa5375a8430c9606 (diff)
downloadpoky-7bc55b29609765904af9f330600229e96cc044cf.tar.gz
meta/lib/oe/package_manager.py: deprecate 'exit 1' as a way to defer to first boot
'exit 1' is not optimal for two reasons: 1) Code is hard to read; it is not obvious that it means 'defer what follows to first boot'. 2) Worse, this hides actual errors in the scriptlets; there is no difference between scriptlet failing because it's intended to be run on target and scriptlet failing because there's a bug or a regression somewhere. The new, supported way is to place the code that has to run on target into pkg_postinst_ontarget(), or, if a more fine-tuned control is required, call 'postinst-intercepts defer_to_first_boot' from pkg_postinst() to explicitly request deferral to first boot. (From OE-Core rev: d12cf56e9ff2a4f13dfbef9290ea5647b52b3f6d) 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/package_manager.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 2a07f0e39a..f7e013437c 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -604,6 +604,9 @@ class RpmPM(PackageManager):
604 if line.startswith("Non-fatal POSTIN scriptlet failure in rpm package"): 604 if line.startswith("Non-fatal POSTIN scriptlet failure in rpm package"):
605 failed_scriptlets_pkgnames[line.split()[-1]] = True 605 failed_scriptlets_pkgnames[line.split()[-1]] = True
606 606
607 if len(failed_scriptlets_pkgnames) > 0:
608 bb.warn("Intentionally failing postinstall scriptlets of %s to defer them to first boot is deprecated. Please place them into pkg_postinst_ontarget_${PN} ()." %(list(failed_scriptlets_pkgnames.keys())))
609 bb.warn("If deferring to first boot wasn't the intent, then scriptlet failure may mean an issue in the recipe, or a regression elsewhere.")
607 for pkg in failed_scriptlets_pkgnames.keys(): 610 for pkg in failed_scriptlets_pkgnames.keys():
608 self.save_rpmpostinst(pkg) 611 self.save_rpmpostinst(pkg)
609 612