From 5f5a1fb6ea4fd884040ef3175f478321651afeab Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 18 Feb 2019 17:30:13 -0500 Subject: Upgrade to thud MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes include: - Add LAYERSERIES_COMPAT definition to layer.conf - Replace libvcard recipe with bbappend now that a recipe is available in meta-qt5 - Add OECMAKE_GENERATOR = "Unix Makefiles" to libnaviapi-agl recipe for now to work around CMake+ninja issue - Add patch to navigation app to fix compilation against OpenSSL 1.1 - Remove libssp-dev from agl-demo-platform-crosssdk, upstream have removed it from non-mingw32 platform SDKs Known issues: - CMake+ninja issue in cmake-apps-module has been worked around with OECMAKE_GENERATOR Bug-AGL: SPEC-1837 Change-Id: I14c5355fb38d5eed064f154f889d61d8e46854b7 Signed-off-by: Scott Murray Signed-off-by: Jan-Simon Möller --- .../navigation/0002-openssl-1.1-fixes.patch | 31 ++++++++++++++++++++++ recipes-demo-hmi/navigation/navigation_git.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch (limited to 'recipes-demo-hmi/navigation') diff --git a/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch b/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch new file mode 100644 index 000000000..9506ce115 --- /dev/null +++ b/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch @@ -0,0 +1,31 @@ +gpsnavi: Fix compilation with OpenSSL 1.1 + +Handle the ERR_load_crypto_strings and ERR_free_strings functions no +longer being present in OpenSSL 1.1. + +Signed-off-by: Scott Murray + +diff --git a/src/sms/sms-core/SMCAL/SMCAL.c b/src/sms/sms-core/SMCAL/SMCAL.c +index eadab8f..2dfe1f3 100755 +--- a/src/sms/sms-core/SMCAL/SMCAL.c ++++ b/src/sms/sms-core/SMCAL/SMCAL.c +@@ -158,7 +158,9 @@ void SC_CAL_Initialize_OpenSSL() { + // 初期化 + ERR_load_BIO_strings(); + SSL_load_error_strings(); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_load_crypto_strings(); ++#endif + OpenSSL_add_all_algorithms(); + + // SSLの初期化(戻り値は常に1) +@@ -542,7 +544,9 @@ E_SC_CAL_RESULT SC_CAL_DisConnect(SMCAL *cal) + if (NULL != cal->ssl.ctx) { + SSL_CTX_free((SSL_CTX*)cal->ssl.ctx); + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_free_strings(); ++#endif + + cal->ssl.ssl = NULL; + cal->ssl.ctx = NULL; diff --git a/recipes-demo-hmi/navigation/navigation_git.bb b/recipes-demo-hmi/navigation/navigation_git.bb index 3ad00b252..b5eeb8901 100755 --- a/recipes-demo-hmi/navigation/navigation_git.bb +++ b/recipes-demo-hmi/navigation/navigation_git.bb @@ -21,6 +21,7 @@ RDEPENDS_${PN} += " agl-service-navigation " SRCREV="5048c2e234febeb20df0b193e1bf1ac50f3896a5" SRC_URI="git://github.com/AGLExport/gpsnavi.git;branch=agl \ file://0001-add-4A-playback-support.patch \ + file://0002-openssl-1.1-fixes.patch \ file://download_mapdata_jp.sh \ file://download_mapdata_uk.sh \ file://org.agl.naviapi.conf \ -- cgit 1.2.3-korg