Changeset 15483


Ignore:
Timestamp:
2009-04-29T15:04:01+02:00 (9 years ago)
Author:
nico
Message:

[packages] apache: remove apache-server and move all server stuff in apache (closes: #5024)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_8.09/net/apache/Makefile

    r12758 r15483  
    11# 
    2 # Copyright (C) 2007-2008 OpenWrt.org 
     2# Copyright (C) 2007-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1111PKG_NAME:=apache 
    1212PKG_VERSION:=2.2.9 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=1.1 
    1414PKG_SOURCE_NAME:=httpd 
    1515 
     
    3131endef 
    3232 
     33define 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. 
     37endef 
     38 
    3339define Package/apache 
    34   $(call Package/apache/Default) 
    35   MENU=1 
     40$(call Package/apache/Default) 
    3641  DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl +libsqlite3 
    3742endef 
    3843 
    3944define 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. 
    4358endef 
    4459 
    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 
     60define Package/apache/conffiles 
    6461/etc/apache/httpd.conf 
    6562/etc/apache/extra/httpd-autoindex.conf 
     
    7976 
    8077define Package/apache-icons 
    81   $(call Package/apache/Default) 
     78$(call Package/apache/Default) 
    8279  TITLE:=Icons from Apache 
    8380  DEPENDS:=apache 
     
    8582 
    8683define 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. 
    8987endef 
    9088 
     
    134132endef 
    135133 
    136 define Package/apache-server/preinst 
     134define Package/apache/preinst 
    137135        rm /usr/sbin/httpd 
    138136        echo -e "You should take a look in the initscripts, busybox's httpd \n\ 
     
    140138endef 
    141139 
    142 define Package/apache-server/install 
     140define Package/apache/install 
    143141        $(INSTALL_DIR) $(1)/usr/sbin 
    144142        # we don't need apxs on the router, it's just for building apache modules.   
     
    153151endef 
    154152 
    155 define Package/apache-server/postrm 
     153define Package/apache/postrm 
    156154        rm -rf /usr/sbin/httpd 
    157155        ln -s /bin/busybox /usr/sbin/httpd 
     
    166164 
    167165$(eval $(call BuildPackage,apache)) 
    168 $(eval $(call BuildPackage,apache-server)) 
    169166$(eval $(call BuildPackage,apache-icons)) 
  • packages/net/apache/Makefile

    r15247 r15483  
    11# 
    2 # Copyright (C) 2007-2008 OpenWrt.org 
     2# Copyright (C) 2007-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=apache 
    1111PKG_VERSION:=2.2.9 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313PKG_SOURCE_NAME:=httpd 
    1414 
     
    3030endef 
    3131 
     32define 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. 
     36endef 
     37 
    3238define Package/apache 
    33   $(call Package/apache/Default) 
    34   MENU=1 
     39$(call Package/apache/Default) 
    3540  DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl +libsqlite3 
    3641endef 
    3742 
    3843define 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. 
    4257endef 
    4358 
    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 
     59define Package/apache/conffiles 
    6360/etc/apache/httpd.conf 
    6461/etc/apache/extra/httpd-autoindex.conf 
     
    7875 
    7976define Package/apache-icons 
    80   $(call Package/apache/Default) 
     77$(call Package/apache/Default) 
    8178  TITLE:=Icons from Apache 
    8279  DEPENDS:=apache 
     
    8481 
    8582define 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. 
    8886endef 
    8987 
     
    133131endef 
    134132 
    135 define Package/apache-server/preinst 
     133define Package/apache/preinst 
    136134        rm /usr/sbin/httpd 
    137135        echo -e "You should take a look in the initscripts, busybox's httpd \n\ 
     
    139137endef 
    140138 
    141 define Package/apache-server/install 
     139define Package/apache/install 
    142140        $(INSTALL_DIR) $(1)/usr/sbin 
    143141        # we don't need apxs on the router, it's just for building apache modules.   
     
    152150endef 
    153151 
    154 define Package/apache-server/postrm 
     152define Package/apache/postrm 
    155153        rm -rf /usr/sbin/httpd 
    156154        ln -s /bin/busybox /usr/sbin/httpd 
     
    165163 
    166164$(eval $(call BuildPackage,apache)) 
    167 $(eval $(call BuildPackage,apache-server)) 
    168165$(eval $(call BuildPackage,apache-icons)) 
Note: See TracChangeset for help on using the changeset viewer.