* [Buildroot] svn commit: trunk/buildroot/package/thttpd
@ 2007-07-17 0:24 sjhill at uclibc.org
0 siblings, 0 replies; 4+ messages in thread
From: sjhill at uclibc.org @ 2007-07-17 0:24 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-07-16 17:24:54 -0700 (Mon, 16 Jul 2007)
New Revision: 19123
Log:
The clean target should really work.
Modified:
trunk/buildroot/package/thttpd/thttpd.mk
Changeset:
Modified: trunk/buildroot/package/thttpd/thttpd.mk
===================================================================
--- trunk/buildroot/package/thttpd/thttpd.mk 2007-07-17 00:24:13 UTC (rev 19122)
+++ trunk/buildroot/package/thttpd/thttpd.mk 2007-07-17 00:24:54 UTC (rev 19123)
@@ -61,6 +61,13 @@
thttpd-clean:
rm -f $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
+ rm -f $(TARGET_DIR)/sbin/httpd_wrapper
+ rm -f $(TARGET_DIR)/sbin/thttpd_wrapper
+ rm -rf $(TARGET_DIR)/var/www
+ rm -f $(TARGET_DIR)/etc/init.d/S90thttpd
+ rm -f $(TARGET_DIR)/bin/htpasswd
+ rm -f $(TARGET_DIR)/bin/makeweb
+ rm -f $(TARGET_DIR)/bin/syslogtocern
-$(MAKE) -C $(THTTPD_DIR) clean
thttpd-dirclean:
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/thttpd
@ 2007-07-28 16:46 ulf at uclibc.org
0 siblings, 0 replies; 4+ messages in thread
From: ulf at uclibc.org @ 2007-07-28 16:46 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-28 09:46:36 -0700 (Sat, 28 Jul 2007)
New Revision: 19298
Log:
Cleanup of thttpd package
Modified:
trunk/buildroot/package/thttpd/thttpd.mk
Changeset:
Modified: trunk/buildroot/package/thttpd/thttpd.mk
===================================================================
--- trunk/buildroot/package/thttpd/thttpd.mk 2007-07-28 16:41:44 UTC (rev 19297)
+++ trunk/buildroot/package/thttpd/thttpd.mk 2007-07-28 16:46:36 UTC (rev 19298)
@@ -9,8 +9,9 @@
THTTPD_DIR:=$(BUILD_DIR)/thttpd-$(THTTPD_VERSION)
THTTPD_CAT:=$(ZCAT)
THTTPD_BINARY:=thttpd
-THTTPD_TARGET_BINARY:=usr/sbin/thttpd
-THTTPD_WEB_DIR:=/var/www
+THTTPD_TARGET_BINARY:=sbin/thttpd
+THTTPD_ROOT:=/var
+THTTPD_WEB_DIR:=$(THTTPD_ROOT)/www
$(DL_DIR)/$(THTTPD_SOURCE):
$(WGET) -P $(DL_DIR) $(THTTPD_SITE)/$(THTTPD_SOURCE)
@@ -29,31 +30,48 @@
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=/usr \
+ --prefix=$(THTTPD_ROOT) \
);
touch $(THTTPD_DIR)/.configured
$(THTTPD_DIR)/$(THTTPD_BINARY): $(THTTPD_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) WEBDIR=$(THTTPD_WEB_DIR) -C $(THTTPD_DIR)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(THTTPD_DIR)
$(TARGET_DIR)/$(THTTPD_TARGET_BINARY): $(THTTPD_DIR)/$(THTTPD_BINARY)
- $(MAKE) $(TARGET_CONFIGURE_OPTS) prefix=$(TARGET_DIR)/usr WEBDIR=$(THTTPD_WEB_DIR) -C $(THTTPD_DIR) installthis
- $(STRIP) --strip-unneeded $(THTTPD_DIR)/$(THTTPD_BINARY)
- $(INSTALL) -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/cgi-bin
- $(INSTALL) -m 0755 package/thttpd/S90thttpd $(TARGET_DIR)/etc/init.d
- $(INSTALL) -m 0644 package/thttpd/thttpd.conf $(TARGET_DIR)/etc
+ install -D $(THTTPD_DIR)/$(THTTPD_BINARY) $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
+ install -D $(THTTPD_DIR)/extras/htpasswd $(TARGET_DIR)/bin/htpasswd
+ install -D $(THTTPD_DIR)/extras/makeweb $(TARGET_DIR)/bin/makeweb
+ install -D $(THTTPD_DIR)/extras/syslogtocern $(TARGET_DIR)/bin/syslogtocern
+ install -D $(THTTPD_DIR)/scripts/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper
+ install -D $(THTTPD_DIR)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
+ cp $(TARGET_DIR)/etc/init.d/S90thttpd $(TARGET_DIR)/etc/init.d/S90thttpd.in
+ cp $(TARGET_DIR)/sbin/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper.in
+ sed -e "s:/usr/local/sbin:/sbin:g" -e "s:/usr/local/www:$(THTTPD_WEB_DIR):g" < $(TARGET_DIR)/sbin/thttpd_wrapper.in > $(TARGET_DIR)/sbin/httpd_wrapper
+ sed -e "s:/usr/local/sbin:/sbin:g" < $(TARGET_DIR)/etc/init.d/S90thttpd.in > $(TARGET_DIR)/etc/init.d/S90thttpd
+ rm -f $(TARGET_DIR)/etc/init.d/S90thttpd.in $(TARGET_DIR)/sbin/thttpd_wrapper.in
+ install -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/data
+ install -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/logs
+ echo "dir=$(THTTPD_WEB_DIR)/data" > $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
+ echo 'cgipat=**.cgi' >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
+ echo "logfile=$(THTTPD_WEB_DIR)/logs/thttpd_log" >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
+ echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)$(THTTPD_WEB_DIR)/thttpd_config
+ echo "<HTML><BODY>thttpd test page</BODY></HTML>" > $(TARGET_DIR)$(THTTPD_WEB_DIR)/data/index.html
thttpd: uclibc $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
thttpd-clean:
rm -f $(TARGET_DIR)/$(THTTPD_TARGET_BINARY)
+ rm -f $(TARGET_DIR)/sbin/httpd_wrapper
+ rm -f $(TARGET_DIR)/sbin/thttpd_wrapper
rm -rf $(TARGET_DIR)/var/www
- rm -f $(TARGET_DIR)/etc/init.d/S90thttpd $(TARGET_DIR)/etc/thttpd.conf
+ rm -f $(TARGET_DIR)/etc/init.d/S90thttpd
+ rm -f $(TARGET_DIR)/bin/htpasswd
+ rm -f $(TARGET_DIR)/bin/makeweb
+ rm -f $(TARGET_DIR)/bin/syslogtocern
-$(MAKE) -C $(THTTPD_DIR) clean
thttpd-dirclean:
rm -rf $(THTTPD_DIR)
-
#############################################################
#
# Toplevel Makefile options
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/thttpd
@ 2008-04-01 12:26 jacmet at uclibc.org
0 siblings, 0 replies; 4+ messages in thread
From: jacmet at uclibc.org @ 2008-04-01 12:26 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-04-01 05:26:49 -0700 (Tue, 01 Apr 2008)
New Revision: 21609
Log:
thttpd: fix thttpd_wrapper name
Patch by Simon Pasch.
Modified:
trunk/buildroot/package/thttpd/thttpd.mk
Changeset:
Modified: trunk/buildroot/package/thttpd/thttpd.mk
===================================================================
--- trunk/buildroot/package/thttpd/thttpd.mk 2008-04-01 10:30:32 UTC (rev 21608)
+++ trunk/buildroot/package/thttpd/thttpd.mk 2008-04-01 12:26:49 UTC (rev 21609)
@@ -46,7 +46,7 @@
install -D $(THTTPD_DIR)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
cp $(TARGET_DIR)/etc/init.d/S90thttpd $(TARGET_DIR)/etc/init.d/S90thttpd.in
cp $(TARGET_DIR)/sbin/thttpd_wrapper $(TARGET_DIR)/sbin/thttpd_wrapper.in
- sed -e "s:/usr/local/sbin:/sbin:g" -e "s:/usr/local/www:$(THTTPD_WEB_DIR):g" < $(TARGET_DIR)/sbin/thttpd_wrapper.in > $(TARGET_DIR)/sbin/httpd_wrapper
+ sed -e "s:/usr/local/sbin:/sbin:g" -e "s:/usr/local/www:$(THTTPD_WEB_DIR):g" < $(TARGET_DIR)/sbin/thttpd_wrapper.in > $(TARGET_DIR)/sbin/thttpd_wrapper
sed -e "s:/usr/local/sbin:/sbin:g" < $(TARGET_DIR)/etc/init.d/S90thttpd.in > $(TARGET_DIR)/etc/init.d/S90thttpd
rm -f $(TARGET_DIR)/etc/init.d/S90thttpd.in $(TARGET_DIR)/sbin/thttpd_wrapper.in
install -d $(TARGET_DIR)$(THTTPD_WEB_DIR)/data
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/thttpd
@ 2008-04-01 14:50 jacmet at uclibc.org
0 siblings, 0 replies; 4+ messages in thread
From: jacmet at uclibc.org @ 2008-04-01 14:50 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-04-01 07:50:40 -0700 (Tue, 01 Apr 2008)
New Revision: 21611
Log:
thttpd: remove unused files
Patch by Simon Pasch
Removed:
trunk/buildroot/package/thttpd/S90thttpd
trunk/buildroot/package/thttpd/thttpd.conf
Changeset:
Deleted: trunk/buildroot/package/thttpd/S90thttpd
===================================================================
--- trunk/buildroot/package/thttpd/S90thttpd 2008-04-01 14:47:57 UTC (rev 21610)
+++ trunk/buildroot/package/thttpd/S90thttpd 2008-04-01 14:50:40 UTC (rev 21611)
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-DAEMON=/usr/sbin/thttpd
-test -f $DAEMON || exit 0
-
-start() {
- echo -n "Starting thttpd: "
- $DAEMON -C /etc/thttpd.conf
- if [ $? != 0 ]; then
- echo "FAILED"
- exit 1
- else
- echo "done"
- fi
-}
-
-stop() {
- echo -n "Stopping ProFTPD: "
- kill -9 `cat /var/run/thttpd.pid`
- echo "done"
-}
-
-case "$1" in
- start)
- start
- ;;
-
- stop)
- stop
- ;;
-
- restart)
- stop
- start
- ;;
-
- *)
- echo "Usage: /etc/init.d/S90thttpd {start|stop|restart}"
- exit 1
- ;;
-esac
-
-exit 0
Deleted: trunk/buildroot/package/thttpd/thttpd.conf
===================================================================
--- trunk/buildroot/package/thttpd/thttpd.conf 2008-04-01 14:47:57 UTC (rev 21610)
+++ trunk/buildroot/package/thttpd/thttpd.conf 2008-04-01 14:50:40 UTC (rev 21611)
@@ -1,7 +0,0 @@
-chroot
-dir=/var/www
-pidfile=/var/run/thttpd.pid
-logfile=/var/log/thttpd
-host=dtu-7100
-user=nobody
-cgipat=**.cgi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-04-01 14:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-01 12:26 [Buildroot] svn commit: trunk/buildroot/package/thttpd jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-04-01 14:50 jacmet at uclibc.org
2007-07-28 16:46 ulf at uclibc.org
2007-07-17 0:24 sjhill at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox