Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7631 from neheb/patch-1

Browse source 
cryptsetup: replace libgcrypt with AFALG and remove OpenSSL variant
This commit is contained in:
Daniel Golle 2019-02-08 14:12:00 +01:00 committed by GitHub
commit 243b06bef5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
utils/cryptsetup/Makefile
View file

@ -9,63 +9,41 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cryptsetup PKG_NAME:=cryptsetup
PKG_VERSION:=2.0.6 PKG_VERSION:=2.0.6
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.0 PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.0
PKG_HASH:=7c51fae0f0e7ea9af0f515b2ac77009fb2969a6619ebab47d097dca38b083d30 PKG_HASH:=7c51fae0f0e7ea9af0f515b2ac77009fb2969a6619ebab47d097dca38b083d30
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0+ LGPL-2.1+ PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
PKG_LICENSE_FILES:=COPYING COPYING.LGPL PKG_LICENSE_FILES:=COPYING COPYING.LGPL
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib define Package/cryptsetup
define Package/cryptsetup/Default
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
SUBMENU:=Encryption SUBMENU:=Encryption
TITLE:=Cryptsetup TITLE:=Cryptsetup
DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libdevmapper +libjson-c +@KERNEL_DIRECT_IO DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libdevmapper +libjson-c +@KERNEL_DIRECT_IO +kmod-crypto-user
URL:=https://gitlab.com/cryptsetup/cryptsetup/ URL:=https://gitlab.com/cryptsetup/cryptsetup/
endef endef
define Package/cryptsetup
$(call Package/cryptsetup/Default)
DEPENDS+=+libgcrypt
VARIANT:=gcrypt
endef
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 Package/cryptsetup/description define Package/cryptsetup/description
$(call Package/cryptsetup/Default/description) Cryptsetup is utility used to conveniently setup disk encryption based on DMCrypt kernel module.
linked against libgcrypt
endef endef
CONFIGURE_ARGS += \
define Package/cryptsetup-openssl/description --disable-cryptsetup-reencrypt \
$(call Package/cryptsetup/Default/description) --disable-integritysetup \
linked against openssl --disable-selinux \
endef --disable-rpath \
--disable-veritysetup \
ifeq ($(BUILD_VARIANT),openssl) --disable-udev \
CONFIGURE_ARGS+= \ --with-default-luks-format=LUKS2 \
--with-crypto_backend=openssl --with-crypto_backend=kernel
endif
define Package/cryptsetup/install define Package/cryptsetup/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
@ -74,7 +52,4 @@ define Package/cryptsetup/install
$(CP) $(PKG_BUILD_DIR)/.libs/libcryptsetup.so* $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/.libs/libcryptsetup.so* $(1)/usr/lib
endef endef
Package/cryptsetup-openssl/install = $(Package/cryptsetup/install)
$(eval $(call BuildPackage,cryptsetup)) $(eval $(call BuildPackage,cryptsetup))
$(eval $(call BuildPackage,cryptsetup-openssl))