From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/cryptsetup/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package/cryptsetup/Makefile') diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 0d53188af..2e9d42f78 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -10,8 +10,7 @@ PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt -PKG_DEPENDS+= kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc -PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm +PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ -- cgit v1.2.3