From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wj0-f196.google.com (mail-wj0-f196.google.com [209.85.210.196]) by mail.openembedded.org (Postfix) with ESMTP id 11DF871A6C for ; Mon, 12 Dec 2016 16:02:48 +0000 (UTC) Received: by mail-wj0-f196.google.com with SMTP id j10so12322165wjb.3 for ; Mon, 12 Dec 2016 08:02:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EMqWgp+nJ6fRDyLwNsuW4vBl6CADi41Qwx/achmytI4=; b=UvCwf7mtG3//KQURpuE6WD8bTR7wlqf1fvbeA4J0cXXfaXyh8Vi5/oIc2d20+Q/CyS usFDfEIDgyLLUQ+xBNlYNNDhsh2HVnVyxsCZFIDNrEjChgXjU5yHbqeRmBKhCq4kVNS7 ieUh5ckqwUYAgVVZJexA52T/XOUV2vwsLffIPBGeA6kfmJ12ii74/ZKjKOiie7WkIQDR PGTTa0bUdwm75q/vcehUPycC1cZP1wlAL7e3UkyVmcPkpP4UBT0rTWYUlbkzgUigHCUB Ri5Jlw6Co2poQxnb4QrCjpipZM5riURj3sZtYuSm4FZVmYvFDsgYMKkgA9ClcgPsMVAM t+Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EMqWgp+nJ6fRDyLwNsuW4vBl6CADi41Qwx/achmytI4=; b=RUaQVkfHgrKKFA0t+/prIrDmYkzXdLbpHhNhhsy1q3hdnH9htwB9bLKPz/1PBToyNh kIaGbcfnf1CWngeKhKjNbEQWJdeiRm3fFV2rzzDeFS1/rMAJaE3kYJ4cIyh16Gdmku9D kzhLr+hFN/6kSENV0CDTfVotf6EifyOnzjzf3UpEStpP3+leDHxKNdhzvr4JNL2ORQRM w4hBcJnhde5iMEH53GOdbKgUm9vo+14cnCaLmh5Vv+0UEFyuTBfQNp3/OxrKr5iBZwUO Wq1NZfpldPPFTzXqekL4yZR9Wgb5QEmLFlhNBMYcHN8Rci7ppbNNqRIgVqeiaqlmnHqb JZEA== X-Gm-Message-State: AKaTC02nYVR6IWgZ3F0pd1u6QhtVcGVh9knPNZo+/fq/N5JG3VcyPDWkhEsnYK8Voekr6w== X-Received: by 10.194.141.239 with SMTP id rr15mr77604896wjb.144.1481558569788; Mon, 12 Dec 2016 08:02:49 -0800 (PST) Received: from localhost.localdomain ([185.47.80.46]) by smtp.gmail.com with ESMTPSA id z6sm57839465wjt.24.2016.12.12.08.02.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Dec 2016 08:02:49 -0800 (PST) From: David Vincent To: openembedded-core@lists.openembedded.org, haris.okanovic@ni.com, markus.lehtonen@linux.intel.com Date: Mon, 12 Dec 2016 17:01:48 +0100 Message-Id: <20161212160148.9248-1-freesilicon@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161128161150.28655-2-freesilicon@gmail.com> References: <20161128161150.28655-2-freesilicon@gmail.com> Subject: [PATCH v5] classes: Fix alternatives and rc.d ordering X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2016 16:02:49 -0000 When using an alternative as an initscript, the ordering between update-rc.d and update-alternatives tasks during prerm and postinst tasks must always be the following in order to work: * prerm: - stop daemon - remove alternative * postinst: - add alternative - start daemon This patchset adds comments to the scripts generated by both classes and organize the generated sections based on those comments. [YOCTO #10433] Signed-off-by: David Vincent --- meta/classes/update-alternatives.bbclass | 29 ++++++++++++++++++++++------- meta/classes/update-rc.d.bbclass | 20 ++++++++++++++++++-- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 1fdd681315..65929e5555 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -195,8 +195,8 @@ python populate_packages_updatealternatives () { pkgdest = d.getVar('PKGD', True) for pkg in (d.getVar('PACKAGES', True) or "").split(): # Create post install/removal scripts - alt_setup_links = "" - alt_remove_links = "" + alt_setup_links = "# Begin section update-alternatives\n" + alt_remove_links = "# Begin section update-alternatives\n" for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg, True) or "").split(): alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name, True) alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name, True) @@ -219,10 +219,13 @@ 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 += '\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 += '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) - if alt_setup_links: + alt_setup_links += "# End section update-alternatives\n" + alt_remove_links += "# End section update-alternatives\n" + + if len(alt_setup_links.splitlines()) > 2: # RDEPENDS setup provider = d.getVar('VIRTUAL-RUNTIME_update-alternatives', True) if provider: @@ -232,12 +235,24 @@ 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, True) or '#!/bin/sh\n' - postinst += alt_setup_links + 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) d.setVar('pkg_postinst_%s' % pkg, postinst) bb.note('%s' % alt_remove_links) prerm = d.getVar('pkg_prerm_%s' % pkg, True) or '#!/bin/sh\n' - prerm += alt_remove_links + 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) d.setVar('pkg_prerm_%s' % pkg, prerm) } diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 2c3ef9edd1..530de87270 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -35,6 +35,7 @@ fi } updatercd_postinst() { +# Begin section update-rc.d if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then if [ -n "$D" ]; then OPT="-r $D" @@ -43,12 +44,15 @@ if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then fi update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} fi +# End section update-rc.d } updatercd_prerm() { +# Begin section update-rc.d if ${@use_updatercd(d)} && [ -z "$D" -a -x "${INIT_D_DIR}/${INITSCRIPT_NAME}" ]; then ${INIT_D_DIR}/${INITSCRIPT_NAME} stop || : fi +# End section update-rc.d } updatercd_postrm() { @@ -111,13 +115,25 @@ python populate_packages_updatercd () { postinst = d.getVar('pkg_postinst_%s' % pkg, True) if not postinst: postinst = '#!/bin/sh\n' - postinst += localdata.getVar('updatercd_postinst', True) + postinst = postinst.splitlines(True) + try: + index = postinst.index('# End section update-alternatives\n') + postinst.insert(index + 1, localdata.getVar('updatercd_postinst', True)) + except ValueError: + postinst.append(localdata.getVar('updatercd_postinst', True)) + postinst = ''.join(postinst) d.setVar('pkg_postinst_%s' % pkg, postinst) prerm = d.getVar('pkg_prerm_%s' % pkg, True) if not prerm: prerm = '#!/bin/sh\n' - prerm += localdata.getVar('updatercd_prerm', True) + prerm = prerm.splitlines(True) + try: + index = prerm.index('# Begin section update-alternatives\n') + prerm.insert(index, localdata.getVar('updatercd_prerm', True)) + except ValueError: + prerm.append(localdata.getVar('updatercd_prerm', True)) + prerm = ''.join(prerm) d.setVar('pkg_prerm_%s' % pkg, prerm) postrm = d.getVar('pkg_postrm_%s' % pkg, True) -- 2.11.0