From patchwork Tue May 7 13:45:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 242294 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 043852C0163 for ; Tue, 7 May 2013 23:46:06 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 755712020A; Tue, 7 May 2013 13:46:05 +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 Enlj9ESxJ4fG; Tue, 7 May 2013 13:46:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 02A92313A3; Tue, 7 May 2013 13:46:04 +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 EB39D8F79A for ; Tue, 7 May 2013 13:46:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 67E5F8C465 for ; Tue, 7 May 2013 13:46:03 +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 9fn7dEFuU+gl for ; Tue, 7 May 2013 13:46:01 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7872A8C3BF for ; Tue, 7 May 2013 13:46:01 +0000 (UTC) Received: from asgard (host147.190-138-228.telecom.net.ar [190.138.228.147]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r47DjqmB032155 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 7 May 2013 13:45:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1367934356; bh=QvNUrN/4J/b2DivxXBRtHlTPgLqtdj08j+cFmIv9k/o=; h=From:To:Cc:Subject:Date; b=qhLvLTr6WrNTsaVVCTc+cudGCoOfOAfOoZhLhtKPyf7DnoTkPxCsPdMNcxUuHEcPa Nbs8yUYel2VFtp0q9+caDy4sEhiJntOmfnALR8n8oce69IdxKfpTibztHbpb8bQ+6s i0IO/AZ4gE7atCW1T6DydfVLxQjc2tsGAQI8uYyo= Received: by asgard (sSMTP sendmail emulation); Tue, 07 May 2013 10:45:50 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 7 May 2013 10:45:50 -0300 Message-Id: <1367934350-31167-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCHv2] dropbear: disable standalone mode for nommu 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 dropbear for nommu targets must disable the standalone (non-inetd) mode since the platform lacks fork(), fixes: http://autobuild.buildroot.net/results/ecbdfab10f54bec75c112bbf005bba9ae2b18dc8/ Signed-off-by: Gustavo Zacarias --- package/dropbear/dropbear.mk | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index d5dfe6d..e00890e 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -39,6 +39,19 @@ define DROPBEAR_BUILD_FEATURED $(SED) 's:.*\(#define DROPBEAR_SHA2_512_HMAC\).*:\1:' $(@D)/options.h endef +define DROPBEAR_DISABLE_STANDALONE + $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h +endef + +ifeq ($(BR2_USE_MMU),y) +define DROPBEAR_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/dropbear/S50dropbear \ + $(TARGET_DIR)/etc/init.d/S50dropbear +endef +else +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE +endif + ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y) DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS endif @@ -64,15 +77,6 @@ define DROPBEAR_INSTALL_TARGET_CMDS for f in $(DROPBEAR_TARGET_BINS); do \ ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \ done - if [ ! -f $(TARGET_DIR)/etc/init.d/S50dropbear ]; then \ - $(INSTALL) -m 0755 -D package/dropbear/S50dropbear $(TARGET_DIR)/etc/init.d/S50dropbear; \ - fi -endef - -define DROPBEAR_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/usr/sbin/dropbear - rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(DROPBEAR_TARGET_BINS)) - rm -f $(TARGET_DIR)/etc/init.d/S50dropbear endef $(eval $(autotools-package))