Patchwork dropbear: disable standalone mode for nommu

login
register
mail settings
Submitter Gustavo Zacarias
Date May 7, 2013, 12:39 p.m.
Message ID <1367930399-28232-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/242196/
State Superseded
Headers show

Comments

Gustavo Zacarias - May 7, 2013, 12:39 p.m.
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 <gustavo@zacarias.com.ar>
---
 package/dropbear/dropbear.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
Peter Korsgaard - May 7, 2013, 1:30 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> dropbear for nommu targets must disable the standalone (non-inetd) mode
 Gustavo> since the platform lacks fork(), fixes:
 Gustavo> http://autobuild.buildroot.net/results/ecbdfab10f54bec75c112bbf005bba9ae2b18dc8/

Then we should probably also not install the initscript. It would also be
good to move the initscript handling to DROPBEAR_INSTALL_INIT_SYSV while
we're at it.


 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Gustavo> ---
 Gustavo>  package/dropbear/dropbear.mk | 8 ++++++++
 Gustavo>  1 file changed, 8 insertions(+)

 Gustavo> diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
 Gustavo> index d5dfe6d..50f6100 100644
 Gustavo> --- a/package/dropbear/dropbear.mk
 Gustavo> +++ b/package/dropbear/dropbear.mk
 Gustavo> @@ -39,6 +39,14 @@ define DROPBEAR_BUILD_FEATURED
 Gustavo>  	$(SED) 's:.*\(#define DROPBEAR_SHA2_512_HMAC\).*:\1:' $(@D)/options.h
 Gustavo>  endef
 
 Gustavo> +define DROPBEAR_DISABLE_STANDALONE
 Gustavo> +	$(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h
 Gustavo> +endef
 Gustavo> +
 Gustavo> +ifeq ($(BR2_USE_MMU),)
 Gustavo> +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE
 Gustavo> +endif
 Gustavo> +
 Gustavo>  ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y)
 Gustavo>  DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS
 Gustavo>  endif
 Gustavo> -- 
 Gustavo> 1.8.1.5

 Gustavo> _______________________________________________
 Gustavo> buildroot mailing list
 Gustavo> buildroot@busybox.net
 Gustavo> http://lists.busybox.net/mailman/listinfo/buildroot

Patch

diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index d5dfe6d..50f6100 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -39,6 +39,14 @@  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),)
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE
+endif
+
 ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y)
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS
 endif