summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-07-26 14:13:36 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-07-27 15:23:57 +0200
commit52548df9e61493a7c14c674386ae615a30457898 (patch)
tree1afda73aa7e927d780951ee229f34ecdb52fee64
parent42c0c83ac208b5989cf730c2c12a6fd96227ce4c (diff)
downloadptxdist-52548df9e61493a7c14c674386ae615a30457898.tar.gz
ptxdist-52548df9e61493a7c14c674386ae615a30457898.tar.xz
[lighttpd] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/initmethod-bbinit.in6
-rw-r--r--rules/initmethod-bbinit.make6
-rw-r--r--rules/lighttpd-bbinit.in8
-rw-r--r--rules/lighttpd.make6
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
index 3d2c6035f..0e0585e8c 100644
--- a/rules/initmethod-bbinit.in
+++ b/rules/initmethod-bbinit.in
@@ -83,12 +83,6 @@ config INITMETHOD_BBINIT_LINK_HWCLOCK
prompt "hwclock"
default "S12hwclock"
-config INITMETHOD_BBINIT_LINK_LIGHTTPD
- string
- depends on LIGHTTPD_STARTSCRIPT
- prompt "lighttpd"
- default "S91lighttpd"
-
config INITMETHOD_BBINIT_LINK_MYSQL
string
depends on MYSQL_STARTSCRIPT
diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
index eadeebd6a..84a46dba1 100644
--- a/rules/initmethod-bbinit.make
+++ b/rules/initmethod-bbinit.make
@@ -161,12 +161,6 @@ ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK)),)
/etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_HWCLOCK))
endif
-ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_LIGHTTPD)),)
- @$(call install_link, initmethod-bbinit, \
- ../init.d/lighttpd, \
- /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_LIGHTTPD))
-endif
-
ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_MYSQL)),)
@$(call install_link, initmethod-bbinit, \
../init.d/mysql, \
diff --git a/rules/lighttpd-bbinit.in b/rules/lighttpd-bbinit.in
new file mode 100644
index 000000000..4655808cc
--- /dev/null
+++ b/rules/lighttpd-bbinit.in
@@ -0,0 +1,8 @@
+## SECTION=initmethod_bbinit
+
+config LIGHTTPD_BBINIT_LINK
+ string
+ depends on LIGHTTPD_STARTSCRIPT
+ prompt "lighttpd"
+ default "S91lighttpd"
+
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 5dd8d8531..64d9b18a4 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -186,6 +186,12 @@ endif
ifdef PTXCONF_INITMETHOD_BBINIT
ifdef PTXCONF_LIGHTTPD_STARTSCRIPT
@$(call install_alternative, lighttpd, 0, 0, 0755, /etc/init.d/lighttpd)
+
+ifneq ($(call remove_quotes, $(PTXCONF_LIGHTTPD_BBINIT_LINK)),)
+ @$(call install_link, lighttpd, \
+ ../init.d/lighttpd, \
+ /etc/rc.d/$(PTXCONF_LIGHTTPD_BBINIT_LINK))
+endif
endif
endif