From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/conf/distro/arago.conf | 3 +++
.../recipes-support/curl/curl_7.35.0.bbappend | 23 ----------------------
2 files changed, 3 insertions(+), 23 deletions(-)
delete mode 100644 meta-arago-distro/recipes-support/curl/curl_7.35.0.bbappend
diff --git a/meta-arago-distro/conf/distro/arago.conf
b/meta-arago-distro/conf/distro/arago.conf
index a224a8b..261f1dc 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -45,6 +45,9 @@ PACKAGECONFIG_DISTRO_pn-qtbase = "icu examples"
# Configure gstreamer dependency based on GST_PROVIDER
PACKAGECONFIG_pn-qtwebkit = "${@base_conditional('GST_PROVIDER', '0.10',
'gstreamer010', 'gstreamer', d)} qtlocation qtmultimedia qtsensors"
+# Prefer OpenSSL over GnuTLS for curl due to TSU exemptions
+PACKAGECONFIG_pn-curl = "${@bb.utils.contains("DISTRO_FEATURES", "ipv6",
"ipv6", "", d)} ssl zlib"
+
# Enable UI and scripting for perf
PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
diff --git a/meta-arago-distro/recipes-support/curl/curl_7.35.0.bbappend
b/meta-arago-distro/recipes-support/curl/curl_7.35.0.bbappend
deleted file mode 100644
index b0afced..0000000
--- a/meta-arago-distro/recipes-support/curl/curl_7.35.0.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-# Switch curl configuration from GnuTLS to OpenSSL
-# per TSU exemption and export control restrictions
-
-DEPENDS := "${@d.getVar('DEPENDS', True).replace('gnutls', '')}"
-DEPENDS += "openssl"
-
-EXTRA_OECONF += "\
- --with-ssl \
- --disable-ldap \
- --disable-ares \
- --disable-ipv6 \
- --enable-cookies \
- --enable-dict \
- --enable-file \
- --enable-ftp \
- --enable-http \
- --enable-telnet \
- --enable-tftp \
- "
-
-CURLGNUTLS = "--without-gnutls"
-
-PR_append = "-arago2"
--
2.2.0
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
