Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Upgrade Cryptsetup 2.3 (fixes #669) #749

Closed
wants to merge 7 commits into from
Closed

WIP: Upgrade Cryptsetup 2.3 (fixes #669) #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b00cc6
Upgrade cryptsetup to version 2.3.3
alex-nitrokey Jun 10, 2020
7adcd4b
Add json-c as cryptsetup 2.3.3 dependency
alex-nitrokey Jun 10, 2020
f674a47
Add patch for cryptsetup 2.3.3
alex-nitrokey Jun 10, 2020
1ef8d14
Use configure parameter instead of patchfile for rpath
alex-nitrokey Jun 10, 2020
ff58f15
Fix build issue
alex-nitrokey Jun 16, 2020
19c1e8f
Clean up branch off testing stuff
alex-nitrokey Jun 16, 2020
07cc2b6
Separate json-c module from cryptsetup module
alex-nitrokey Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/cryptsetup
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
modules-$(CONFIG_CRYPTSETUP) += cryptsetup

cryptsetup_depends := util-linux popt lvm2 $(musl_dep)
cryptsetup_depends := util-linux popt lvm2 json-c $(musl_dep)

cryptsetup_version := 1.7.3
cryptsetup_version := 2.3.3
cryptsetup_dir := cryptsetup-$(cryptsetup_version)
cryptsetup_tar := cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_url := https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_hash := af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02
cryptsetup_url := https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-$(cryptsetup_version).tar.xz
cryptsetup_hash := 3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df

# Use an empty prefix so that the executables will not include the
# build path.
Expand All @@ -33,5 +33,5 @@ cryptsetup_output := \
src/.libs/veritysetup \

cryptsetup_libraries := \
lib/.libs/libcryptsetup.so.4 \
lib/.libs/libcryptsetup.so.12.6.0 \

19 changes: 19 additions & 0 deletions modules/json-c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
modules-$(CONFIG_CRYPTSETUP) += json-c

json-c_version := 0.14
json-c_dir := json-c-$(json-c_version)
json-c_tar := json-c-$(json-c_version).tar.gz
json-c_url := https://s3.amazonaws.com/json-c_releases/releases/json-c-$(json-c_version)-nodoc.tar.gz
json-c_hash := 99914e644a25201d82ccefa20430f7515c110923360f9ef46755527c02412afa

# there is a bug in cmake-configure so that it can not be used with a "=", fxed in next
# release though (then it needs to read '--prefix="$(INSTALL)"' here instead
json-c_configure := mkdir -p build && \
cd build && \
../cmake-configure --prefix "$(INSTALL)"

json-c_target := \
$(CROSS_TOOLS) -C $(build)/$(json-c_dir)/build \
all install

json-c_libraries := .libs/libjson-c.so.5.0.0
7 changes: 3 additions & 4 deletions modules/util-linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ util-linux_target := \
DESTDIR="$(INSTALL)" \
install

util-linux_libraries += .libs/libuuid.so.1

# libblkid is not needed by lvm2, so it is not installed now
#util-linux_libraries += .libs/libblkid.so.1
util-linux_libraries += \
.libs/libuuid.so.1 \
.libs/libblkid.so.1 \

util-linux_depends := $(musl_dep)
Loading