4 files changed, 34 insertions, 42 deletions
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
deleted file mode 100644
index efdc70b1a6..0000000000
--- a/package/dropbear/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_DROPBEAR
-	prompt "dropbear.......................... Small SSH 2 client/server"
-	tristate
-	default y
-	help
-	  A small SSH 2 server/client designed for small memory environments.
-	  
-	  http://matt.ucc.asn.au/dropbear/
-
-config BR2_PACKAGE_DBCONVERT
-	prompt   "dropbearconvert................. Utility for converting SSH keys"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_DROPBEAR
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 75eaf6e44c..ea452f2f62 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -5,20 +5,33 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dropbear
 PKG_VERSION:=0.48.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=ca8e53a766faec831882831364568421
 
-PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
+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 $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+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/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Package/dropbearconvert
+$(call Package/dropbear)
+DEFAULT:=m
+TITLE:=Utility for converting SSH keys
+DESCRIPTION:=Utility for converting SSH keys
+DEPENDS:=zlib
+endef
+
+define Build/Configure
 	$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
 	$(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
@@ -61,9 +74,9 @@ $(PKG_BUILD_DIR)/.configured:
 		--disable-pututxline \
 		--disable-zlib \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Buid/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LD=$(TARGET_CC) \
 		PROGRAMS="dropbear dbclient dropbearkey scp" \
@@ -71,24 +84,26 @@ $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LD=$(TARGET_CC) \
 		PROGRAMS="dropbearconvert"
-	touch $@
+endef
 	
-$(IPKG_DBCONVERT):
-	mkdir -p $(IDIR_DBCONVERT)/usr/bin
-	install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
-		$(IDIR_DBCONVERT)/usr/bin/dropbearconvert
-	$(IPKG_BUILD) $(IDIR_DBCONVERT) $(PACKAGE_DIR)
-
-$(IPKG_DROPBEAR):
+define Package/dropbear/install
 	mkdir -p $(IDIR_DROPBEAR)/usr/bin
 	mkdir -p $(IDIR_DROPBEAR)/usr/sbin
 	install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
 		$(IDIR_DROPBEAR)/usr/sbin/dropbear
-	$(STRIP) $(IDIR_DROPBEAR)/usr/sbin/dropbear
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/scp
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
 	mkdir -p $(IDIR_DROPBEAR)/etc/init.d
 	install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
-	$(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR)
+endef
+
+define Package/dropbearconvert/install
+	mkdir -p $(IDIR_DBCONVERT)/usr/bin
+	install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
+		$(IDIR_DBCONVERT)/usr/bin/dropbearconvert
+endef
+
+$(eval $(call BuildPackage,dropbear))
+$(eval $(call BuildPackage,dropbearconvert))
diff --git a/package/dropbear/ipkg/dropbear.control b/package/dropbear/ipkg/dropbear.control
deleted file mode 100644
index 0aa8cc5b82..0000000000
--- a/package/dropbear/ipkg/dropbear.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dropbear
-Priority: optional
-Section: net
-Description: a small SSH 2 server/client designed for small memory environments.
diff --git a/package/dropbear/ipkg/dropbearconvert.control b/package/dropbear/ipkg/dropbearconvert.control
deleted file mode 100644
index 9dd5ecd1aa..0000000000
--- a/package/dropbear/ipkg/dropbearconvert.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: dropbearconvert
-Priority: optional
-Depends: zlib
-Section: net
-Description: Utility for converting SSH keys