From patchwork Thu Apr 5 14:17:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 150968 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 394A0B7055 for ; Fri, 6 Apr 2012 00:17:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 21AA8260A2; Thu, 5 Apr 2012 14:17:43 +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 2cs9gYrAmObV; Thu, 5 Apr 2012 14:17:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 00D6F20BC4; Thu, 5 Apr 2012 14:17:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B9DA98F78E for ; Thu, 5 Apr 2012 14:17:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A834E9043C for ; Thu, 5 Apr 2012 14:17:40 +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 2LnnIs26EBu4 for ; Thu, 5 Apr 2012 14:17:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8C3DE90312 for ; Thu, 5 Apr 2012 14:17:39 +0000 (UTC) Received: from asgard (host10.190-30-120.telecom.net.ar [190.30.120.10]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.4/8.14.4) with ESMTP id q35EHY1P019021 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 5 Apr 2012 11:17:36 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1333635458; bh=24uVGBHKUtnRyKU94XB4h+YDhseNkCxI9RXNAjBnfkY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=iG+ge/4OkLzQfTy1VJHKDXQ5fwpp+Bh+MNnp876ksVytn3qFVn/nrBg0m7p6W9GF4 iRLzeoTghuL96JBXjX8MY9oDFm8SdFeRBdixPRu/BiIZxKRMrfIE9c/2txlBtp6R6m IPXIOlmzrxhVDxQyzhAfSM1+9Caeual0DOYwchpE= Received: by asgard (sSMTP sendmail emulation); Thu, 05 Apr 2012 11:17:33 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 5 Apr 2012 11:17:07 -0300 Message-Id: <1333635427-24526-6-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1333635427-24526-1-git-send-email-gustavo@zacarias.com.ar> References: <1333635427-24526-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 6/6] dropbear: fix nommu build breakage 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 Signed-off-by: Gustavo Zacarias --- package/dropbear/dropbear-nommu.patch | 19 +++++++++++++++++++ package/dropbear/dropbear.mk | 5 +++++ 2 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 package/dropbear/dropbear-nommu.patch diff --git a/package/dropbear/dropbear-nommu.patch b/package/dropbear/dropbear-nommu.patch new file mode 100644 index 0000000..cf228e1 --- /dev/null +++ b/package/dropbear/dropbear-nommu.patch @@ -0,0 +1,19 @@ +Get rid of the last lingering fork() for nommu systems. + +Signed-off-by: Gustavo Zacarias + +diff -Nura dropbear-2012.55/svr-main.c dropbear-2012.55-nommu/svr-main.c +--- dropbear-2012.55/svr-main.c 2012-02-23 10:47:06.000000000 -0300 ++++ dropbear-2012.55-nommu/svr-main.c 2012-04-05 10:46:19.639718670 -0300 +@@ -262,7 +262,11 @@ + #ifdef DEBUG_NOFORK + fork_ret = 0; + #else ++# ifdef __uClinux__ ++ fork_ret = vfork(); ++# else + fork_ret = fork(); ++# endif + #endif + if (fork_ret < 0) { + dropbear_log(LOG_WARNING, "Error forking: %s", strerror(errno)); diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index fea96d6..3ce5a0e 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -10,6 +10,11 @@ DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" +# bfin 2011R1-RC4 toolchain doesn't define __uClinux__ +ifneq ($(BR2_USE_MMU),y) +DROPBEAR_MAKE += CPPFLAGS="-D__uClinux__" +endif + ifeq ($(BR2_PREFER_STATIC_LIB),y) DROPBEAR_MAKE += STATIC=1 endif