X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fdropbear%2FMakefile;h=1f4e47d4e72035e462ec5e3f294b1e94e1b561e5;hp=f5e9b154d1f2dccccd1cbd508fab0c9afbbe97d1;hb=5be70dfb578c8793084aa8b4526fad08d68a6155;hpb=02cdebbb91a33d8e24da1c94a9d93ac39be168a7

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index f5e9b154d..1f4e47d4e 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -12,28 +12,33 @@ PKG_NAME:=dropbear
 PKG_VERSION:=0.48.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
 PKG_MD5SUM:=ca8e53a766faec831882831364568421
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
+define Package/dropbear/Default
+  URL:=http://matt.ucc.asn.au/dropbear/
+endef
+
 define Package/dropbear
-SECTION:=base
-CATEGORY:=Base system
-DEFAULT:=y
-TITLE:=Small SSH 2 client/server
-DESCRIPTION:=A small SSH 2 server/client designed for small memory environments.
-URL:=http://matt.ucc.asn.au/dropbear/
+  $(call Package/dropbear/Default)
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Small SSH2 client/server
+  DESCRIPTION:=\
+	A small SSH2 server/client designed for small memory environments.
 endef
 
 define Package/dropbearconvert
-$(call Package/dropbear)
-TITLE:=Utility for converting SSH keys
-DEFAULT:=m if ALL
-DESCRIPTION:=Utility for converting SSH keys
+  $(call Package/dropbear/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Utility for converting SSH keys
 endef
 
 define Build/Configure
@@ -81,11 +86,13 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LD=$(TARGET_CC) \
+		$(TARGET_CONFIGURE_OPTS) \
+		LD="$(TARGET_CC)" \
 		PROGRAMS="dropbear dbclient dropbearkey scp" \
 		MULTI=1 SCPPROGRESS=1
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LD=$(TARGET_CC) \
+		$(TARGET_CONFIGURE_OPTS) \
+		LD="$(TARGET_CC)" \
 		PROGRAMS="dropbearconvert"
 endef
 	
@@ -98,8 +105,10 @@ define Package/dropbear/install
 	ln -sf ../sbin/dropbear $(1)/usr/bin/ssh
 	ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient
 	ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey
+	install -d -m0755 $(1)/etc/config
+	install -m0755 ./files/dropbear.config $(1)/etc/config/dropbear
 	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/dropbear.init $(1)/etc/init.d/S50dropbear
+	install -m0755 ./files/dropbear.init $(1)/etc/init.d/dropbear
 endef
 
 define Package/dropbearconvert/install