From patchwork Thu Nov 27 21:57:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 415700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id B712C14017D for ; Fri, 28 Nov 2014 09:02:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DB0DC33899; Thu, 27 Nov 2014 22:02:21 +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 M3KzKzhqLJJ7; Thu, 27 Nov 2014 22:02:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 972C034152; Thu, 27 Nov 2014 22:02:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 79F151C2451 for ; Thu, 27 Nov 2014 22:02:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 68C708E2B5 for ; Thu, 27 Nov 2014 22:02:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hrwmYQarSgIO for ; Thu, 27 Nov 2014 22:02:13 +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 whitealder.osuosl.org (Postfix) with ESMTP id A97A08715A for ; Thu, 27 Nov 2014 22:02:12 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 332D8486C; Thu, 27 Nov 2014 23:02:16 +0100 (CET) Received: from localhost (unknown [151.16.38.253]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9B8554870; Thu, 27 Nov 2014 22:58:23 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 27 Nov 2014 22:57:12 +0100 Message-Id: <1417125452-18705-55-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 54/74] busybox: install init script 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/dmraid/dmraid.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 024b9b5..a6ed57f 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -18,9 +18,8 @@ DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE DMRAID_DEPENDENCIES = lvm2 define DMRAID_INSTALL_INIT_SYSV - [ -f $(TARGET_DIR)/etc/init.d/S20dmraid ] || \ - $(INSTALL) -D -m 0755 package/dmraid/S20dmraid \ - $(TARGET_DIR)/etc/init.d/S20dmraid + $(INSTALL) -D -m 0755 package/dmraid/S20dmraid \ + $(TARGET_DIR)/etc/init.d/S20dmraid endef $(eval $(autotools-package))