[11/24] update-rcd: drop depends to recommends, check for update-rcd in scripts
Submitted by Ross Burton on March 26, 2013, 4:50 p.m.
|
Patch ID: 46971
Details
Commit Message
@@ -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
}
Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/classes/update-rc.d.bbclass | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)