From 2d50e01071f43d0db9995320fb2f6ff6c810bbc9 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Thu, 21 May 2020 07:38:02 +0200 Subject: [PATCH] Make hotp-verification hashes same across two CIs Move from CMake build system to GNU Make for hotp-verification Change version to one supporting Makefile build Fixes https://github.com/osresearch/heads/pull/724 Connected: - https://github.com/Nitrokey/nitrokey-hotp-verification/issues/13 - https://github.com/osresearch/heads/pull/722 --- modules/libremkey-hotp-verification | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/libremkey-hotp-verification b/modules/libremkey-hotp-verification index 1a943847..5ebb713b 100644 --- a/modules/libremkey-hotp-verification +++ b/modules/libremkey-hotp-verification @@ -2,11 +2,11 @@ modules-$(CONFIG_LIBREMKEY) += libremkey-hotp-verification libremkey-hotp-verification_depends := libusb $(musl_dep) -libremkey-hotp-verification_version := e5fa36a7a1950226d0ef94e2eeed0ffb510eba89 +libremkey-hotp-verification_version := 809953b9b4bef97a4cffaa20d675bd7fe9d8da53 libremkey-hotp-verification_dir := libremkey-hotp-verification-$(libremkey-hotp-verification_version) libremkey-hotp-verification_tar := nitrokey-hotp-verification-$(libremkey-hotp-verification_version).tar.gz libremkey-hotp-verification_url := https://github.com/Nitrokey/nitrokey-hotp-verification/archive/$(libremkey-hotp-verification_version).tar.gz -libremkey-hotp-verification_hash := 668113ebc21cc875d49266c8d3a47acfd524a8d6b64f75b7ce5833d595415469 +libremkey-hotp-verification_hash := 251e5cef74e4e45eeddc49e4a1da1e22d1de774cd32cb0451a9030579ae958ba libremkey-hotp-verification_target := \ $(MAKE_JOBS) \ @@ -19,7 +19,7 @@ libremkey-hotp-verification_output := \ libremkey-hotp-verification_configure := \ INSTALL="$(INSTALL)" \ CROSS="$(CROSS)" \ - cmake -DCMAKE_TOOLCHAIN_FILE=./Toolchain-heads.cmake -DCMAKE_AR="$(CROSS)ar" . + $(CROSS_TOOLS) $(MAKE) LDFLAGS="$(INSTALL)/lib/libusb-1.0.so" && $(MAKE) install INSTALL="$(INSTALL)" libremkey-hotp-verification_depends += hidapi modules-y += hidapi