diff options
| author | cl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk> | 2004-11-29 15:02:20 +0000 |
|---|---|---|
| committer | cl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk> | 2004-11-29 15:02:20 +0000 |
| commit | 2b9c469bec58196f555c5686a5ba114b8d6c4844 (patch) | |
| tree | c93e246030e63668c9f6a08c134318a4e78615e8 | |
| parent | b582b9903ad36bb98dd0ceda6b609d79c9af9ca0 (diff) | |
| download | xen-2b9c469bec58196f555c5686a5ba114b8d6c4844.tar.gz xen-2b9c469bec58196f555c5686a5ba114b8d6c4844.tar.bz2 xen-2b9c469bec58196f555c5686a5ba114b8d6c4844.zip | |
bitkeeper revision 1.1159.187.34 (41ab39fcX9O7MQ23ZZswDbS6Tx80Sw)
Use uname -m instead of uname -i to get the build hosts architecture.
| -rwxr-xr-x | netbsd-2.0-xen-sparse/nbconfig-xen | 8 | ||||
| -rwxr-xr-x | netbsd-2.0-xen-sparse/nbmake-xen | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/netbsd-2.0-xen-sparse/nbconfig-xen b/netbsd-2.0-xen-sparse/nbconfig-xen index 2bd5a77cef..d6216614f8 100755 --- a/netbsd-2.0-xen-sparse/nbconfig-xen +++ b/netbsd-2.0-xen-sparse/nbconfig-xen @@ -2,11 +2,17 @@ # : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)} -: ${HARCH:=$(uname -i 2>/dev/null || echo i386)} +: ${HARCH:=$(uname -m 2>/dev/null || echo i386)} : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')} : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')} : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')} +case "$HARCH" in +i586|i686) + HARCH=i386 + ;; +esac + TOOLDIR="$TOPDIR/../netbsd-${NETBSD_RELEASE}-tools/$HOS-$HARCH"; export TOOLDIR CONF="$1" diff --git a/netbsd-2.0-xen-sparse/nbmake-xen b/netbsd-2.0-xen-sparse/nbmake-xen index 6854538905..2648a4a39b 100755 --- a/netbsd-2.0-xen-sparse/nbmake-xen +++ b/netbsd-2.0-xen-sparse/nbmake-xen @@ -4,11 +4,17 @@ # : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)} -: ${HARCH:=$(uname -i 2>/dev/null || echo i386)} +: ${HARCH:=$(uname -m 2>/dev/null || echo i386)} : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')} : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')} : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')} +case "$HARCH" in +i586|i686) + HARCH=i386 + ;; +esac + NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR DESTDIR="$TOPDIR/root"; export DESTDIR unset MAKEOBJDIRPREFIX |