diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2021-06-16 14:11:37 +0000 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2021-06-16 14:11:37 +0000 |
| commit | 023cd31c26bb6ae00dd0e08be54f92bbf628123b (patch) | |
| tree | 304103a577d0bbf5f77aaee9f7e6b94691f550ab | |
| parent | e8839961bdda4bcd53ad9bc92d2659083f066f52 (diff) | |
SPEC-3811: rpi4 default TARGETMACHINE to raspberrypi4-64
The TARGETMACHINE of rpi4 should be raspberrypi4-64.
Only halibut should keep the old one.
Change-Id: Ifccc863ef34576acb6677504886aa140337590d6
Bug-AGL: SPEC-3811
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
| -rw-r--r-- | jjb/common/include-agl-header.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh index f925f569..b11dd04c 100644 --- a/jjb/common/include-agl-header.sh +++ b/jjb/common/include-agl-header.sh @@ -167,14 +167,11 @@ if test x"h3ulcb-nogfx" = x"$MACHINE"; then fi set +x -if test x"raspberrypi4" = x"${MACHINE}" -a x"master" = x"${TARGETBRANCH}" ; then - export TARGETMACHINE="raspberrypi4-64" -fi -if test x"raspberrypi4" = x"${MACHINE}" -a x"jellyfish" = x"${TARGETBRANCH}" ; then - export TARGETMACHINE="raspberrypi4-64" -fi -if test x"raspberrypi4" = x"${MACHINE}" -a x"koi" = x"${TARGETBRANCH}" ; then +if test x"raspberrypi4" = x"${MACHINE}" ; then export TARGETMACHINE="raspberrypi4-64" + if test x"halibut" = x"${TARGETBRANCH}" ; then + export TARGETMACHINE="raspberrypi4" + fi fi #if $DEBUG; then |