cryptsetup update to 1.6.2 and add version that links against openssl instead of...

Signed-off-by: Peter Wagner <tripolar@gmx.at>
SVN-Revision: 38271

diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile
index e8c0fc4ae5da22bf072d62a2bd068be8e1001831..5793da58e403c157ae13e6244ba5832c3c26cbfd 100644 (file)
--- a/utils/cryptsetup/Makefile
+++ b/utils/cryptsetup/Makefile
@@ -8,43 +8,68 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cryptsetup
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.6.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://cryptsetup.googlecode.com/files/
-PKG_MD5SUM:=9253b3f29abf5c6f333eb74128b0df1c
+PKG_MD5SUM:=cd834da49fbe92dd66df02cc5c61280f
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/cryptsetup/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Cryptsetup
+  DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libdevmapper +@KERNEL_DIRECT_IO
   URL:=http://code.google.com/p/cryptsetup/
 endef
 
 define Package/cryptsetup
 $(call Package/cryptsetup/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Cryptsetup
-  DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libgcrypt +libdevmapper +@KERNEL_DIRECT_IO
+  DEPENDS+=+libgcrypt
+  VARIANT:=gcrypt
 endef
 
-define Package/cryptsetup/description
+define Package/cryptsetup-openssl
+$(call Package/cryptsetup/Default)
+  TITLE+= (with openssl support)
+  DEPENDS+=+libopenssl
+  VARIANT:=openssl
+endef
+
+define Package/cryptsetup/Default/description
        Cryptsetup-luks
 endef
 
-define Build/Compile
-       $(call Build/Configure/Default)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+define Package/cryptsetup/description
+$(call Package/cryptsetup/Default/description)
+linked against libgcrypt
+endef
+
+
+define Package/cryptsetup-openssl/description
+$(call Package/cryptsetup/Default/description)
+linked against openssl
 endef
 
+ifeq ($(BUILD_VARIANT),openssl)
+CONFIGURE_ARGS+= \
+        --with-crypto_backend=openssl
+endif
+
 define Package/cryptsetup/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cryptsetup $(1)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/src/.libs/cryptsetup $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptsetup.so.* $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/lib/.libs/libcryptsetup.so* $(1)/usr/lib
 endef
 
+Package/cryptsetup-openssl/install = $(Package/cryptsetup/install)
+
 $(eval $(call BuildPackage,cryptsetup))
+$(eval $(call BuildPackage,cryptsetup-openssl))