qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-01 20:48:28 +02:00
Code

disable dropbear zlib support and split off dropbearconvert to save flash space

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3085 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-01-31 13:33:25 +00:00
parent 4ea1bb2983
commit 862e9645df
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openwrt/package/dropbear/Config.in
View File

@ -2,9 +2,13 @@ config BR2_PACKAGE_DROPBEAR
prompt "dropbear.......................... Small SSH 2 client/server"
tristate
default y
select BR2_PACKAGE_ZLIB
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

14
openwrt/package/dropbear/Makefile
View File

@ -16,6 +16,7 @@ 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)))
$(PKG_BUILD_DIR)/.configured:
$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
@ -58,15 +59,25 @@ $(PKG_BUILD_DIR)/.configured:
--disable-loginfunc \
--disable-pututline \
--disable-pututxline \
--disable-zlib \
);
touch $@
$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
LD=$(TARGET_CC) \
PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1
$(MAKE) -C $(PKG_BUILD_DIR) \
LD=$(TARGET_CC) \
PROGRAMS="dropbearconvert"
touch $@
$(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):
mkdir -p $(IDIR_DROPBEAR)/usr/bin
@ -78,7 +89,6 @@ $(IPKG_DROPBEAR):
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
ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearconvert
mkdir -p $(IDIR_DROPBEAR)/etc/init.d
install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
$(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR)

5
openwrt/package/dropbear/ipkg/dropbearconvert.control Normal file
View File

@ -0,0 +1,5 @@
Package: dropbearconvert
Priority: optional
Depends: zlib
Section: net
Description: Utility for converting SSH keys

14
openwrt/package/dropbear/patches/150-dbconvert_standalone.patch Normal file
View File

@ -0,0 +1,14 @@
--- dropbear-0.47.old/options.h 2006-01-31 13:36:25.301562500 +0100
+++ dropbear-0.47.dev/options.h 2006-01-31 13:37:41.846346250 +0100
@@ -5,6 +5,11 @@
#ifndef _OPTIONS_H_
#define _OPTIONS_H_
+#if !defined(DROPBEAR_CLIENT) && !defined(DROPBEAR_SERVER)
+#define DROPBEAR_SERVER
+#define DROPBEAR_CLIENT
+#endif
+
/******************************************************************
* Define compile-time options below - the "#ifndef DROPBEAR_XXX .... #endif"
* parts are to allow for commandline -DDROPBEAR_XXX options etc.