diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2014-09-17 00:43:09 +0200 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2015-02-23 17:15:52 +0100 |
commit | 65e8fbe02533e8f713755ea2576cbbe8d2af93ea (patch) | |
tree | 759f41423fe9622daf94495864991c38fa6d5595 | |
parent | 126f3214ca0b9a183332da750ec12185240bf215 (diff) | |
download | openembedded-core-contrib-65e8fbe02533e8f713755ea2576cbbe8d2af93ea.tar.gz |
update-alternatives.bbclass: alternatives should be removed in prerm
This behaviour matches dpkg's manpage and fixes deinstalling
alternatives for programs needed by the postrm script, e.g. /bin/sh.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r-- | meta/classes/update-alternatives.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 4476ea6509..2cb982571f 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -222,16 +222,16 @@ python populate_packages_updatealternatives () { #bb.note('adding runtime requirement for update-alternatives for %s' % pkg) d.appendVar('RDEPENDS_%s' % pkg, ' ' + d.getVar('MLPREFIX') + provider) - bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg) + bb.note('adding update-alternatives calls to postinst/prerm for %s' % pkg) bb.note('%s' % alt_setup_links) postinst = d.getVar('pkg_postinst_%s' % pkg, True) or '#!/bin/sh\n' postinst += alt_setup_links d.setVar('pkg_postinst_%s' % pkg, postinst) bb.note('%s' % alt_remove_links) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or '#!/bin/sh\n' - postrm += alt_remove_links - d.setVar('pkg_postrm_%s' % pkg, postrm) + prerm = d.getVar('pkg_prerm_%s' % pkg, True) or '#!/bin/sh\n' + prerm += alt_remove_links + d.setVar('pkg_prerm_%s' % pkg, prerm) } python package_do_filedeps_append () { |