From e4d1fb27c68e34fc0249ff28dc4699d70e376f41 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 13 Mar 2020 13:05:12 -0700 Subject: [PATCH] cryptsetup: add NLS support Needed for uClibc-ng. Added InstallDev section. Because why not. Signed-off-by: Rosen Penev --- utils/cryptsetup/Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile index a09b81b26..a928a521c 100644 --- a/utils/cryptsetup/Makefile +++ b/utils/cryptsetup/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cryptsetup PKG_VERSION:=2.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.3 @@ -23,13 +23,14 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk define Package/cryptsetup SECTION:=utils CATEGORY:=Utilities SUBMENU:=Encryption TITLE:=Cryptsetup - DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libdevmapper +libjson-c +@KERNEL_DIRECT_IO +kmod-crypto-user + DEPENDS:=$(ICONV_DEPENDS) +libblkid +libuuid +libpopt +lvm2 +libdevmapper +libjson-c +@KERNEL_DIRECT_IO +kmod-crypto-user URL:=https://gitlab.com/cryptsetup/cryptsetup/ endef @@ -48,11 +49,22 @@ CONFIGURE_ARGS += \ --with-luks2-lock-path=/var/run/cryptsetup \ --with-crypto_backend=kernel +TARGET_LDFLAGS += -liconv + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libcryptsetup.h $(1)/usr/include + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptsetup.so* $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libcryptsetup.pc $(1)/usr/lib/pkgconfig +endef + define Package/cryptsetup/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/cryptsetup $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptsetup.so* $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/cryptsetup $(1)/usr/sbin endef $(eval $(call BuildPackage,cryptsetup))