[Buildroot] [git commit] tinyhttpd: fix initscript, install as /usr/sbin/tinyhttpd
Peter Korsgaard
jacmet at sunsite.dk
Tue Apr 3 20:51:05 UTC 2012
commit: http://git.buildroot.net/buildroot/commit/?id=d58777fdf0d18da7c08f6b604d36f85aae2ec5bb
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The init script was expecting the binary to be called tinyhttpd, but httpd
was used. Fix it to install as tinyhttpd as httpd will conflict with other
web servers (E.G. the busybox one).
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
---
package/tinyhttpd/tinyhttpd.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk
index 6bc37d4..9b06589 100644
--- a/package/tinyhttpd/tinyhttpd.mk
+++ b/package/tinyhttpd/tinyhttpd.mk
@@ -12,14 +12,14 @@ define TINYHTTPD_BUILD_CMDS
endef
define TINYHTTPD_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/httpd
+ $(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/tinyhttpd
$(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \
$(TARGET_DIR)/etc/init.d/S85tinyhttpd
mkdir -p $(TARGET_DIR)/var/www
endef
define TINYHTTPD_CLEAN_CMDS
- rm -f $(TARGET_DIR)/usr/sbin/httpd
+ rm -f $(TARGET_DIR)/usr/sbin/tinyhttpd
rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd
endef
More information about the buildroot
mailing list