Changeset 38271


Ignore:
Timestamp:
2013-10-01T21:56:02+02:00 (4 years ago)
Author:
tripolar
Message:

[packages] cryptsetup update to 1.6.2 and add version that links against openssl
instead of libgcrypt

Signed-off-by: Peter Wagner <tripolar@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/cryptsetup/Makefile

    r35343 r38271  
    99 
    1010PKG_NAME:=cryptsetup 
    11 PKG_VERSION:=1.4.1 
     11PKG_VERSION:=1.6.2 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://cryptsetup.googlecode.com/files/ 
    16 PKG_MD5SUM:=9253b3f29abf5c6f333eb74128b0df1c 
     16PKG_MD5SUM:=cd834da49fbe92dd66df02cc5c61280f 
     17 
     18PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 
    1719 
    1820include $(INCLUDE_DIR)/package.mk 
     
    2123 
    2224define Package/cryptsetup/Default 
     25  SECTION:=utils 
     26  CATEGORY:=Utilities 
     27  TITLE:=Cryptsetup 
     28  DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libdevmapper +@KERNEL_DIRECT_IO 
    2329  URL:=http://code.google.com/p/cryptsetup/ 
    2430endef 
     
    2632define Package/cryptsetup 
    2733$(call Package/cryptsetup/Default) 
    28   SECTION:=utils 
    29   CATEGORY:=Utilities 
    30   TITLE:=Cryptsetup 
    31   DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libgcrypt +libdevmapper +@KERNEL_DIRECT_IO 
     34  DEPENDS+=+libgcrypt 
     35  VARIANT:=gcrypt 
     36endef 
     37 
     38define Package/cryptsetup-openssl 
     39$(call Package/cryptsetup/Default) 
     40  TITLE+= (with openssl support) 
     41  DEPENDS+=+libopenssl 
     42  VARIANT:=openssl 
     43endef 
     44 
     45define Package/cryptsetup/Default/description 
     46        Cryptsetup-luks 
    3247endef 
    3348 
    3449define Package/cryptsetup/description 
    35         Cryptsetup-luks 
     50$(call Package/cryptsetup/Default/description) 
     51linked against libgcrypt 
    3652endef 
    3753 
    38 define Build/Compile 
    39         $(call Build/Configure/Default) 
    40         $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install 
     54 
     55define Package/cryptsetup-openssl/description 
     56$(call Package/cryptsetup/Default/description) 
     57linked against openssl 
    4158endef 
     59 
     60ifeq ($(BUILD_VARIANT),openssl) 
     61CONFIGURE_ARGS+= \ 
     62        --with-crypto_backend=openssl 
     63endif 
    4264 
    4365define Package/cryptsetup/install 
    4466        $(INSTALL_DIR) $(1)/usr/sbin 
    45         $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cryptsetup $(1)/usr/sbin 
     67        $(CP) $(PKG_BUILD_DIR)/src/.libs/cryptsetup $(1)/usr/sbin 
    4668        $(INSTALL_DIR) $(1)/usr/lib 
    47         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptsetup.so.* $(1)/usr/lib 
     69        $(CP) $(PKG_BUILD_DIR)/lib/.libs/libcryptsetup.so* $(1)/usr/lib 
    4870endef 
    4971 
     72Package/cryptsetup-openssl/install = $(Package/cryptsetup/install) 
     73 
    5074$(eval $(call BuildPackage,cryptsetup)) 
     75$(eval $(call BuildPackage,cryptsetup-openssl)) 
Note: See TracChangeset for help on using the changeset viewer.