summaryrefslogtreecommitdiffstats
path: root/rules/dropbear.make
diff options
context:
space:
mode:
authorAlexander Dahl <post@lespocky.de>2013-03-26 14:05:23 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-03-27 19:17:02 +0100
commit0a9b4b96e856610478da7e1cbd671ee153fbc46c (patch)
treea60781a82168eeb8dbd9669a9479ac0664194a51 /rules/dropbear.make
parentaaa304a15c9d8e701c87d8f052ca4dd7e351708b (diff)
downloadptxdist-0a9b4b96e856610478da7e1cbd671ee153fbc46c.tar.gz
ptxdist-0a9b4b96e856610478da7e1cbd671ee153fbc46c.tar.xz
fix renamed macros
Some macros in options.h were split up in two long time ago. Nobody adapted this makefile up to now. This solution uses the same way it's solved with ENABLE_CLI_LOCALTCPFW and ENABLE_SRV_LOCALTCPFWD and does not introduce new options in menu but simply sets both options in option.h. Signed-off-by: Alexander Dahl <post@lespocky.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dropbear.make')
-rw-r--r--rules/dropbear.make18
1 files changed, 12 insertions, 6 deletions
diff --git a/rules/dropbear.make b/rules/dropbear.make
index efa00c2b4..57dfe0b67 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -106,10 +106,12 @@ endif
ifdef PTXCONF_DROPBEAR_DIS_AGENT
@echo "ptxdist: disabling agent"
- @$(call disable_c, $(DROPBEAR_DIR)/options.h,ENABLE_AGENTFWD)
+ @$(call disable_c, $(DROPBEAR_DIR)/options.h,ENABLE_SVR_AGENTFWD)
+ @$(call disable_c, $(DROPBEAR_DIR)/options.h,ENABLE_CLI_AGENTFWD)
else
@echo "ptxdist: enabling agent"
- @$(call enable_c, $(DROPBEAR_DIR)/options.h,ENABLE_AGENTFWD)
+ @$(call enable_c, $(DROPBEAR_DIR)/options.h,ENABLE_SVR_AGENTFWD)
+ @$(call enable_c, $(DROPBEAR_DIR)/options.h,ENABLE_CLI_AGENTFWD)
endif
@@ -206,18 +208,22 @@ endif
ifdef PTXCONF_DROPBEAR_PASSWD
@echo "ptxdist: enabling passwd"
- @$(call enable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_PASSWORD_AUTH)
+ @$(call enable_c, $(DROPBEAR_DIR)/options.h,ENABLE_SVR_PASSWORD_AUTH)
+ @$(call enable_c, $(DROPBEAR_DIR)/options.h,ENABLE_CLI_PASSWORD_AUTH)
else
@echo "ptxdist: disabling passwd"
- @$(call disable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_PASSWORD_AUTH)
+ @$(call disable_c, $(DROPBEAR_DIR)/options.h,ENABLE_SVR_PASSWORD_AUTH)
+ @$(call disable_c, $(DROPBEAR_DIR)/options.h,ENABLE_CLI_PASSWORD_AUTH)
endif
ifdef PTXCONF_DROPBEAR_PUBKEY
@echo "ptxdist: enabling pubkey"
- @$(call enable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_PUBKEY_AUTH)
+ @$(call enable_c, $(DROPBEAR_DIR)/options.h,ENABLE_SVR_PUBKEY_AUTH)
+ @$(call enable_c, $(DROPBEAR_DIR)/options.h,ENABLE_CLI_PUBKEY_AUTH)
else
@echo "ptxdist: disabling pubkey"
- @$(call disable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_PUBKEY_AUTH)
+ @$(call disable_c, $(DROPBEAR_DIR)/options.h,ENABLE_SVR_PUBKEY_AUTH)
+ @$(call disable_c, $(DROPBEAR_DIR)/options.h,ENABLE_CLI_PUBKEY_AUTH)
endif
@$(call touch)