1255643SnwhitehornFrom 282f7ede4ae524587a78ddd3b17bdf65aa0dcd04 Mon Sep 17 00:00:00 2001 2255643SnwhitehornFrom: Damon Lee <Damon.Lee@data61.csiro.au> 3255643SnwhitehornDate: Thu, 12 Jul 2018 15:11:40 +1000 4255643SnwhitehornSubject: [PATCH 2/2] Use the correct ARM machine names 5255643Snwhitehorn 6255643Snwhitehorn--- 7255643Snwhitehorn buildrump.sh | 8 +++++--- 8255643Snwhitehorn 1 file changed, 5 insertions(+), 3 deletions(-) 9255643Snwhitehorn 10255643Snwhitehorndiff --git a/buildrump.sh b/buildrump.sh 11255643Snwhitehornindex 1864f1f..4c6bd62 100755 12255643Snwhitehorn--- a/buildrump.sh 13255643Snwhitehorn+++ b/buildrump.sh 14255643Snwhitehorn@@ -784,7 +784,7 @@ makebuild () 15255643Snwhitehorn && appendvar DIRS_second ${SRCDIR}/sys/rump/share 16255643Snwhitehorn 17255643Snwhitehorn if [ ${MACHINE} = "i386" -o ${MACHINE} = "amd64" \ 18255643Snwhitehorn- -o ${MACHINE#evbearm} != ${MACHINE} \ 19255643Snwhitehorn+ -o ${MACHINE} = "evbarm" \ 20255643Snwhitehorn -o ${MACHINE#evbppc} != ${MACHINE} ]; then 21255643Snwhitehorn DIRS_emul=sys/rump/kern/lib/libsys_linux 22255643Snwhitehorn fi 23255643Snwhitehorn@@ -1176,10 +1176,12 @@ probearm () 24255643Snwhitehorn 25255643Snwhitehorn # check for big endian 26255643Snwhitehorn if cppdefines '__ARMEL__'; then 27255643Snwhitehorn- MACHINE="evbearm${hf}-el" 28255643Snwhitehorn+ #MACHINE="evbearm${hf}-el" 29255643Snwhitehorn+ MACHINE="evbarm" 30255643Snwhitehorn MACHINE_GNU_ARCH="arm" 31255643Snwhitehorn else 32255643Snwhitehorn- MACHINE="evbearm${hf}-eb" 33255643Snwhitehorn+ #MACHINE="evbearm${hf}-eb" 34255643Snwhitehorn+ MACHINE="evbarm" 35255643Snwhitehorn MACHINE_GNU_ARCH="armeb" 36255643Snwhitehorn fi 37255643Snwhitehorn 38255643Snwhitehorn-- 39255643Snwhitehorn2.11.0 40255643Snwhitehorn 41255643Snwhitehorn