From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from moutng.kundenserver.de ([212.227.126.187]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1UKTZt-0007cV-MR for ptxdist@pengutronix.de; Tue, 26 Mar 2013 14:06:15 +0100 From: Alexander Dahl Date: Tue, 26 Mar 2013 14:05:23 +0100 Message-Id: <1364303125-4866-3-git-send-email-post@lespocky.de> In-Reply-To: <1364303125-4866-1-git-send-email-post@lespocky.de> References: <1364303125-4866-1-git-send-email-post@lespocky.de> Subject: [ptxdist] [PATCH 2/4] fix renamed macros Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de 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 --- rules/dropbear.make | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rules/dropbear.make b/rules/dropbear.make index efa00c2..57dfe0b 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) -- 1.7.2.5 -- ptxdist mailing list ptxdist@pengutronix.de