diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-26 12:28:57 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-27 15:23:56 +0200 |
| commit | 65cb061362479b46444ae4e4707a18053139c863 (patch) | |
| tree | a550a505e52b939927717c5711fdfd13b60eff1a /rules | |
| parent | 692ad1bbf458607fb0ef4d1a8197f7b3f2297e9b (diff) | |
| download | ptxdist-65cb061362479b46444ae4e4707a18053139c863.tar.gz ptxdist-65cb061362479b46444ae4e4707a18053139c863.tar.xz | |
[apache2] install rc.d link with the init script
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/apache2-bbinit.in | 8 | ||||
| -rw-r--r-- | rules/apache2.make | 6 | ||||
| -rw-r--r-- | rules/initmethod-bbinit.in | 6 | ||||
| -rw-r--r-- | rules/initmethod-bbinit.make | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/rules/apache2-bbinit.in b/rules/apache2-bbinit.in new file mode 100644 index 000000000..74e1dcfab --- /dev/null +++ b/rules/apache2-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config APACHE2_BBINIT_LINK + string + depends on APACHE2_STARTSCRIPT + prompt "apache2" + default "S91apache2" + diff --git a/rules/apache2.make b/rules/apache2.make index cf54094fd..55fbe34b5 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -286,6 +286,12 @@ ifdef PTXCONF_APACHE2_STARTSCRIPT @APACHECONFIG@, $(PTXCONF_APACHE2_CONFIGDIR) ) @$(call install_replace, apache2, /etc/init.d/apache2, \ @LOGPATH@, $(PTXCONF_APACHE2_LOGDIR) ) + +ifneq ($(call remove_quotes, $(PTXCONF_APACHE2_BBINIT_LINK)),) + @$(call install_link, apache2, \ + ../init.d/apache2, \ + /etc/rc.d/$(PTXCONF_APACHE2_BBINIT_LINK)) +endif endif endif diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index c539e08ba..88b390505 100644 --- a/rules/initmethod-bbinit.in +++ b/rules/initmethod-bbinit.in @@ -59,12 +59,6 @@ menu "service startup configuration " source "generated/initmethod_bbinit.in" -config INITMETHOD_BBINIT_LINK_APACHE2 - string - depends on APACHE2_STARTSCRIPT - prompt "apache2" - default "S91apache2" - config INITMETHOD_BBINIT_LINK_AT string depends on AT_STARTSCRIPT diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index 85e390918..eec82cf74 100644 --- a/rules/initmethod-bbinit.make +++ b/rules/initmethod-bbinit.make @@ -137,12 +137,6 @@ endif # # collect start links # # -ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_APACHE2)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/apache2, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_APACHE2)) -endif - ifneq ($(call remove_quotes, $(PTXCONF_INITMETHOD_BBINIT_LINK_AT)),) @$(call install_link, initmethod-bbinit, \ ../init.d/atd, \ |