mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 15:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "classes: Fix alternatives and rc.d ordering"

Browse Source 
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 fc89a3f739.

[YOCTO #10944]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Lehtonen
2017-01-19 14:28:48 +02:00
committed by Richard Purdie
parent 68f020f368
commit a779b1d9fb
2 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes/update-rc.d.bbclass
View File

@@ -37,7 +37,6 @@ fi
PACKAGE_WRITE_DEPS += "update-rc.d-native"
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"
@@ -46,15 +45,12 @@ 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() {
@@ -115,25 +111,13 @@ python populate_packages_updatercd () {
postinst = d.getVar('pkg_postinst_%s' % pkg)
if not postinst:
postinst = '#!/bin/sh\n'
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)
postinst += localdata.getVar('updatercd_postinst')
d.setVar('pkg_postinst_%s' % pkg, postinst)
prerm = d.getVar('pkg_prerm_%s' % pkg)
if not prerm:
prerm = '#!/bin/sh\n'
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)
prerm += localdata.getVar('updatercd_prerm')
d.setVar('pkg_prerm_%s' % pkg, prerm)
postrm = d.getVar('pkg_postrm_%s' % pkg)