From d69d193a962e65c1ef8d22350d899431cde434ef Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 7 Feb 2013 14:54:13 -0800 Subject: [PATCH] Revert: update-rc.d: disable update-rc.d.bbclass when systemd enabled This was just wrong - when systemd is being used there'll still be packages that use SysV-style init scripts, which systemd supports fine. This reverts commit b94227f7290796f6ebbe5c5ff1680b9b689022b1. (From OE-Core rev: 3f50b61c77406f87d36437cca53573f86f314641) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/update-rc.d.bbclass | 87 ++++++++++++++++++++++++++- meta/classes/update-rc.d_real.bbclass | 86 -------------------------- 2 files changed, 86 insertions(+), 87 deletions(-) delete mode 100644 meta/classes/update-rc.d_real.bbclass diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 34f9838084..f9d55fbec8 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -1 +1,86 @@ -inherit ${@base_contains('DISTRO_FEATURES','sysvinit','update-rc.d_real','',d)} +UPDATERCPN ?= "${PN}" + +DEPENDS_append = " update-rc.d-native" +UPDATERCD = "update-rc.d" +UPDATERCD_virtclass-cross = "" +UPDATERCD_class-native = "" +UPDATERCD_class-nativesdk = "" + +RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}" + +INITSCRIPT_PARAMS ?= "defaults" + +INIT_D_DIR = "${sysconfdir}/init.d" + +updatercd_postinst() { +if test "x$D" != "x"; then + OPT="-r $D" +else + OPT="-s" +fi +update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +} + +updatercd_prerm() { +if test "x$D" = "x"; then + ${INIT_D_DIR}/${INITSCRIPT_NAME} stop +fi +} + +updatercd_postrm() { +if [ "$D" != "" ]; then + update-rc.d -f -r $D ${INITSCRIPT_NAME} remove +else + update-rc.d ${INITSCRIPT_NAME} remove +fi +} + + +def update_rc_after_parse(d): + if d.getVar('INITSCRIPT_PACKAGES') == None: + if d.getVar('INITSCRIPT_NAME') == None: + raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % d.getVar('FILE') + if d.getVar('INITSCRIPT_PARAMS') == None: + raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % d.getVar('FILE') + +python __anonymous() { + update_rc_after_parse(d) +} + +PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd " + +python populate_packages_updatercd () { + def update_rcd_package(pkg): + bb.debug(1, 'adding update-rc.d calls to postinst/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. + """ + postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + if not postinst: + postinst = '#!/bin/sh\n' + postinst += d.getVar('updatercd_postinst', True) + d.setVar('pkg_postinst_%s' % pkg, postinst) + + prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True) + if not prerm: + prerm = '#!/bin/sh\n' + prerm += d.getVar('updatercd_prerm', True) + d.setVar('pkg_prerm_%s' % pkg, prerm) + + postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) + if not postrm: + postrm = '#!/bin/sh\n' + postrm += d.getVar('updatercd_postrm', True) + d.setVar('pkg_postrm_%s' % pkg, postrm) + + pkgs = d.getVar('INITSCRIPT_PACKAGES', True) + if pkgs == None: + pkgs = d.getVar('UPDATERCPN', True) + packages = (d.getVar('PACKAGES', True) or "").split() + if not pkgs in packages and packages != []: + pkgs = packages[0] + for pkg in pkgs.split(): + update_rcd_package(pkg) +} diff --git a/meta/classes/update-rc.d_real.bbclass b/meta/classes/update-rc.d_real.bbclass deleted file mode 100644 index f9d55fbec8..0000000000 --- a/meta/classes/update-rc.d_real.bbclass +++ /dev/null @@ -1,86 +0,0 @@ -UPDATERCPN ?= "${PN}" - -DEPENDS_append = " update-rc.d-native" -UPDATERCD = "update-rc.d" -UPDATERCD_virtclass-cross = "" -UPDATERCD_class-native = "" -UPDATERCD_class-nativesdk = "" - -RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}" - -INITSCRIPT_PARAMS ?= "defaults" - -INIT_D_DIR = "${sysconfdir}/init.d" - -updatercd_postinst() { -if test "x$D" != "x"; then - OPT="-r $D" -else - OPT="-s" -fi -update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} -} - -updatercd_prerm() { -if test "x$D" = "x"; then - ${INIT_D_DIR}/${INITSCRIPT_NAME} stop -fi -} - -updatercd_postrm() { -if [ "$D" != "" ]; then - update-rc.d -f -r $D ${INITSCRIPT_NAME} remove -else - update-rc.d ${INITSCRIPT_NAME} remove -fi -} - - -def update_rc_after_parse(d): - if d.getVar('INITSCRIPT_PACKAGES') == None: - if d.getVar('INITSCRIPT_NAME') == None: - raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % d.getVar('FILE') - if d.getVar('INITSCRIPT_PARAMS') == None: - raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % d.getVar('FILE') - -python __anonymous() { - update_rc_after_parse(d) -} - -PACKAGESPLITFUNCS_prepend = "populate_packages_updatercd " - -python populate_packages_updatercd () { - def update_rcd_package(pkg): - bb.debug(1, 'adding update-rc.d calls to postinst/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. - """ - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) - if not postinst: - postinst = '#!/bin/sh\n' - postinst += d.getVar('updatercd_postinst', True) - d.setVar('pkg_postinst_%s' % pkg, postinst) - - prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True) - if not prerm: - prerm = '#!/bin/sh\n' - prerm += d.getVar('updatercd_prerm', True) - d.setVar('pkg_prerm_%s' % pkg, prerm) - - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) - if not postrm: - postrm = '#!/bin/sh\n' - postrm += d.getVar('updatercd_postrm', True) - d.setVar('pkg_postrm_%s' % pkg, postrm) - - pkgs = d.getVar('INITSCRIPT_PACKAGES', True) - if pkgs == None: - pkgs = d.getVar('UPDATERCPN', True) - packages = (d.getVar('PACKAGES', True) or "").split() - if not pkgs in packages and packages != []: - pkgs = packages[0] - for pkg in pkgs.split(): - update_rcd_package(pkg) -}