diff options
author | Ross Burton <ross.burton@intel.com> | 2013-03-05 11:57:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 22:43:03 +0000 |
commit | 49ae578774851beed2e98cabda3101d88869ed9f (patch) | |
tree | 77ee5a27d126401e1b9cb8cd1d75a44724518241 /meta/classes | |
parent | 40a15da9eb98e76aadf00f734d98123735589894 (diff) | |
download | poky-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.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 06b91c10ed..0997702ee9 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
@@ -6,7 +6,7 @@ UPDATERCD_virtclass-cross = "" | |||
6 | UPDATERCD_class-native = "" | 6 | UPDATERCD_class-native = "" |
7 | UPDATERCD_class-nativesdk = "" | 7 | UPDATERCD_class-nativesdk = "" |
8 | 8 | ||
9 | RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}" | 9 | RRECOMMENDS_${UPDATERCPN}_append = " ${UPDATERCD}" |
10 | 10 | ||
11 | INITSCRIPT_PARAMS ?= "defaults" | 11 | INITSCRIPT_PARAMS ?= "defaults" |
12 | 12 | ||
@@ -18,7 +18,9 @@ if test "x$D" != "x"; then | |||
18 | else | 18 | else |
19 | OPT="-s" | 19 | OPT="-s" |
20 | fi | 20 | fi |
21 | update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} | 21 | if type update-rc.d >/dev/null; then |
22 | update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} | ||
23 | fi | ||
22 | } | 24 | } |
23 | 25 | ||
24 | updatercd_prerm() { | 26 | updatercd_prerm() { |
@@ -28,10 +30,13 @@ fi | |||
28 | } | 30 | } |
29 | 31 | ||
30 | updatercd_postrm() { | 32 | updatercd_postrm() { |
31 | if [ "$D" != "" ]; then | 33 | if test "$D" != ""; then |
32 | update-rc.d -f -r $D ${INITSCRIPT_NAME} remove | 34 | OPT="-f -r $D" |
33 | else | 35 | else |
34 | update-rc.d ${INITSCRIPT_NAME} remove | 36 | OPT="" |
37 | fi | ||
38 | if type update-rc.d >/dev/null; then | ||
39 | update-rc.d $OPT ${INITSCRIPT_NAME} remove | ||
35 | fi | 40 | fi |
36 | } | 41 | } |
37 | 42 | ||