diff --git a/Makefile b/Makefile index 72478adc..04c07f1f 100644 --- a/Makefile +++ b/Makefile @@ -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), \ diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config index 3a79ee1a..744b0a49 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config @@ -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" diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config index 24bc02f0..3b1a273c 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config @@ -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" diff --git a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config index 7deca9c4..b9dc3406 100644 --- a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config @@ -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" diff --git a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config index bac4bbf0..c3be63d0 100644 --- a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config +++ b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config @@ -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" diff --git a/modules/curl b/modules/curl deleted file mode 100644 index df7e5b7b..00000000 --- a/modules/curl +++ /dev/null @@ -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 diff --git a/modules/tpm2-tools b/modules/tpm2-tools index 0f8569b5..54384376 100644 --- a/modules/tpm2-tools +++ b/modules/tpm2-tools @@ -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) diff --git a/patches/tpm2-tools-5.2.patch b/patches/tpm2-tools-5.2.patch index ed5233d9..f4720f23 100644 --- a/patches/tpm2-tools-5.2.patch +++ b/patches/tpm2-tools-5.2.patch @@ -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])