[oe-commits] Ross Burton : update-rcd: drop depends to recommends, check for update-rcd in scripts

git at git.openembedded.org git at git.openembedded.org
Tue Mar 26 22:41:13 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 2c403979c03898c679c5a1e1092aec784dbeb77c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2c403979c03898c679c5a1e1092aec784dbeb77c

Author: Ross Burton <ross.burton at intel.com>
Date:   Tue Mar  5 11:57:00 2013 +0000

update-rcd: drop depends to recommends, check for update-rcd in scripts

Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/update-rc.d.bbclass |   15 ++++++++++-----
 1 files 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
 }
 





More information about the Openembedded-commits mailing list