diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2016-10-28 10:33:51 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-10-28 12:04:36 +0300 |
| commit | a75eca4af98c6cce154335a0499147f3f85aa82c (patch) | |
| tree | 9c0887034905a6648b655f7c51b26b0b07fa9a9e /rpb-openembedded | |
| parent | 11f11a6f7fb6de05545d11c46a224eb016a99b2d (diff) | |
rpb-openembedded/builders.sh: test the number of elements of SPLITMACHINES
* fix typo in SPLITMACHINES
* use the number of elements to set the secondary image machine
* remove secondary image boolean
Change-Id: I1f70f43adf62d1712544a7a5653473fcde1dff06
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Diffstat (limited to 'rpb-openembedded')
| -rwxr-xr-x | rpb-openembedded/builders.sh | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/rpb-openembedded/builders.sh b/rpb-openembedded/builders.sh index 6e2a4bdc88..17e1ea38cb 100755 --- a/rpb-openembedded/builders.sh +++ b/rpb-openembedded/builders.sh @@ -71,24 +71,13 @@ cat conf/{site,auto}.conf # Split machine:machine2 and pass it to secondary image. IFS=':' read -ra SPLITMACHINES <<< "${MACHINE}" - -if [ -n ${SPLIMACHINES[1]} ] ; then - MACHINE="${SPLITMACHINES[0]}" - SECONDARYIMAGEMACHINE="${SPLITMACHINES[1]}" - SECONDARYIMAGE="true" -else - unset SECONDARYIMAGE - unset SECONDARYIMAGEMACHINE - echo "Skip Secondary image for ${MACHINE}" -fi - unset IFS - [ "${DISTRO}" = "rpb" ] && IMAGES+=" rpb-desktop-image rpb-desktop-image-lava" [ "${DISTRO}" = "rpb-wayland" ] && IMAGES+=" rpb-weston-image rpb-weston-image-lava" -if [ -n "${SECONDARYIMAGE}" ] ; then - bitbake_secondary_image --extra-machine ${SECONDARYIMAGEMACHINE} ${IMAGES} +if [ ${#SPLITMACHINES[@]} -eq 2 ] ; then + MACHINE="${SPLITMACHINES[0]}" + bitbake_secondary_image --extra-machine ${SPLITMACHINES[1]} ${IMAGES} else bitbake ${IMAGES} fi |