From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/dropbear/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'package/dropbear') 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 \ -- cgit v1.2.3