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/adkinstall/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/adkinstall/Makefile') diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 1ebfa2982..d9f5029d8 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk PKG_NAME:= adkinstall PKG_VERSION:= 2.0 PKG_RELEASE:= 1 -PKG_DESCR:= ADK disk/flash installer -PKG_SECTION:= base +PKG_DESCR:= adk disk/flash installer +PKG_SECTION:= base/misc PKG_DEPENDS:= mke2fs parted sfdisk dosfstools mksh PKG_SYSTEM_DEPENDS:= mikrotik-rb532 lemote-yeelong -- cgit v1.2.3