From patchwork Thu Nov 27 21:57:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 415715 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 A0C1014017D for ; Fri, 28 Nov 2014 09:03:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EAF6AA39EB; Thu, 27 Nov 2014 22:03:44 +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 rVZxSEoN7HMl; Thu, 27 Nov 2014 22:03:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EA4CA3ABA; Thu, 27 Nov 2014 22:03:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8A8E11CE6F9 for ; Thu, 27 Nov 2014 22:03:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 83ED2A39EB for ; Thu, 27 Nov 2014 22:03:43 +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 0hN9DqkNeJ9N for ; Thu, 27 Nov 2014 22:03:43 +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 fraxinus.osuosl.org (Postfix) with ESMTP id 0D044A3ABA for ; Thu, 27 Nov 2014 22:03:43 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 92B3B48F5; Thu, 27 Nov 2014 23:03:47 +0100 (CET) Received: from localhost (unknown [151.16.38.253]) by mail.free-electrons.com (Postfix) with ESMTPSA id E25444885; Thu, 27 Nov 2014 22:58:36 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 27 Nov 2014 22:57:28 +0100 Message-Id: <1417125452-18705-71-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 70/74] usbmount: 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/usbmount/usbmount.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk index cc25e4b..76c027f 100644 --- a/package/usbmount/usbmount.mk +++ b/package/usbmount/usbmount.mk @@ -20,9 +20,7 @@ define USBMOUNT_INSTALL_TARGET_CMDS $(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink $(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules - @if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \ - $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \ - fi + $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf mkdir -p $(addprefix $(TARGET_DIR)/media/usb,0 1 2 3 4 5 6 7) endef