From patchwork Wed Jul 11 04:14:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danomi Manchego X-Patchwork-Id: 170348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 63E2D2C01CC for ; Wed, 11 Jul 2012 14:14:50 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6C275A04B1; Wed, 11 Jul 2012 04:14:49 +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 wjVCQ5A3qcHB; Wed, 11 Jul 2012 04:14:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4E343A032B; Wed, 11 Jul 2012 04:14:48 +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 57C9B8F75B for ; Wed, 11 Jul 2012 04:14:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 53F32275D8 for ; Wed, 11 Jul 2012 04:14:47 +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 BU8r9CKjpnhK for ; Wed, 11 Jul 2012 04:14:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from qmta13.westchester.pa.mail.comcast.net (qmta13.westchester.pa.mail.comcast.net [76.96.59.243]) by silver.osuosl.org (Postfix) with ESMTP id 1372624FA5 for ; Wed, 11 Jul 2012 04:14:45 +0000 (UTC) Received: from omta22.westchester.pa.mail.comcast.net ([76.96.62.73]) by qmta13.westchester.pa.mail.comcast.net with comcast id Yqkz1j0031ap0As5DsEo3d; Wed, 11 Jul 2012 04:14:48 +0000 Received: from localhost.localdomain ([68.37.48.40]) by omta22.westchester.pa.mail.comcast.net with comcast id YsEw1j0030s1VyU3isEwJB; Wed, 11 Jul 2012 04:14:56 +0000 From: Danomi Manchego To: buildroot@uclibc.org Date: Wed, 11 Jul 2012 00:14:36 -0400 Message-Id: <1341980076-28347-1-git-send-email-danomimanchego123@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] avahi: only install default.script/S05avahi-setup.sh if not present in fs skeleton X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net To allow custom scripts in the target skeletons. Signed-off-by: Danomi Manchego Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/avahi/avahi.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 32e3df7..481da03 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -144,8 +144,14 @@ AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_INITSCRIPT define AVAHI_INSTALL_AUTOIPD rm -rf $(TARGET_DIR)/etc/dhcp3/ - $(INSTALL) -D -m 0755 package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script - $(INSTALL) -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/ + if [ ! -f $(TARGET_DIR)/usr/share/udhcpc/default.script ]; then \ + $(INSTALL) -m 0755 -D package/avahi/busybox-udhcpc-default.script \ + $(TARGET_DIR)/usr/share/udhcpc/default.script; \ + fi + if [ ! -f $(TARGET_DIR)/etc/init.d/S05avahi-setup.sh ]; then \ + $(INSTALL) -m 0755 -D package/avahi/S05avahi-setup.sh \ + $(TARGET_DIR)/etc/init.d/S05avahi-setup.sh; \ + fi rm -f $(TARGET_DIR)/var/lib/avahi-autoipd $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/lib ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd