From patchwork Mon Jul 28 07:50:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 374109 X-Patchwork-Delegate: kiho@prevas.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 8869414012B for ; Mon, 28 Jul 2014 17:48:40 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 6027D3FB64 for ; Mon, 28 Jul 2014 09:48:38 +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 B2E503FBDB for ; Mon, 28 Jul 2014 09:48:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1716; q=dns/txt; s=ironport1; t=1406533714; x=1438069714; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=g1SOkyGdOXzzak/wk+zg//98u8y1c5cqtLvoKMQwl3Y=; b=ksF7I2R+gBPhnQ+pmAGRw4d/eIPWfsCNGviFqVulYsiT8KQgxhWj4wd/ ehvUKnEaSdjKXvwJrMVFxsB+w4jfJh5+zdD8Mgl8Z/8VnOpcNeC1oEuiM OK5bFNZuoU60ehJUtS/yr2t+L5C7GISy4oDMG074AgO06MQh+n0tjAy3v U=; X-IronPort-AV: E=Sophos;i="5.01,747,1400018400"; d="scan'208";a="4932839" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 28 Jul 2014 09:48:34 +0200 Received: from cbs-Latitude-E6540.prevas.se (172.16.11.11) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Mon, 28 Jul 2014 09:48:34 +0200 From: To: Subject: [PATCH 3/5] busybox: Add use flag for tftpd inetd Date: Mon, 28 Jul 2014 09:50:51 +0200 Message-ID: <9d4cae7ef146eb248b545dd830f60c5fdcc62286.1406533543.git.christian.braunersorensen@prevas.dk> X-Mailer: git-send-email 2.0.2 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.11.11] 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 Sørensen USE_busybox_tftpd_inetdcmd: May be used to set the inetd command when the tftpd is enabled. Signed-off-by: Christian Sørensen --- recipes/busybox/busybox-configure.inc | 4 +++- recipes/busybox/busybox-install.inc | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/busybox/busybox-configure.inc b/recipes/busybox/busybox-configure.inc index 68e56c8..9e545fb 100644 --- a/recipes/busybox/busybox-configure.inc +++ b/recipes/busybox/busybox-configure.inc @@ -386,8 +386,10 @@ CONFIG_FEATURE_TFTP_GET,\ CONFIG_FEATURE_TFTP_PUT,\ CONFIG_FEATURE_TFTP_BLOCKSIZE" # USE flag: tftp daemon root folder -RECIPE_FLAGS += "busybox_tftpd_dir" +RECIPE_FLAGS += "busybox_tftpd_dir busybox_tftpd_inetdcmd" DEFAULT_USE_busybox_tftpd_dir = "${servicedir}/tftp" +DEFAULT_USE_busybox_tftpd_inetdcmd = "tftp dgram udp nowait root tftpd tftpd \ + -c ${USE_busybox_tftpd_dir}" # USE flag: enable ftp server BUSYBOX_SIMPLE_USE_FLAGS += "ftpd:service/ftp:\ diff --git a/recipes/busybox/busybox-install.inc b/recipes/busybox/busybox-install.inc index 9928506..307afe6 100644 --- a/recipes/busybox/busybox-install.inc +++ b/recipes/busybox/busybox-install.inc @@ -51,8 +51,7 @@ do_install () { # put it where inetd class finds it, so it can be merged # with inetd.conf when generating image inetd_conf=${INETD_CONF_FILES} - echo "tftp dgram udp nowait root tftpd tftpd -c ${USE_busybox_tftpd_dir}" \ - >> $inetd_conf + echo $USE_busybox_tftpd_inetdcmd >> $inetd_conf fi install -d ${D}${USE_busybox_tftpd_dir} fi