ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-01-29 15:44:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2-tools: Remove curl dependency

Browse Source 
The actual use of curl was already removed, update tpm2-tools patch to
also remove the check for curl.  Remove the curl module and
CONFIG_CURL.

Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
This commit is contained in:
Jonathon Hall 2023-02-21 17:15:09 -05:00
parent 8da5d5d723
commit 4e375ad7ca
No known key found for this signature in database
GPG Key ID: 1E9C3CA91AE25114
8 changed files with 14 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -468,7 +468,6 @@ bin_modules-$(CONFIG_MSRTOOLS) += msrtools
bin_modules-$(CONFIG_NKSTORECLI) += nkstorecli
bin_modules-$(CONFIG_OPENSSL) += openssl
bin_modules-$(CONFIG_TPM2_TOOLS) += tpm2-tools
bin_modules-$(CONFIG_CURL) += curl
bin_modules-$(CONFIG_BASH) += bash
$(foreach m, $(bin_modules-y), \

1
boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config
View File

@ -61,7 +61,6 @@ export CONFIG_TPM2_TOOLS=y
export CONFIG_PRIMARY_KEY_TYPE=ecc
CONFIG_TPM2_TSS=y
CONFIG_OPENSSL=y
CONFIG_CURL=y
CONFIG_BASH=y
export CONFIG_BOOT_DEV="/dev/vda1"

1
boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config
View File

@ -60,7 +60,6 @@ export CONFIG_TPM2_TOOLS=y
export CONFIG_PRIMARY_KEY_TYPE=ecc
CONFIG_TPM2_TSS=y
CONFIG_OPENSSL=y
CONFIG_CURL=y
CONFIG_BASH=y
export CONFIG_BOOT_DEV="/dev/vda1"

1
boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config
View File

@ -61,7 +61,6 @@ export CONFIG_TPM2_TOOLS=y
export CONFIG_PRIMARY_KEY_TYPE=ecc
CONFIG_TPM2_TSS=y
CONFIG_OPENSSL=y
CONFIG_CURL=y
CONFIG_BASH=y
export CONFIG_BOOT_DEV="/dev/vda1"

1
boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config
View File

@ -60,7 +60,6 @@ export CONFIG_TPM2_TOOLS=y
export CONFIG_PRIMARY_KEY_TYPE=ecc
CONFIG_TPM2_TSS=y
CONFIG_OPENSSL=y
CONFIG_CURL=y
CONFIG_BASH=y
export CONFIG_BOOT_DEV="/dev/vda1"

71
modules/curl
View File

@ -1,71 +0,0 @@
# cURL and libcurl
modules-$(CONFIG_CURL) += curl
curl_depends := openssl zlib $(musl_dep)
curl_version := 7.83.1
curl_dir := curl-$(curl_version)
curl_tar := curl-$(curl_version).tar.xz
curl_url := https://curl.se/download/$(curl_tar)
curl_hash := 2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4
curl_configure := ./configure \
$(CROSS_TOOLS) \
--host $(target) \
--prefix "/" \
--with-openssl \
--enable-optimize \
--disable-ares \
--disable-rt \
--disable-ech \
--disable-dependency-tracking \
--enable-shared \
--disable-static \
--enable-http \
--disable-ftp \
--enable-file \
--disable-ldap \
--disable-ldaps \
--disable-rtsp \
--enable-proxy \
--disable-dict \
--enable-telnet \
--enable-tftp \
--disable-pop3 \
--disable-imap \
--disable-smb \
--disable-smtp \
--disable-gopher \
--disable-mqtt \
--enable-manual \
--disable-libcurl-option \
--enable-openssl-auto-load-config \
--enable-versioned-symbols \
--disable-threaded-resolver \
--disable-sspi \
--enable-crypto-auth \
--disable-ntlm \
--enable-tls-srp \
--enable-unix-sockets \
--enable-cookies \
--enable-socketpair \
--enable-http-auth \
--enable-doh \
--enable-mime \
--enable-dateparse \
--enable-netrc \
--enable-progress-meter \
--disable-dnsshuffle \
--enable-get-easy-options \
--enable-alt-svc \
--enable-headers-api \
--enable-hsts \
curl_target := $(MAKE_JOBS) \
&& $(MAKE) -C $(build)/$(curl_dir) \
DESTDIR="$(INSTALL)" \
install
curl_libraries := lib/.libs/libcurl.so.4
curl_output := src/.libs/curl

2
modules/tpm2-tools
View File

@ -26,4 +26,4 @@ tpm2-tools_target := $(MAKE_JOBS) \
tpm2-tools_output := tools/tpm2
tpm2-tools_depends := tpm2-tss curl $(musl_dep)
tpm2-tools_depends := openssl tpm2-tss $(musl_dep)

14
patches/tpm2-tools-5.2.patch
View File

@ -1,5 +1,5 @@
diff --git a/Makefile.am b/Makefile.am
index c58f0f34..a2bade09 100644
index 7132215..32e2193 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,7 +93,7 @@ tss2_tools = \
@ -19,3 +19,15 @@ index c58f0f34..a2bade09 100644
tools/tpm2_getrandom.c \
tools/tpm2_gettime.c \
tools/tpm2_hash.c \
diff --git a/configure.ac b/configure.ac
index f1c1711..7279baa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,6 @@ PKG_CHECK_MODULES([TSS2_MU], [tss2-mu])
PKG_CHECK_MODULES([TSS2_RC], [tss2-rc])
PKG_CHECK_MODULES([TSS2_SYS], [tss2-sys])
PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0])
-PKG_CHECK_MODULES([CURL], [libcurl])
# pretty print of devicepath if efivar library is present
PKG_CHECK_MODULES([EFIVAR], [efivar],,[true])