mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-24 22:36:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

update-rc.d.bbclass: Cleanup package scripts

Browse Source 
* Add proper preinst script
* Use -n "$D"/-z "$D" checks throughout the scripts
* Only set OPT in cases where its used
* Don't pass unnecessary -f to update-rc.d in postrm script
* Remove outdated comment

(From OE-Core rev: 2d9114aaf130179cb13c20c8b045c2694eca6fd9)

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jacob Kroon
2013-10-30 01:57:11 +01:00
committed by Richard Purdie
parent 452b23a3bb
commit 717c1ed719
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,13 +12,11 @@ INITSCRIPT_PARAMS ?= "defaults"
INIT_D_DIR = "${sysconfdir}/init.d" INIT_D_DIR = "${sysconfdir}/init.d"
updatercd_postinst() { updatercd_preinst() {
# test if there is a previous init script there, ie, we are updating the package
# if so, we stop the service and remove it before we install from the new package
if type update-rc.d >/dev/null 2>/dev/null; then
if [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}" ]; then if [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}" ]; then
${INIT_D_DIR}/${INITSCRIPT_NAME} stop ${INIT_D_DIR}/${INITSCRIPT_NAME} stop
fi fi
if type update-rc.d >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then if [ -n "$D" ]; then
OPT="-f -r $D" OPT="-f -r $D"
else else
@@ -26,30 +24,32 @@ if type update-rc.d >/dev/null 2>/dev/null; then
fi fi
update-rc.d $OPT ${INITSCRIPT_NAME} remove update-rc.d $OPT ${INITSCRIPT_NAME} remove
fi fi
}
updatercd_postinst() {
if type update-rc.d >/dev/null 2>/dev/null; then
if [ -n "$D" ]; then if [ -n "$D" ]; then
OPT="-r $D" OPT="-r $D"
else else
OPT="-s" OPT="-s"
fi fi
if type update-rc.d >/dev/null 2>/dev/null; then
update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
fi fi
} }
updatercd_prerm() { updatercd_prerm() {
if test "x$D" = "x"; then if [ -z "$D" ]; then
${INIT_D_DIR}/${INITSCRIPT_NAME} stop ${INIT_D_DIR}/${INITSCRIPT_NAME} stop
fi fi
} }
updatercd_postrm() { updatercd_postrm() {
if test "$D" != ""; then if type update-rc.d >/dev/null 2>/dev/null; then
OPT="-f -r $D" if [ -n "$D" ]; then
OPT="-r $D"
else else
OPT="" OPT=""
fi fi
if type update-rc.d >/dev/null 2>/dev/null; then
update-rc.d $OPT ${INITSCRIPT_NAME} remove update-rc.d $OPT ${INITSCRIPT_NAME} remove
fi fi
} }
@@ -68,22 +68,23 @@ python __anonymous() {
PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd " PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd "
populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst" populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst"
python populate_packages_updatercd () { python populate_packages_updatercd () {
def update_rcd_package(pkg): def update_rcd_package(pkg):
bb.debug(1, 'adding update-rc.d calls to postinst/postrm for %s' % pkg) bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg)
"""
update_rc.d postinst is appended here because pkg_postinst may require to
execute on the target. Not doing so may cause update_rc.d postinst invoked
twice to cause unwanted warnings.
"""
localdata = bb.data.createCopy(d) localdata = bb.data.createCopy(d)
overrides = localdata.getVar("OVERRIDES", True) overrides = localdata.getVar("OVERRIDES", True)
localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides)) localdata.setVar("OVERRIDES", "%s:%s" % (pkg, overrides))
bb.data.update_data(localdata) bb.data.update_data(localdata)
preinst = d.getVar('pkg_preinst_%s' % pkg, True)
if not preinst:
preinst = '#!/bin/sh\n'
preinst += localdata.getVar('updatercd_preinst', True)
d.setVar('pkg_preinst_%s' % pkg, preinst)
postinst = d.getVar('pkg_postinst_%s' % pkg, True) postinst = d.getVar('pkg_postinst_%s' % pkg, True)
if not postinst: if not postinst:
postinst = '#!/bin/sh\n' postinst = '#!/bin/sh\n'