From: Alexander Dahl <post@lespocky.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/4] fix renamed macros
Date: Tue, 26 Mar 2013 14:05:23 +0100 [thread overview]
Message-ID: <1364303125-4866-3-git-send-email-post@lespocky.de> (raw)
In-Reply-To: <1364303125-4866-1-git-send-email-post@lespocky.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 <post@lespocky.de>
---
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
next prev parent reply other threads:[~2013-03-26 13:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-26 13:05 [ptxdist] dropbear: fixing some stuff, version bump, new hashes Alexander Dahl
2013-03-26 13:05 ` [ptxdist] [PATCH 1/4] remove long gone options Alexander Dahl
2013-03-26 13:05 ` Alexander Dahl [this message]
2013-03-26 13:05 ` [ptxdist] [PATCH 3/4] bump upstream version and recreate patch series Alexander Dahl
2013-03-26 13:05 ` [ptxdist] [PATCH 4/4] add options for recently added SHA256 and SHA512 hashes Alexander Dahl
2013-03-27 18:21 ` [ptxdist] dropbear: fixing some stuff, version bump, new hashes Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364303125-4866-3-git-send-email-post@lespocky.de \
--to=post@lespocky.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox