[oe-commits] Andreas Oberritter : update-alternatives.bbclass: alternatives should be removed in prerm
git at git.openembedded.org
git at git.openembedded.org
Thu Apr 2 11:03:45 UTC 2015
Module: openembedded-core.git
Branch: master-next-1.9
Commit: 2a5484a90513b58c829a916bfe5268a0fde3512a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2a5484a90513b58c829a916bfe5268a0fde3512a
Author: Andreas Oberritter <obi at opendreambox.org>
Date: Mon Mar 23 20:10:51 2015 +0100
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 at opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/update-alternatives.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 9f2c250..e6d7870 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -229,16 +229,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 () {
More information about the Openembedded-commits
mailing list