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/cryptinit | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/cryptinit')
-rw-r--r-- | package/cryptinit/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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@ |