direct-io.hg

changeset 3198:b8428734f8c7

bitkeeper revision 1.1159.187.34 (41ab39fcX9O7MQ23ZZswDbS6Tx80Sw)

Use uname -m instead of uname -i to get the build hosts architecture.
author cl349@arcadians.cl.cam.ac.uk
date Mon Nov 29 15:02:20 2004 +0000 (2004-11-29)
parents 8cd794f236b8
children 842780fc6584 5586fdd8ed03
files netbsd-2.0-xen-sparse/nbconfig-xen netbsd-2.0-xen-sparse/nbmake-xen
line diff
     1.1 --- a/netbsd-2.0-xen-sparse/nbconfig-xen	Mon Nov 29 12:07:12 2004 +0000
     1.2 +++ b/netbsd-2.0-xen-sparse/nbconfig-xen	Mon Nov 29 15:02:20 2004 +0000
     1.3 @@ -2,11 +2,17 @@
     1.4  #
     1.5  
     1.6  : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)}
     1.7 -: ${HARCH:=$(uname -i 2>/dev/null || echo i386)}
     1.8 +: ${HARCH:=$(uname -m 2>/dev/null || echo i386)}
     1.9  : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
    1.10  : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
    1.11  : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
    1.12  
    1.13 +case "$HARCH" in
    1.14 +i586|i686)
    1.15 +  HARCH=i386
    1.16 +  ;;
    1.17 +esac
    1.18 +
    1.19  TOOLDIR="$TOPDIR/../netbsd-${NETBSD_RELEASE}-tools/$HOS-$HARCH"; export TOOLDIR
    1.20  
    1.21  CONF="$1"
     2.1 --- a/netbsd-2.0-xen-sparse/nbmake-xen	Mon Nov 29 12:07:12 2004 +0000
     2.2 +++ b/netbsd-2.0-xen-sparse/nbmake-xen	Mon Nov 29 15:02:20 2004 +0000
     2.3 @@ -4,11 +4,17 @@
     2.4  #
     2.5  
     2.6  : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)}
     2.7 -: ${HARCH:=$(uname -i 2>/dev/null || echo i386)}
     2.8 +: ${HARCH:=$(uname -m 2>/dev/null || echo i386)}
     2.9  : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')}
    2.10  : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')}
    2.11  : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')}
    2.12  
    2.13 +case "$HARCH" in
    2.14 +i586|i686)
    2.15 +  HARCH=i386
    2.16 +  ;;
    2.17 +esac
    2.18 +
    2.19  NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR
    2.20  DESTDIR="$TOPDIR/root"; export DESTDIR
    2.21  unset MAKEOBJDIRPREFIX