Changeset 15483
- Timestamp:
- 2009-04-29T15:04:01+02:00 (9 years ago)
- Files:
-
- 2 edited
-
branches/packages_8.09/net/apache/Makefile (modified) (9 diffs)
-
packages/net/apache/Makefile (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/packages_8.09/net/apache/Makefile
r12758 r15483 1 1 # 2 # Copyright (C) 2007-200 8OpenWrt.org2 # Copyright (C) 2007-2009 OpenWrt.org 3 3 # 4 4 # This is free software, licensed under the GNU General Public License v2. … … 11 11 PKG_NAME:=apache 12 12 PKG_VERSION:=2.2.9 13 PKG_RELEASE:=1 13 PKG_RELEASE:=1.1 14 14 PKG_SOURCE_NAME:=httpd 15 15 … … 31 31 endef 32 32 33 define Package/apache/Default/description 34 The Apache Web Server is a powerful and flexible HTTP/1.1 compliant 35 web server. Originally designed as a replacement for the NCSA HTTP 36 Server, it has grown to be the most popular web server on the Internet. 37 endef 38 33 39 define Package/apache 34 $(call Package/apache/Default) 35 MENU=1 40 $(call Package/apache/Default) 36 41 DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl +libsqlite3 37 42 endef 38 43 39 44 define Package/apache/description 40 The Apache Web Server is a powerful and flexible HTTP/1.1 compliant 41 web server. Originally designed as a replacement for the NCSA HTTP 42 Server, it has grown to be the most popular web server on the Internet. 45 $(call Package/apache/Default/description) 46 . 47 This package contains the Apache web server and utility programs. 48 . 49 Take care that you don't include apache at the moment into your image 50 please select it only as module because busybox will override 51 /usr/sbin/httpd. It'll be solved soon. If you need to include this 52 package in the image anyway, remove httpd from busybox 53 (Base system --> Configuration --> Networking Utilities --> httpd). 54 Also you should take care for the initscripts, apache's httpd isn't 55 compatible with the one from busybox, so if you want to use apache 56 for running your webif, you'll need to change the parameters in the 57 scripts and configure the rest in /etc/httpd.conf. 43 58 endef 44 59 45 define Package/apache-server 46 $(call Package/apache/Default) 47 TITLE:=The Apache Web Server and some tools 48 DEPENDS:=apache 49 endef 50 51 define Package/apache-server/description 52 Take care that you don't include apache at the moment into your image 53 please select it only as module because busybox will override 54 /usr/sbin/httpd. It'll be solved soon. If you need to include this 55 package in the image anyway, remove httpd from busybox 56 (Base system --> Configuration --> Networking Utilities --> httpd). 57 Also you should take care for the initscripts, apache's httpd isn't 58 compatible with the one from busybox, so if you want to use apache 59 for running your webif, you'll need to change the parameters in the 60 scripts and configure the rest in /etc/httpd.conf. 61 endef 62 63 define Package/apache-server/conffiles 60 define Package/apache/conffiles 64 61 /etc/apache/httpd.conf 65 62 /etc/apache/extra/httpd-autoindex.conf … … 79 76 80 77 define Package/apache-icons 81 78 $(call Package/apache/Default) 82 79 TITLE:=Icons from Apache 83 80 DEPENDS:=apache … … 85 82 86 83 define Package/apache-icons/description 87 $(call Package/apache/description) 88 This package contains the icons from Apache. 84 $(call Package/apache/Default/description) 85 . 86 This package contains the icons from Apache. 89 87 endef 90 88 … … 134 132 endef 135 133 136 define Package/apache -server/preinst134 define Package/apache/preinst 137 135 rm /usr/sbin/httpd 138 136 echo -e "You should take a look in the initscripts, busybox's httpd \n\ … … 140 138 endef 141 139 142 define Package/apache -server/install140 define Package/apache/install 143 141 $(INSTALL_DIR) $(1)/usr/sbin 144 142 # we don't need apxs on the router, it's just for building apache modules. … … 153 151 endef 154 152 155 define Package/apache -server/postrm153 define Package/apache/postrm 156 154 rm -rf /usr/sbin/httpd 157 155 ln -s /bin/busybox /usr/sbin/httpd … … 166 164 167 165 $(eval $(call BuildPackage,apache)) 168 $(eval $(call BuildPackage,apache-server))169 166 $(eval $(call BuildPackage,apache-icons)) -
packages/net/apache/Makefile
r15247 r15483 1 1 # 2 # Copyright (C) 2007-200 8OpenWrt.org2 # Copyright (C) 2007-2009 OpenWrt.org 3 3 # 4 4 # This is free software, licensed under the GNU General Public License v2. … … 10 10 PKG_NAME:=apache 11 11 PKG_VERSION:=2.2.9 12 PKG_RELEASE:= 112 PKG_RELEASE:=2 13 13 PKG_SOURCE_NAME:=httpd 14 14 … … 30 30 endef 31 31 32 define Package/apache/Default/description 33 The Apache Web Server is a powerful and flexible HTTP/1.1 compliant 34 web server. Originally designed as a replacement for the NCSA HTTP 35 Server, it has grown to be the most popular web server on the Internet. 36 endef 37 32 38 define Package/apache 33 $(call Package/apache/Default) 34 MENU=1 39 $(call Package/apache/Default) 35 40 DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl +libsqlite3 36 41 endef 37 42 38 43 define Package/apache/description 39 The Apache Web Server is a powerful and flexible HTTP/1.1 compliant 40 web server. Originally designed as a replacement for the NCSA HTTP 41 Server, it has grown to be the most popular web server on the Internet. 44 $(call Package/apache/Default/description) 45 . 46 This package contains the Apache web server and utility programs. 47 . 48 Take care that you don't include apache at the moment into your image 49 please select it only as module because busybox will override 50 /usr/sbin/httpd. It'll be solved soon. If you need to include this 51 package in the image anyway, remove httpd from busybox 52 (Base system --> Configuration --> Networking Utilities --> httpd). 53 Also you should take care for the initscripts, apache's httpd isn't 54 compatible with the one from busybox, so if you want to use apache 55 for running your webif, you'll need to change the parameters in the 56 scripts and configure the rest in /etc/httpd.conf. 42 57 endef 43 58 44 define Package/apache-server 45 $(call Package/apache/Default) 46 TITLE:=The Apache Web Server and some tools 47 DEPENDS:=apache 48 endef 49 50 define Package/apache-server/description 51 Take care that you don't include apache at the moment into your image 52 please select it only as module because busybox will override 53 /usr/sbin/httpd. It'll be solved soon. If you need to include this 54 package in the image anyway, remove httpd from busybox 55 (Base system --> Configuration --> Networking Utilities --> httpd). 56 Also you should take care for the initscripts, apache's httpd isn't 57 compatible with the one from busybox, so if you want to use apache 58 for running your webif, you'll need to change the parameters in the 59 scripts and configure the rest in /etc/httpd.conf. 60 endef 61 62 define Package/apache-server/conffiles 59 define Package/apache/conffiles 63 60 /etc/apache/httpd.conf 64 61 /etc/apache/extra/httpd-autoindex.conf … … 78 75 79 76 define Package/apache-icons 80 77 $(call Package/apache/Default) 81 78 TITLE:=Icons from Apache 82 79 DEPENDS:=apache … … 84 81 85 82 define Package/apache-icons/description 86 $(call Package/apache/description) 87 This package contains the icons from Apache. 83 $(call Package/apache/Default/description) 84 . 85 This package contains the icons from Apache. 88 86 endef 89 87 … … 133 131 endef 134 132 135 define Package/apache -server/preinst133 define Package/apache/preinst 136 134 rm /usr/sbin/httpd 137 135 echo -e "You should take a look in the initscripts, busybox's httpd \n\ … … 139 137 endef 140 138 141 define Package/apache -server/install139 define Package/apache/install 142 140 $(INSTALL_DIR) $(1)/usr/sbin 143 141 # we don't need apxs on the router, it's just for building apache modules. … … 152 150 endef 153 151 154 define Package/apache -server/postrm152 define Package/apache/postrm 155 153 rm -rf /usr/sbin/httpd 156 154 ln -s /bin/busybox /usr/sbin/httpd … … 165 163 166 164 $(eval $(call BuildPackage,apache)) 167 $(eval $(call BuildPackage,apache-server))168 165 $(eval $(call BuildPackage,apache-icons))
Note: See TracChangeset
for help on using the changeset viewer.
