From 023cd31c26bb6ae00dd0e08be54f92bbf628123b Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 16 Jun 2021 14:11:37 +0000 Subject: 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 --- jjb/common/include-agl-header.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'jjb/common/include-agl-header.sh') 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 -- cgit 1.2.3-korg