From patchwork Thu Nov 27 21:57:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 415716 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 6C15314017D for ; Fri, 28 Nov 2014 09:03:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B5203A3BC4; Thu, 27 Nov 2014 22:03:48 +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 Tcrwv5-Wxx81; Thu, 27 Nov 2014 22:03:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3DC9CA3C41; Thu, 27 Nov 2014 22:03:47 +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 920FE1CE6F9 for ; Thu, 27 Nov 2014 22:03:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 871FD3378A for ; Thu, 27 Nov 2014 22:03:46 +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 i5-5vjzzlJU8 for ; Thu, 27 Nov 2014 22:03:46 +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 silver.osuosl.org (Postfix) with ESMTP id C846933786 for ; Thu, 27 Nov 2014 22:03:45 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 6CB9348F4; Thu, 27 Nov 2014 23:03:50 +0100 (CET) Received: from localhost (unknown [151.16.38.253]) by mail.free-electrons.com (Postfix) with ESMTPSA id AEB8B4753; Thu, 27 Nov 2014 22:58:37 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 27 Nov 2014 22:57:29 +0100 Message-Id: <1417125452-18705-72-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 71/74] php: 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/php/php.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/php/php.mk b/package/php/php.mk index 9456f1c..caaf548 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -238,10 +238,8 @@ PHP_POST_INSTALL_TARGET_HOOKS += PHP_EXTENSIONS_FIXUP define PHP_INSTALL_FIXUP rm -rf $(TARGET_DIR)/usr/lib/php rm -f $(TARGET_DIR)/usr/bin/phpize - if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \ - $(INSTALL) -m 0755 $(PHP_DIR)/php.ini-production \ - $(TARGET_DIR)/etc/php.ini; \ - fi + $(INSTALL) -m 0755 $(PHP_DIR)/php.ini-production \ + $(TARGET_DIR)/etc/php.ini endef PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP