Commit da7f6f73 authored by HardenedVault's avatar HardenedVault
Browse files

make cryptsetup1/cryptsetup2 optional

parent 057cc3c3
modules-$(CONFIG_CRYPTSETUP) += cryptsetup
cryptsetup_depends := util-linux popt lvm2 json-c $(musl_dep)
cryptsetup_depends := util-linux popt lvm2 $(musl_dep)
cryptsetup_version := 2.3.3
cryptsetup_version := 1.7.3
cryptsetup_dir := cryptsetup-$(cryptsetup_version)
cryptsetup_tar := cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_url := https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_hash := 3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df
cryptsetup_url := https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_hash := af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02
# Use an empty prefix so that the executables will not include the
# build path.
......@@ -14,11 +14,9 @@ cryptsetup_configure := ./configure \
$(CROSS_TOOLS) \
--host i386-elf-linux \
--prefix "/" \
--disable-rpath \
--disable-gcrypt-pbkdf2 \
--enable-cryptsetup-reencrypt \
--with-crypto_backend=kernel \
--with-tmpfilesdir=$(INSTALL)/lib/tmpfiles.d
# but after building, replace prefix so that they will be installed
# in the correct directory.
......@@ -30,10 +28,10 @@ cryptsetup_target := \
install
cryptsetup_output := \
.libs/cryptsetup \
.libs/cryptsetup-reencrypt \
.libs/veritysetup \
src/.libs/cryptsetup \
src/.libs/cryptsetup-reencrypt \
src/.libs/veritysetup \
cryptsetup_libraries := \
.libs/libcryptsetup.so.12 \
lib/.libs/libcryptsetup.so.4 \
modules-$(CONFIG_CRYPTSETUP2) += cryptsetup2
cryptsetup2_depends := util-linux popt lvm2 json-c $(musl_dep)
cryptsetup2_version := 2.3.3
cryptsetup2_dir := cryptsetup-$(cryptsetup2_version)
cryptsetup2_tar := cryptsetup-$(cryptsetup2_version).tar.xz
cryptsetup2_url := https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-$(cryptsetup2_version).tar.xz
cryptsetup2_hash := 3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df
# Use an empty prefix so that the executables will not include the
# build path.
cryptsetup2_configure := ./configure \
$(CROSS_TOOLS) \
--host i386-elf-linux \
--prefix "/" \
--disable-rpath \
--disable-gcrypt-pbkdf2 \
--enable-cryptsetup-reencrypt \
--with-crypto_backend=kernel \
--with-tmpfilesdir=$(INSTALL)/lib/tmpfiles.d
# but after building, replace prefix so that they will be installed
# in the correct directory.
cryptsetup2_target := \
$(MAKE_JOBS) \
&& $(MAKE) \
-C $(build)/$(cryptsetup2_dir) \
prefix="$(INSTALL)" \
install
cryptsetup2_output := \
.libs/cryptsetup \
.libs/cryptsetup-reencrypt \
.libs/veritysetup \
cryptsetup2_libraries := \
.libs/libcryptsetup.so.12 \
modules-$(CONFIG_CRYPTSETUP) += json-c
modules-$(CONFIG_CRYPTSETUP2) += json-c
json-c_version := 0.14
json-c_dir := json-c-$(json-c_version)
......
diff -u --recursive ../../clean/cryptsetup-1.7.3/src/Makefile.in ./cryptsetup-1.7.3/src/Makefile.in
--- ../../clean/cryptsetup-1.7.3/src/Makefile.in 2016-10-28 09:45:06.000000000 -0400
+++ cryptsetup-1.7.3/src/Makefile.in 2017-01-27 17:24:13.115962328 -0500
@@ -479,6 +479,8 @@
cryptsetup_LDADD = \
$(top_builddir)/lib/libcryptsetup.la \
@POPT_LIBS@ \
+ @UUID_LIBS@ \
+ @DEVMAPPER_LIBS@ \
@PWQUALITY_LIBS@ \
@PASSWDQC_LIBS@
@@ -503,6 +505,8 @@
@VERITYSETUP_TRUE@veritysetup_LDADD = \
@VERITYSETUP_TRUE@ $(top_builddir)/lib/libcryptsetup.la \
+@VERITYSETUP_TRUE@ @UUID_LIBS@ \
+@VERITYSETUP_TRUE@ @DEVMAPPER_LIBS@ \
@VERITYSETUP_TRUE@ @POPT_LIBS@
@VERITYSETUP_TRUE@veritysetup_CFLAGS = $(cryptsetup_CFLAGS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment