From patchwork Thu Nov 27 21:57:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 415708 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 A708714017D for ; Fri, 28 Nov 2014 09:03:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EAF58A3B74; Thu, 27 Nov 2014 22:03:06 +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 xub-7id2-JUm; Thu, 27 Nov 2014 22:03:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DA52DA3AC4; Thu, 27 Nov 2014 22:03:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 69F2B1C2451 for ; Thu, 27 Nov 2014 22:03:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5F58B957C5 for ; Thu, 27 Nov 2014 22:03:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3-kYH9qvF-Sj for ; Thu, 27 Nov 2014 22:03:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by hemlock.osuosl.org (Postfix) with ESMTP id 43E7C95753 for ; Thu, 27 Nov 2014 22:03:03 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id B6C414876; Thu, 27 Nov 2014 23:03:07 +0100 (CET) Received: from localhost (unknown [151.16.38.253]) by mail.free-electrons.com (Postfix) with ESMTPSA id 61750487B; Thu, 27 Nov 2014 22:58:31 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 27 Nov 2014 22:57:21 +0100 Message-Id: <1417125452-18705-64-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417125452-18705-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1417125452-18705-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCHv2 63/74] proftpd: install configuration file unconditionally X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" As discussed, users should use a rootfs overlay or a post-build script instead of a custom skeleton to override files installed by Buildroot, so there is no point in having conditions when installing init scripts or configuration files. Signed-off-by: Thomas Petazzoni --- package/proftpd/proftpd.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 65dd84e..ce31276 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -48,10 +48,8 @@ PROFTPD_MAKE = $(MAKE1) define PROFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd - @if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \ - $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ - $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \ - fi + $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ + $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \ endef define PROFTPD_INSTALL_INIT_SYSV