From 274a47566b0def183ad33aa152483302fdf9ee05 Mon Sep 17 00:00:00 2001 From: msi-debian Date: Wed, 26 Mar 2025 00:30:58 -0600 Subject: [PATCH] Add newer syntax version of curl append and fix host tool dependancies --- conf/layer.conf | 10 ++++++++-- recipes-support/curl/kirkstone/curl_7.82.0.bbappend | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 recipes-support/curl/kirkstone/curl_7.82.0.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index f1df7d7..cbb96d4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -78,8 +78,14 @@ BBFILES += "${@bb.utils.contains('IMAGE_INSTALL', \ # Uncomment if building bind with wolfSSL. #BBFILES += "${LAYERDIR}/recipes-connectivity/bind/*.bbappend" -# Uncomment if building curl with wolfSSL. -#BBFILES += "${LAYERDIR}/recipes-support/curl/*.bbappend" +# Uncomment if building any curl with wolfSSL. +#BBFILES += "${LAYERDIR}/recipes-support/curl/wolfssl_%.bbappend" +# Uncomment if building curl 7.82.0 with wolfSSL (Kirkstone or Newer Syntax). +#BBFILES += "${LAYERDIR}/recipes-support/curl/kirkstone/curl_7.82.0.bbappend" +# Uncomment if building curl 7.82.0 with wolfSSL (Legacy Syntax). +#BBFILES += "${LAYERDIR}/recipes-support/curl/curl_7.82.0.bbappend" +# Uncomment if building any other version of curl with wolfSSL. +#BBFILES += "${LAYERDIR}/recipes-support/curl/curl_%.bbappend" # Uncomment if building libssh2 with wolfSSL. #BBFILES += "${LAYERDIR}/recipes-support/libssh2/*.bbappend" diff --git a/recipes-support/curl/kirkstone/curl_7.82.0.bbappend b/recipes-support/curl/kirkstone/curl_7.82.0.bbappend new file mode 100644 index 0000000..586bb1e --- /dev/null +++ b/recipes-support/curl/kirkstone/curl_7.82.0.bbappend @@ -0,0 +1,10 @@ +PACKAGECONFIG:remove:class-target = "openssl" +DEPENDS:class-target += "wolfssl" +EXTRA_OECONF:class-target += "--with-wolfssl=${STAGING_DIR_HOST}${prefix} \ + --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ + " +CPPFLAGS:class-target += "-I${STAGING_DIR_HOST}${prefix}/include/wolfssl" + +# Uncomment the line below if you're targeting FIPS compliance. NTLM uses MD5, +# which isn't a FIPS-approved algorithm. +# EXTRA_OECONF:class-target += "--disable-ntlm"