From patchwork Sun Nov 30 14:18:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 416106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C3B3814012D for ; Mon, 1 Dec 2014 01:20:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EC8D91F30; Sun, 30 Nov 2014 14:20:08 +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 Mqeerg6Iog3N; Sun, 30 Nov 2014 14:20:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D10ED91D18; Sun, 30 Nov 2014 14:19:38 +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 452B11C2A63 for ; Sun, 30 Nov 2014 14:19:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4205831AA2 for ; Sun, 30 Nov 2014 14:19:18 +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 r4ttSwAI27-0 for ; Sun, 30 Nov 2014 14:19:17 +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 621882F60A for ; Sun, 30 Nov 2014 14:19:17 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 079205DB; Sun, 30 Nov 2014 15:19:21 +0100 (CET) Received: from localhost (pib31-1-78-237-111-234.fbx.proxad.net [78.237.111.234]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9EBD55D9; Sun, 30 Nov 2014 15:19:21 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 30 Nov 2014 15:18:01 +0100 Message-Id: <1417357142-14307-14-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417357142-14307-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1417357142-14307-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCHv3 13/74] samba: use _INSTALL_INIT_SYSV mechanism 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" Also makes the installation of the init script unconditional. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- package/samba/samba.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/samba/samba.mk b/package/samba/samba.mk index ec8e6ec..92bbe4e 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -176,17 +176,17 @@ ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION endif -define SAMBA_INSTALL_INITSCRIPTS_CONFIG - # install start/stop script - @if [ ! -f $(TARGET_DIR)/etc/init.d/S91smb ]; then \ - $(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d/S91smb; \ - fi +define SAMBA_INSTALL_CONFIG # install config @if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ]; then \ $(INSTALL) -m 0644 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \ fi endef -SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_INITSCRIPTS_CONFIG +SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_CONFIG + +define SAMBA_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d/S91smb +endef $(eval $(autotools-package))