From patchwork Tue Apr 3 20:51:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 150543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D6E1AB6FAA for ; Wed, 4 Apr 2012 06:53:33 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B8F93102052; Tue, 3 Apr 2012 20:53:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nM3qVty+b57s; Tue, 3 Apr 2012 20:53:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2221D101FD9; Tue, 3 Apr 2012 20:53:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A7DB98F78D for ; Tue, 3 Apr 2012 20:53:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A47C132054 for ; Tue, 3 Apr 2012 20:53:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zoMrA67mY8md for ; Tue, 3 Apr 2012 20:53:18 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by silver.osuosl.org (Postfix) with ESMTP id F409C21FB7 for ; Tue, 3 Apr 2012 20:53:17 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id ED380969F0; Tue, 3 Apr 2012 20:53:17 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Tue, 3 Apr 2012 22:51:05 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 9afba4fdc672662c39f088b51c2ee939679d51a2 X-Git-Newrev: d58777fdf0d18da7c08f6b604d36f85aae2ec5bb X-Patchwork-Hint: ignore Message-Id: <20120403205317.ED380969F0@busybox.osuosl.org> Subject: [Buildroot] [git commit] tinyhttpd: fix initscript, install as /usr/sbin/tinyhttpd X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- 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