From 7cb951a803deca151344d905bf2fab038e72e0d0 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 19 Jan 2017 14:28:48 +0200 Subject: Revert "classes: Fix alternatives and rc.d ordering" This kludge is not needed anymore, now that syslog packages (or any other package) don't use update-alternatives for managing SysV init scripts. This reverts commit fc89a3f739ff25306ea91d9bdb424fc8389bdf72. [YOCTO #10944] --- meta/classes/update-alternatives.bbclass | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'meta/classes/update-alternatives.bbclass') diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 4bba76c3ba..65cae7002f 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -201,8 +201,8 @@ python populate_packages_updatealternatives () { pkgdest = d.getVar('PKGD') for pkg in (d.getVar('PACKAGES') or "").split(): # Create post install/removal scripts - alt_setup_links = "# Begin section update-alternatives\n" - alt_remove_links = "# Begin section update-alternatives\n" + alt_setup_links = "" + alt_remove_links = "" for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name) alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name) @@ -225,13 +225,10 @@ python populate_packages_updatealternatives () { # Default to generate shell script.. eventually we may want to change this... alt_target = os.path.normpath(alt_target) - alt_setup_links += 'update-alternatives --install %s %s %s %s\n' % (alt_link, alt_name, alt_target, alt_priority) - alt_remove_links += 'update-alternatives --remove %s %s\n' % (alt_name, alt_target) + alt_setup_links += '\tupdate-alternatives --install %s %s %s %s\n' % (alt_link, alt_name, alt_target, alt_priority) + alt_remove_links += '\tupdate-alternatives --remove %s %s\n' % (alt_name, alt_target) - alt_setup_links += "# End section update-alternatives\n" - alt_remove_links += "# End section update-alternatives\n" - - if len(alt_setup_links.splitlines()) > 2: + if alt_setup_links: # RDEPENDS setup provider = d.getVar('VIRTUAL-RUNTIME_update-alternatives') if provider: @@ -241,24 +238,12 @@ python populate_packages_updatealternatives () { 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) or '#!/bin/sh\n' - postinst = postinst.splitlines(True) - try: - index = postinst.index('# Begin section update-rc.d\n') - postinst.insert(index, alt_setup_links) - except ValueError: - postinst.append(alt_setup_links) - postinst = ''.join(postinst) + postinst += alt_setup_links d.setVar('pkg_postinst_%s' % pkg, postinst) bb.note('%s' % alt_remove_links) prerm = d.getVar('pkg_prerm_%s' % pkg) or '#!/bin/sh\n' - prerm = prerm.splitlines(True) - try: - index = prerm.index('# End section update-rc.d\n') - prerm.insert(index + 1, alt_remove_links) - except ValueError: - prerm.append(alt_remove_links) - prerm = ''.join(prerm) + prerm += alt_remove_links d.setVar('pkg_prerm_%s' % pkg, prerm) } -- cgit 1.2.3-korg