|
@@ -20,28 +20,14 @@ def use_updatercd(d):
|
|
return '[ -n "$D" -o ! -d /run/systemd/system ]'
|
|
return '[ -n "$D" -o ! -d /run/systemd/system ]'
|
|
return 'true'
|
|
return 'true'
|
|
|
|
|
|
-updatercd_preinst() {
|
|
|
|
-if ${@use_updatercd(d)} && [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_NAME}" ]; then
|
|
|
|
- ${INIT_D_DIR}/${INITSCRIPT_NAME} stop || :
|
|
|
|
-fi
|
|
|
|
-if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
|
|
|
|
- if [ -n "$D" ]; then
|
|
|
|
- OPT="-f -r $D"
|
|
|
|
- else
|
|
|
|
- OPT="-f"
|
|
|
|
- fi
|
|
|
|
- update-rc.d $OPT ${INITSCRIPT_NAME} remove
|
|
|
|
-fi
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
PACKAGE_WRITE_DEPS += "update-rc.d-native"
|
|
PACKAGE_WRITE_DEPS += "update-rc.d-native"
|
|
|
|
|
|
updatercd_postinst() {
|
|
updatercd_postinst() {
|
|
if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
|
|
if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
|
|
if [ -n "$D" ]; then
|
|
if [ -n "$D" ]; then
|
|
- OPT="-f -r $D"
|
|
|
|
|
|
+ OPT="-r $D"
|
|
else
|
|
else
|
|
- OPT="-f -s"
|
|
|
|
|
|
+ OPT="-s"
|
|
fi
|
|
fi
|
|
update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
|
|
update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
|
|
fi
|
|
fi
|
|
@@ -79,7 +65,7 @@ python __anonymous() {
|
|
PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}"
|
|
PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}"
|
|
PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
|
|
PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
|
|
|
|
|
|
-populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_preinst updatercd_postinst"
|
|
|
|
|
|
+populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst"
|
|
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
|
|
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
|
|
|
|
|
|
python populate_packages_updatercd () {
|
|
python populate_packages_updatercd () {
|
|
@@ -95,7 +81,7 @@ python populate_packages_updatercd () {
|
|
d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
|
|
d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
|
|
|
|
|
|
def update_rcd_package(pkg):
|
|
def update_rcd_package(pkg):
|
|
- bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg)
|
|
|
|
|
|
+ bb.debug(1, 'adding update-rc.d calls to postinst/prerm/postrm for %s' % pkg)
|
|
|
|
|
|
localdata = bb.data.createCopy(d)
|
|
localdata = bb.data.createCopy(d)
|
|
overrides = localdata.getVar("OVERRIDES")
|
|
overrides = localdata.getVar("OVERRIDES")
|
|
@@ -103,12 +89,6 @@ python populate_packages_updatercd () {
|
|
|
|
|
|
update_rcd_auto_depend(pkg)
|
|
update_rcd_auto_depend(pkg)
|
|
|
|
|
|
- preinst = d.getVar('pkg_preinst_%s' % pkg)
|
|
|
|
- if not preinst:
|
|
|
|
- preinst = '#!/bin/sh\n'
|
|
|
|
- preinst += localdata.getVar('updatercd_preinst')
|
|
|
|
- d.setVar('pkg_preinst_%s' % pkg, preinst)
|
|
|
|
-
|
|
|
|
postinst = d.getVar('pkg_postinst_%s' % pkg)
|
|
postinst = d.getVar('pkg_postinst_%s' % pkg)
|
|
if not postinst:
|
|
if not postinst:
|
|
postinst = '#!/bin/sh\n'
|
|
postinst = '#!/bin/sh\n'
|