diff options
| author |   build.automotivelinux.org <jenkins@automotivelinux.org> | 2019-06-19 19:32:28 +0200 |
|---|---|---|
| committer | build.automotivelinux.org <jenkins@automotivelinux.org> | 2019-06-19 19:32:45 +0200 |
| commit | e7e5abe204b4bb2808945bf6f7de7c09eb002016 (patch) | |
| tree | edb163b8f3b19c8c5adabe5ceb20983e1fe236e5 | |
| parent | 7128200e94862a96e1b579a6deaba5de3263f6ec (diff) | |
Use the generic qemu* toolchains for the applications
We no longer need to pick a specific board for an architecture.
All supported architecture (x86-64, arm, aarch64) have now a
qemu target and a matching toolchain.
Bug-AGL: SPEC-2540
Change-Id: I4f77acb10c1e35e745e2a2c11aee1f8f49cb96ab
Signed-off-by: build.automotivelinux.org <jenkins@automotivelinux.org>
| -rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 2 | ||||
| -rw-r--r-- | jjb/common/include-apps-fetch-install-sdk.sh | 9 | ||||
| -rw-r--r-- | jjb/common/include-apps-header.sh | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 45f88c88..1fccd1b3 100644 --- a/jjb/ci-apps-verify/ci-apps-jjb.yaml +++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml @@ -7,7 +7,7 @@ - flounder architecture: - aarch64 - #= dragonboard-410c (disabled for dab atm) + #= dragonboard-410c (disabled for dab atm) later versions use qemuarm64 - x86-64 #= intel-corei7-64 #= qemux86-64 diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh index 49fb27b6..42847c4f 100644 --- a/jjb/common/include-apps-fetch-install-sdk.sh +++ b/jjb/common/include-apps-fetch-install-sdk.sh @@ -15,6 +15,11 @@ SDKHOSTDIR="~/agl-sdk" # should probably switch to release ... or multiple (release/snapshot) fwiw if test x"" = x"$AGLBRANCH"; then echo "AGLBRANCH not set, quitting" ; exit 1 ; fi +if test x"albacore" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi +if test x"blowfish" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi +if test x"chinook" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi +if test x"dab" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi + # default to release SDKBASEURL="http://download.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/" @@ -24,8 +29,8 @@ if test x"master" = x"$AGLBRANCH" ; then fi # special case for dab if test x"dab" = x"$AGLBRANCH" ; then - if test x"dragonboard-410c" = x"$TARGETSDKMACHINE"; then - echo "Skipping dragonboard-410c/aarch64 .... " + if test x"qemuarm64" = x"$TARGETSDKMACHINE"; then + echo "Skipping aarch64 .... " exit 0 fi SDKBASEURL="http://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/" diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh index e04ec86e..22c9b6a2 100644 --- a/jjb/common/include-apps-header.sh +++ b/jjb/common/include-apps-header.sh @@ -104,7 +104,7 @@ fi case "$TARGETARCH" in arm) export TARGETSDKARCH="armv7ve.*hf-neon-vfpv4" - export TARGETSDKMACHINE="raspberrypi3" + export TARGETSDKMACHINE="qemuarm" ;; x86-64) export TARGETSDKARCH="corei7-64" @@ -112,7 +112,7 @@ case "$TARGETARCH" in ;; aarch64) export TARGETSDKARCH="aarch64" - export TARGETSDKMACHINE="dragonboard-410c" + export TARGETSDKMACHINE="qemuarm64" ;; esac |