summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-05 11:57:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 22:43:03 +0000
commit49ae578774851beed2e98cabda3101d88869ed9f (patch)
tree77ee5a27d126401e1b9cb8cd1d75a44724518241 /meta/classes
parent40a15da9eb98e76aadf00f734d98123735589894 (diff)
downloadpoky-49ae578774851beed2e98cabda3101d88869ed9f.tar.gz
update-rcd: drop depends to recommends, check for update-rcd in scripts
(From OE-Core rev: 2c403979c03898c679c5a1e1092aec784dbeb77c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/update-rc.d.bbclass15
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 06b91c10ed..0997702ee9 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -6,7 +6,7 @@ UPDATERCD_virtclass-cross = ""
6UPDATERCD_class-native = "" 6UPDATERCD_class-native = ""
7UPDATERCD_class-nativesdk = "" 7UPDATERCD_class-nativesdk = ""
8 8
9RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}" 9RRECOMMENDS_${UPDATERCPN}_append = " ${UPDATERCD}"
10 10
11INITSCRIPT_PARAMS ?= "defaults" 11INITSCRIPT_PARAMS ?= "defaults"
12 12
@@ -18,7 +18,9 @@ if test "x$D" != "x"; then
18else 18else
19 OPT="-s" 19 OPT="-s"
20fi 20fi
21update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} 21if type update-rc.d >/dev/null; then
22 update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
23fi
22} 24}
23 25
24updatercd_prerm() { 26updatercd_prerm() {
@@ -28,10 +30,13 @@ fi
28} 30}
29 31
30updatercd_postrm() { 32updatercd_postrm() {
31if [ "$D" != "" ]; then 33if test "$D" != ""; then
32 update-rc.d -f -r $D ${INITSCRIPT_NAME} remove 34 OPT="-f -r $D"
33else 35else
34 update-rc.d ${INITSCRIPT_NAME} remove 36 OPT=""
37fi
38if type update-rc.d >/dev/null; then
39 update-rc.d $OPT ${INITSCRIPT_NAME} remove
35fi 40fi
36} 41}
37 42