From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Thu, 23 Aug 2018 21:56:39 +0000 (+0200)
Subject: Change the default sdk install path
X-Git-Tag: flounder_5.99.4~4
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F16271%2F5;p=AGL%2Fmeta-agl.git

Change the default sdk install path

Installing 2 SDKs of the same version but different arch
results in broken compilation due to a bug in the meta-qt5 sdk
environment scripts.

Mitigate it by adding the DEFAULTTUNE to the SDK installation
folder until the issue can be addressed in SPEC-1686.

Bug-AGL: SPEC-1667, SPEC-1686

v2 (jsmoeller): rewrite to use /opt and SDKPATH

Change-Id: Id7e6c919631fc0bcc630a6b813a714f83adaf148
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 4c630ebf0..83c555f11 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -10,6 +10,11 @@ DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
+# SDKPATH is the folder where the SDK is going to be installed
+# Due to an issue with the qt5 environment (see SPEC-1667),
+# we add DEFAULTTUNE to the SDKPATH to mitigate the issue.
+SDKPATH = "/opt/agl-sdk/${DISTRO_VERSION}-${DEFAULTTUNE}"
+
 AGL_BRANCH = "master"
 
 #for development