diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /package/cryptsetup/Makefile | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/cryptsetup/Makefile')
| -rw-r--r-- | package/cryptsetup/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
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/ |