summaryrefslogtreecommitdiff
path: root/package/dropbear
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-23 17:42:27 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-23 17:42:27 +0200
commitd4f7c53cb32abb249cb810230b826bf6c8e0f813 (patch)
tree5bcc66051e2f68a31e2163d37f00f04690f201e9 /package/dropbear
parent83a08921a2f21d95822ca2a8da37f1e2f85ea717 (diff)
- cleanup and document PKG_template, ARCH parameter is not needed anymore
- use CPU_ARCH for fake dir and ipkg - enable DEBUG option in menu and rename to ADK_DEBUG
Diffstat (limited to 'package/dropbear')
-rw-r--r--package/dropbear/Makefile13
1 files changed, 2 insertions, 11 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 63b3e54e7..a7177388c 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES:= http://matt.ucc.asn.au/dropbear/releases/ \
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-pam \
@@ -42,14 +42,6 @@ do-build:
cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} \
PROGRAMS=dropbearconvert
-# evaluate startup options according to menuconfig selection
-DROPBEAR-OPTS-y = -g
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_NOTHING) =
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD_FOR_ROOT) = -g
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD) = -s
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT) = -w
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT_AND_PASSWORD) = -w -s
-
do-install:
# main package
$(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/init.d
@@ -63,7 +55,6 @@ do-install:
ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
$(INSTALL_DATA) ./files/dropbear.init \
$(IDIR_DROPBEAR)/etc/init.d/dropbear
- $(SED) "s/@OPTIONS@/$(DROPBEAR-OPTS-y)/g" $(IDIR_DROPBEAR)/CONTROL/postinst
# subpackage dropbearconvert
$(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin
$(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \