From patchwork Thu Nov 27 21:57:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 415698 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 11C6C1401DC for ; Fri, 28 Nov 2014 09:02:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2B0603386F; Thu, 27 Nov 2014 22:02:10 +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 h8McnmaBSs5e; Thu, 27 Nov 2014 22:02:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9649834118; Thu, 27 Nov 2014 22:02:06 +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 EA4821C2451 for ; Thu, 27 Nov 2014 22:02:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E79AB957C5 for ; Thu, 27 Nov 2014 22:02:02 +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 Yb0WBsnJpBtR for ; Thu, 27 Nov 2014 22:02:02 +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 6BCAF95753 for ; Thu, 27 Nov 2014 22:02:02 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 01E4F486D; Thu, 27 Nov 2014 23:02:06 +0100 (CET) Received: from localhost (unknown [151.16.38.253]) by mail.free-electrons.com (Postfix) with ESMTPSA id BF903486E; Thu, 27 Nov 2014 22:58:22 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 27 Nov 2014 22:57:11 +0100 Message-Id: <1417125452-18705-54-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 53/74] busybox: install init script and config 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/busybox/busybox.mk | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index eb2f3f1..ae60ac1 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -57,14 +57,12 @@ endef # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y) define BUSYBOX_INSTALL_MDEV_SCRIPT - [ -f $(TARGET_DIR)/etc/init.d/S10mdev ] || \ - $(INSTALL) -D -m 0755 package/busybox/S10mdev \ - $(TARGET_DIR)/etc/init.d/S10mdev + $(INSTALL) -D -m 0755 package/busybox/S10mdev \ + $(TARGET_DIR)/etc/init.d/S10mdev endef define BUSYBOX_INSTALL_MDEV_CONF - [ -f $(TARGET_DIR)/etc/mdev.conf ] || \ - $(INSTALL) -D -m 0644 package/busybox/mdev.conf \ - $(TARGET_DIR)/etc/mdev.conf + $(INSTALL) -D -m 0644 package/busybox/mdev.conf \ + $(TARGET_DIR)/etc/mdev.conf endef define BUSYBOX_SET_MDEV $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG)) @@ -165,9 +163,8 @@ endif define BUSYBOX_INSTALL_LOGGING_SCRIPT if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \ - [ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \ - $(INSTALL) -m 0755 -D package/busybox/S01logging \ - $(TARGET_DIR)/etc/init.d/S01logging; \ + $(INSTALL) -m 0755 -D package/busybox/S01logging \ + $(TARGET_DIR)/etc/init.d/S01logging; \ else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi endef @@ -176,11 +173,10 @@ define BUSYBOX_SET_WATCHDOG $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG)) endef define BUSYBOX_INSTALL_WATCHDOG_SCRIPT - [ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \ - $(INSTALL) -D -m 0755 package/busybox/S15watchdog \ - $(TARGET_DIR)/etc/init.d/S15watchdog && \ - $(SED) s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \ - $(TARGET_DIR)/etc/init.d/S15watchdog + $(INSTALL) -D -m 0755 package/busybox/S15watchdog \ + $(TARGET_DIR)/etc/init.d/S15watchdog && \ + $(SED) s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \ + $(TARGET_DIR)/etc/init.d/S15watchdog endef endif @@ -214,10 +210,8 @@ endef define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install - if [ ! -f $(TARGET_DIR)/usr/share/udhcpc/default.script ]; then \ - $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ - $(TARGET_DIR)/usr/share/udhcpc/default.script; \ - fi + $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ + $(TARGET_DIR)/usr/share/udhcpc/default.script $(BUSYBOX_INSTALL_MDEV_CONF) endef