From patchwork Mon Jun 24 12:04:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 253809 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id B2D392C0040 for ; Mon, 24 Jun 2013 22:04:26 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 36A0D3FCAC for ; Mon, 24 Jun 2013 14:04:21 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id A845B3FCAC for ; Mon, 24 Jun 2013 14:04:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1730; q=dns/txt; s=ironport1; t=1372075458; x=1403611458; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=gj+V658ivocYrPChrG3D/XPf+g5Of4TZFQiZxEyEWKM=; b=wIIvTzr3KctO9xtZjwQYenf25KtEcguKs+uOAopPbU/r5Njy+Xc1mvVR ho/5P1vYGMq673vah6qXffvsSzQ1Eq/+2sBTy0vd2KxgWtdOEbz6rlxlP vxB5ASjhuAdLqqPXQNEPsLskklVVMsbRqsEhSHKfRJBj771fFfE9c3dCH 8=; X-IronPort-AV: E=Sophos;i="4.87,928,1363129200"; d="scan'208";a="3224073" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 24 Jun 2013 14:04:18 +0200 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.342.3; Mon, 24 Jun 2013 14:04:17 +0200 Received: by localhost (Postfix, from userid 30019) id CA39668164F; Mon, 24 Jun 2013 12:04:17 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 1/1] USE_busybox_udhcpc_scripts will enable/disable installing udhcpc-scripts. Use this when providing your own script Date: Mon, 24 Jun 2013 12:04:15 +0000 Message-ID: <314472b4736e63eca96f60fc37875d18d0634a7f.1372075399.git.kibo@prevas.dk> X-Mailer: git-send-email 1.8.0.3 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Rasmussen --- recipes/busybox/busybox-install.inc | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/recipes/busybox/busybox-install.inc b/recipes/busybox/busybox-install.inc index bfb0c11..27e1ab4 100644 --- a/recipes/busybox/busybox-install.inc +++ b/recipes/busybox/busybox-install.inc @@ -8,6 +8,22 @@ INETD_CONF_FILES = "${SRCDIR}/inetd.conf.d" # busybox_suid_root = "" +RECIPE_FLAGS += "busybox_udhcpc_scripts" +DEFAULT_USE_busybox_udhcpc_scripts = "1" +DO_INSTALL_POSTFUNCS:>USE_busybox_udhcpc_scripts = " do_install_busybox_udhcpc_scripts" +do_install[postfuncs] += "${DO_INSTALL_POSTFUNCS}" + +do_install_busybox_udhcpc_scripts () { + if grep "CONFIG_UDHCPC=y" ${S}/.config; then + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${S}/examples/udhcp/simple.script \ + ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${SRCDIR}/default.script \ + ${D}${datadir}/udhcpc/default.script + fi +} + do_install () { if grep "CONFIG_INIT=y" ${S}/.config; then install -d ${D}${sysconfdir}/init.d @@ -37,15 +53,6 @@ do_install () { install -m 0644 ${SRCDIR}/mdev.conf ${D}${sysconfdir}/ fi - if grep "CONFIG_UDHCPC=y" ${S}/.config; then - install -d ${D}${sysconfdir}/udhcpc.d - install -d ${D}${datadir}/udhcpc - install -m 0755 ${S}/examples/udhcp/simple.script \ - ${D}${sysconfdir}/udhcpc.d/50default - install -m 0755 ${SRCDIR}/default.script \ - ${D}${datadir}/udhcpc/default.script - fi - if grep "CONFIG_INETD=y" ${S}/.config; then install -m 0644 ${SRCDIR}/inetd.conf ${D}${sysconfdir}/ fi