From d3ed4f633315bc7b2a11399b4aea09c7c37e4569 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 5 Mar 2013 11:57:00 +0000 Subject: [PATCH] update-rcd: drop depends to recommends, check for update-rcd in scripts (From OE-Core rev: 2c403979c03898c679c5a1e1092aec784dbeb77c) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/update-rc.d.bbclass | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 06b91c1..0997702 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -6,7 +6,7 @@ UPDATERCD_virtclass-cross = "" UPDATERCD_class-native = "" UPDATERCD_class-nativesdk = "" -RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}" +RRECOMMENDS_${UPDATERCPN}_append = " ${UPDATERCD}" INITSCRIPT_PARAMS ?= "defaults" @@ -18,7 +18,9 @@ if test "x$D" != "x"; then else OPT="-s" fi -update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +if type update-rc.d >/dev/null; then + update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +fi } updatercd_prerm() { @@ -28,10 +30,13 @@ fi } updatercd_postrm() { -if [ "$D" != "" ]; then - update-rc.d -f -r $D ${INITSCRIPT_NAME} remove +if test "$D" != ""; then + OPT="-f -r $D" else - update-rc.d ${INITSCRIPT_NAME} remove + OPT="" +fi +if type update-rc.d >/dev/null; then + update-rc.d $OPT ${INITSCRIPT_NAME} remove fi } -- 2.7.4