From 0887d079f8bde1f16fc7d9d295605162644448a2 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Mon, 22 Jun 2015 07:20:30 +0000 Subject: [PATCH] Prevent multiple different platform/machines builds. Prevents damage to unsuspecting users. (issue #35) --- build-rr.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build-rr.sh b/build-rr.sh index 8ca2c6cca..7629bc996 100755 --- a/build-rr.sh +++ b/build-rr.sh @@ -144,6 +144,25 @@ checksubmodules () fi ) } +checkprevbuilds () +{ + + if [ -f .prevbuild ]; then + . ./.prevbuild + if [ "${PB_MACHINE}" != "${MACHINE}" \ + -o "${PB_PLATFORM}" != "${PLATFORM}" ]; then + echo '>> ERROR:' + echo '>> Building for multiple machine/platform combos' + echo '>> from the same rumprun source tree is currently' + echo '>> not supported. See rumprun issue #35.' + exit 1 + fi + else + echo PB_MACHINE=${MACHINE} > ./.prevbuild + echo PB_PLATFORM=${PLATFORM} >> ./.prevbuild + fi +} + buildrump () { @@ -166,6 +185,8 @@ buildrump () MACHINE=$(${RUMPMAKE} -f /dev/null -V '${MACHINE}') [ -n "${MACHINE}" ] || die could not figure out target machine + checkprevbuilds + makeconfigmk ${PLATFORMDIR}/config.mk cat >> ${RUMPTOOLS}/mk.conf << EOF