Change SDK location to qemu for master branch 75/24275/1
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Mon, 23 Mar 2020 21:09:13 +0000 (22:09 +0100)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Mon, 23 Mar 2020 21:09:13 +0000 (22:09 +0100)
We merged intel-corei7-64 with qemux86-64. Thus adapt the SDK location.

Bug-AGL: SPEC-2931
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I65eea92c3c3956682645c787104c64779977e240

jjb/common/include-apps-header.sh

index 22c9b6a..9a4e54b 100644 (file)
@@ -107,8 +107,13 @@ case "$TARGETARCH" in
            export TARGETSDKMACHINE="qemuarm"
            ;;
        x86-64)
-           export TARGETSDKARCH="corei7-64"
-           export TARGETSDKMACHINE="intel-corei7-64"
+           if test x"master" = x"$AGLBRANCH" ; then
+               export TARGETSDKARCH="qemux86-64"
+               export TARGETSDKMACHINE="qemux86-64"
+           else
+               export TARGETSDKARCH="corei7-64"
+               export TARGETSDKMACHINE="intel-corei7-64"
+           fi
            ;;
        aarch64)
            export TARGETSDKARCH="aarch64"