summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-07-26 15:34:45 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-07-27 15:24:02 +0200
commita0384c6fa2e661a142dd19fc376099019433c067 (patch)
treef5f6f00bf161e42cf1aaf265f243ea66bef4a7b5
parenta29390253c505cc319307f11c6c0f00d9ca1490f (diff)
downloadptxdist-a0384c6fa2e661a142dd19fc376099019433c067.tar.gz
ptxdist-a0384c6fa2e661a142dd19fc376099019433c067.tar.xz
[dibbler] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/dibbler-bbinit.in20
-rw-r--r--rules/dibbler.make18
-rw-r--r--rules/initmethod-bbinit.in18
-rw-r--r--rules/initmethod-bbinit.make18
4 files changed, 38 insertions, 36 deletions
diff --git a/rules/dibbler-bbinit.in b/rules/dibbler-bbinit.in
new file mode 100644
index 000000000..930cfb515
--- /dev/null
+++ b/rules/dibbler-bbinit.in
@@ -0,0 +1,20 @@
+## SECTION=initmethod_bbinit
+
+config DIBBLER_SERVER_BBINIT_LINK
+ string
+ depends on DIBBLER_SERVER_STARTSCRIPT
+ prompt "dibbler-server"
+ default "S27dibbler-server"
+
+config DIBBLER_CLIENT_BBINIT_LINK
+ string
+ depends on DIBBLER_CLIENT_STARTSCRIPT
+ prompt "dibbler-client"
+ default "S27dibbler-client"
+
+config DIBBLER_RELAY_BBINIT_LINK
+ string
+ depends on DIBBLER_RELAY_STARTSCRIPT
+ prompt "dibbler-relay"
+ default "S27dibbler-relay"
+
diff --git a/rules/dibbler.make b/rules/dibbler.make
index 01c655624..ea6ad1e9e 100644
--- a/rules/dibbler.make
+++ b/rules/dibbler.make
@@ -87,6 +87,12 @@ endif
ifdef PTXCONF_DIBBLER_SERVER_STARTSCRIPT
@$(call install_alternative, dibbler, 0, 0, 0755, /etc/init.d/dibbler-server)
+
+ifneq ($(call remove_quotes,$(PTXCONF_DIBBLER_SERVER_BBINIT_LINK)),)
+ @$(call install_link, dibbler, \
+ ../init.d/dibbler-server, \
+ /etc/rc.d/$(PTXCONF_DIBBLER_SERVER_BBINIT_LINK))
+endif
endif
ifdef PTXCONF_DIBBLER_CLIENT
@@ -97,6 +103,12 @@ endif
ifdef PTXCONF_DIBBLER_CLIENT_STARTSCRIPT
@$(call install_alternative, dibbler, 0, 0, 0755, /etc/init.d/dibbler-client)
+
+ifneq ($(call remove_quotes,$(PTXCONF_DIBBLER_CLIENT_BBINIT_LINK)),)
+ @$(call install_link, dibbler, \
+ ../init.d/dibbler-client, \
+ /etc/rc.d/$(PTXCONF_DIBBLER_CLIENT_BBINIT_LINK))
+endif
endif
ifdef PTXCONF_DIBBLER_RELAY
@@ -106,6 +118,12 @@ endif
ifdef PTXCONF_DIBBLER_RELAY_STARTSCRIPT
@$(call install_alternative, dibbler, 0, 0, 0755, /etc/init.d/dibbler-relay)
+
+ifneq ($(call remove_quotes,$(PTXCONF_DIBBLER_RELAY_BBINIT_LINK)),)
+ @$(call install_link, dibbler, \
+ ../init.d/dibbler-relay, \
+ /etc/rc.d/$(PTXCONF_DIBBLER_RELAY_BBINIT_LINK))
+endif
endif
@$(call install_finish, dibbler)
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 11213ccdd..9ac763490 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -119,24 +119,6 @@ config INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH
prompt "rt-set-bandwidth"
default "S03rt-set-bandwidth"
-config INITMETHOD_BBINIT_LINK_DIBBLER_SERVER
- string
- depends on DIBBLER_SERVER_STARTSCRIPT
- prompt "dibbler-server"
- default "S27dibbler-server"
-
-config INITMETHOD_BBINIT_LINK_DIBBLER_CLIENT
- string
- depends on DIBBLER_CLIENT_STARTSCRIPT
- prompt "dibbler-client"
- default "S27dibbler-client"
-
-config INITMETHOD_BBINIT_LINK_DIBBLER_RELAY
- string
- depends on DIBBLER_RELAY_STARTSCRIPT
- prompt "dibbler-relay"
- default "S27dibbler-relay"
-
endmenu
endif
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index 1c093edb9..587e5d4aa 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -197,24 +197,6 @@ ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH)),
/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_RT_SET_BANDWIDTH))
endif
-ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_DIBBLER_SERVER)),)
- @$(call install_link, initmethod-bbinit, \
- ../init.d/dibbler-server, \
- /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_DIBBLER_SERVER))
-endif
-
-ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_DIBBLER_CLIENT)),)
- @$(call install_link, initmethod-bbinit, \
- ../init.d/dibbler-client, \
- /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_DIBBLER_CLIENT))
-endif
-
-ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_DIBBLER_RELAY)),)
- @$(call install_link, initmethod-bbinit, \
- ../init.d/dibbler-relay, \
- /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_DIBBLER_RELAY))
-endif
-
@$(call install_finish, initmethod-bbinit)
@$(call touch)