diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-12 18:49:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-15 06:27:18 -0700 |
commit | c64a57d2ecad041e2eea7bde46aab8269b31fc15 (patch) | |
tree | 7f1f199a008e225dc3b0762a0ac68610d769d1d4 /meta/classes/package.bbclass | |
parent | 6d71fdbf204837846b2f29f048f9215a3433f3ec (diff) | |
download | poky-c64a57d2ecad041e2eea7bde46aab8269b31fc15.tar.gz |
package.bbclass: run pre/post installation/removal scriptlets using sh -e
This allows catching errors in the scriptlets which would otherwise
go unnoticed, e.g. this sequence:
====
bogus_command
proper_command
====
would work just fine without any visible warnings or errors.
This was previously done only for rpm packages; this patch replaces
the rpm-specific tweak with one that works for all package types.
(From OE-Core rev: a0aa12e1d0ea9064b8dd816d4e82238df765506b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 317c77585f..83f53a49ef 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1343,6 +1343,17 @@ fi | |||
1343 | postinst += postinst_ontarget | 1343 | postinst += postinst_ontarget |
1344 | d.setVar('pkg_postinst_%s' % pkg, postinst) | 1344 | d.setVar('pkg_postinst_%s' % pkg, postinst) |
1345 | 1345 | ||
1346 | def add_set_e_to_scriptlets(pkg): | ||
1347 | for scriptlet_name in ('pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm'): | ||
1348 | scriptlet = d.getVar('%s_%s' % (scriptlet_name, pkg)) | ||
1349 | if scriptlet: | ||
1350 | scriptlet_split = scriptlet.split('\n') | ||
1351 | if scriptlet_split[0].startswith("#!"): | ||
1352 | scriptlet = scriptlet_split[0] + "\nset -e\n" + "\n".join(scriptlet_split[1:]) | ||
1353 | else: | ||
1354 | scriptlet = "set -e\n" + "\n".join(scriptlet_split[0:]) | ||
1355 | d.setVar('%s_%s' % (scriptlet_name, pkg), scriptlet) | ||
1356 | |||
1346 | def write_if_exists(f, pkg, var): | 1357 | def write_if_exists(f, pkg, var): |
1347 | def encode(str): | 1358 | def encode(str): |
1348 | import codecs | 1359 | import codecs |
@@ -1439,6 +1450,7 @@ fi | |||
1439 | write_if_exists(sf, pkg, 'FILES') | 1450 | write_if_exists(sf, pkg, 'FILES') |
1440 | write_if_exists(sf, pkg, 'CONFFILES') | 1451 | write_if_exists(sf, pkg, 'CONFFILES') |
1441 | process_postinst_on_target(pkg, d.getVar("MLPREFIX")) | 1452 | process_postinst_on_target(pkg, d.getVar("MLPREFIX")) |
1453 | add_set_e_to_scriptlets(pkg) | ||
1442 | write_if_exists(sf, pkg, 'pkg_postinst') | 1454 | write_if_exists(sf, pkg, 'pkg_postinst') |
1443 | write_if_exists(sf, pkg, 'pkg_postrm') | 1455 | write_if_exists(sf, pkg, 'pkg_postrm') |
1444 | write_if_exists(sf, pkg, 'pkg_preinst') | 1456 | write_if_exists(sf, pkg, 'pkg_preinst') |