From e94d0f6b0d28858a372b514b500f71a8979d92d5 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 23 Aug 2018 23:56:39 +0200 Subject: Change the default sdk install path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jan-Simon Möller --- meta-agl-distro/conf/distro/poky-agl.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta-agl-distro/conf/distro') 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 -- cgit 1.2.3-korg