classes: Fix alternatives and rc.d ordering
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] Changes since v5: - Remove boolean in d.getVar() calls (From OE-Core rev: aa87b1a4dcc14e4dfe719b6c55045c5662bc59c2) Signed-off-by: David Vincent <freesilicon@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
02f89167a3
commit
fc89a3f739
|
@ -195,8 +195,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 = ""
|
||||
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) 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)
|
||||
|
@ -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')
|
||||
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) 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) 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)
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
if not postinst:
|
||||
postinst = '#!/bin/sh\n'
|
||||
postinst += localdata.getVar('updatercd_postinst')
|
||||
postinst = postinst.splitlines(True)
|
||||
try:
|
||||
index = postinst.index('# End section update-alternatives\n')
|
||||
postinst.insert(index + 1, localdata.getVar('updatercd_postinst'))
|
||||
except ValueError:
|
||||
postinst.append(localdata.getVar('updatercd_postinst'))
|
||||
postinst = ''.join(postinst)
|
||||
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
||||
|
||||
prerm = d.getVar('pkg_prerm_%s' % pkg)
|
||||
if not prerm:
|
||||
prerm = '#!/bin/sh\n'
|
||||
prerm += localdata.getVar('updatercd_prerm')
|
||||
prerm = prerm.splitlines(True)
|
||||
try:
|
||||
index = prerm.index('# Begin section update-alternatives\n')
|
||||
prerm.insert(index, localdata.getVar('updatercd_prerm'))
|
||||
except ValueError:
|
||||
prerm.append(localdata.getVar('updatercd_prerm'))
|
||||
prerm = ''.join(prerm)
|
||||
d.setVar('pkg_prerm_%s' % pkg, prerm)
|
||||
|
||||
postrm = d.getVar('pkg_postrm_%s' % pkg)
|
||||
|
|
Loading…
Reference in New Issue