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/kexec-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kexec-tools/Makefile') diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index cda4c488f..60771a4e7 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= kexec-tools PKG_VERSION:= 2.0.5 PKG_RELEASE:= 3 PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257 -PKG_DESCR:= kexec tools -PKG_SECTION:= misc +PKG_DESCR:= kernel exec tools +PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib PKG_BUILDEP:= zlib PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ -- cgit v1.2.3