diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/dropbear/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/dropbear/Makefile')
| -rw-r--r-- | package/dropbear/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index c73d34a90..2de8b0b98 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= dropbear PKG_VERSION:= 2014.63 PKG_RELEASE:= 2 PKG_MD5SUM:= 7066bb9a2da708f3ed06314fdc9c47fd -PKG_DESCR:= SSH 2 server/client designed for embedded systems +PKG_DESCR:= ssh server/client designed for embedded systems PKG_SECTION:= net/security PKG_URL:= http://matt.ucc.asn.au/dropbear/ PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ @@ -25,10 +25,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DROPBEAR,dropbear,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION})) -ifeq ($(ADK_STATIC),y) -TARGET_LDFLAGS+= -static -endif - BUILD_STYLE:= manual INSTALL_STYLE:= manual CONFIGURE_ARGS+= --disable-pam \ |