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/cryptinit/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cryptinit') diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index 9cb15f95f..11935372a 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= cryptinit PKG_VERSION:= 2.0 PKG_RELEASE:= 1 PKG_DESCR:= init for encrypted rootfilesystem -PKG_SECTION:= base +PKG_SECTION:= base/misc PKG_DEPENDS:= cryptsetup PKG_CFLINE_CRYPTINIT:= select BUSYBOX_STTY@ -- cgit v1.2.3