diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-02-20 23:13:39 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-02-20 23:13:39 +0000 |
| commit | 2e878658a02ca4651673cad2f41a57f27557d6dc (patch) | |
| tree | fd1c10f972e4e7f79775a2b3c52fe907869e6032 /rules/apache2.make | |
| parent | be1d99320d214120a306d659e3eacac4411b5ad3 (diff) | |
| download | ptxdist-2e878658a02ca4651673cad2f41a57f27557d6dc.tar.gz ptxdist-2e878658a02ca4651673cad2f41a57f27557d6dc.tar.xz | |
* init: introduce infrastructure for multiple init methods
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9802 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/apache2.make')
| -rw-r--r-- | rules/apache2.make | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/rules/apache2.make b/rules/apache2.make index 4dd717b85..941c2902c 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -258,39 +258,27 @@ endif endif endif + # + # create the log dir if enabled + # -# --------------------------- -# create the log dir if enabled -# ifneq ($(PTXCONF_APACHE2_LOGDIR),"") @$(call install_copy, apache2, 12, 102, 0755, $(PTXCONF_APACHE2_LOGDIR)) endif -# --------------------------- -# install startup script on demand -# -ifdef PTXCONF_ROOTFS_ETC_INITD_HTTPD -ifdef PTXCONF_ROOTFS_ETC_INITD_HTTPD_DEFAULT -# generic script with path modifications - @$(call install_copy, apache2, 0, 0, 0755, \ - $(PTXDIST_TOPDIR)/generic/etc/init.d/httpd, \ - /etc/init.d/httpd, n) -endif -ifdef PTXCONF_ROOTFS_ETC_INITD_HTTPD_USER -# users one - @$(call install_copy, apache2, 0, 0, 0755, \ - $(PTXDIST_WORKSPACE)/projectroot/etc/init.d/httpd, \ - /etc/init.d/httpd, n) -endif -# replace some placeholders + # + # busybox init: startscript + # + +ifdef PTXCONF_INITMETHOD_BBINIT +ifdef PTXCONF_APACHE2_STARTSCRIPT + @$(call install_alternative, apache2, 0, 0, 0755, /etc/init.d/httpd, n) + + # replace some placeholders @$(call install_replace, apache2, /etc/init.d/httpd, \ @APACHECONFIG@, $(PTXCONF_APACHE2_CONFIGDIR) ) @$(call install_replace, apache2, /etc/init.d/httpd, \ @LOGPATH@, $(PTXCONF_APACHE2_LOGDIR) ) -# install link to launch automatically if enabled -ifneq ($(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK),"") - @$(call install_link, apache2, ../init.d/httpd, \ - /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK)) endif endif |