diff -r 49d096ef3d76 tools/check/check_brctl --- a/tools/check/check_brctl Fri Oct 13 10:58:29 2006 +0100 +++ b/tools/check/check_brctl Thu Oct 12 14:31:08 2006 +0200 @@ -1,10 +1,25 @@ -#!/bin/bash +#!/bin/sh # CHECK-INSTALL -function error { - echo - echo ' *** Check for the bridge control utils (brctl) FAILED' - exit 1 -} +RC=0 -which brctl 1>/dev/null 2>&1 || error +case ${OS} in +OpenBSD|NetBSD|FreeBSD) + # These systems have a bridge builtin + which brconfig 1>/dev/null 2>&1 || RC=1 + ;; +Linux) + which brctl 1>/dev/null 2>&1 || RC=1 + ;; +*) + echo "Unknown OS" && error + ;; +esac + + +if test ${RC} -ne 0; then + echo + echo ' *** Check for the bridge control utils (brctl) FAILED' +fi + +exit ${RC} diff -r 49d096ef3d76 tools/check/check_iproute --- a/tools/check/check_iproute Fri Oct 13 10:58:29 2006 +0100 +++ b/tools/check/check_iproute Thu Oct 12 14:31:08 2006 +0200 @@ -1,11 +1,23 @@ -#!/bin/bash +#!/bin/sh # CHECK-INSTALL -function error { - echo - echo ' *** Check for iproute (ip addr) FAILED' - exit 1 -} +RC=0 -ip addr list 1>/dev/null 2>&1 || error +case ${OS} in +OpenBSD|NetBSD|FreeBSD) + ifconfig -a 1>/dev/null 2>&1 || RC=1 + ;; +Linux) + ip addr list 1>/dev/null 2>&1 || RC=1 + ;; +*) + echo "Unknown OS" && RC=1 + ;; +esac +if test ${RC} -ne 0; then + echo + echo ' *** Check for iproute (ip addr) FAILED' +fi + +exit ${RC} diff -r 49d096ef3d76 tools/check/check_python --- a/tools/check/check_python Fri Oct 13 10:58:29 2006 +0100 +++ b/tools/check/check_python Thu Oct 12 14:31:08 2006 +0200 @@ -1,10 +1,13 @@ -#!/bin/bash +#!/bin/sh # CHECK-BUILD CHECK-INSTALL -function error { - echo - echo " *** Check for Python version >= 2.2 FAILED" - exit 1 -} +RC=0 -python -V 2>&1 | cut -d ' ' -f 2 | grep -q '^2.[2345]' || error +python -V 2>&1 | cut -d ' ' -f 2 | grep -q '^2.[2345]' || RC=1 + +if test ${RC} -ne 0; then + echo + echo " *** Check for Python version >= 2.2 FAILED" +fi + +exit ${RC} diff -r 49d096ef3d76 tools/check/check_zlib_devel --- a/tools/check/check_zlib_devel Fri Oct 13 10:58:29 2006 +0100 +++ b/tools/check/check_zlib_devel Thu Oct 12 14:31:08 2006 +0200 @@ -1,11 +1,14 @@ -#!/bin/bash +#!/bin/sh # CHECK-BUILD -function error { - echo - echo " *** Check for zlib headers FAILED" - exit 1 -} +RC=0 set -e -[ -e /usr/include/zlib.h ] || error +test -r /usr/include/zlib.h || RC=1 + +if test ${RC} -ne 0; then + echo + echo " *** Check for zlib headers FAILED" +fi + +exit ${RC} diff -r 49d096ef3d76 tools/check/check_zlib_lib --- a/tools/check/check_zlib_lib Fri Oct 13 10:58:29 2006 +0100 +++ b/tools/check/check_zlib_lib Thu Oct 12 14:31:08 2006 +0200 @@ -1,11 +1,14 @@ -#!/bin/bash +#!/bin/sh # CHECK-BUILD CHECK-INSTALL -function error { - echo - echo " *** Check for zlib library FAILED" - exit 1 -} +RC=0 set -e -ldconfig -p | grep -q libz.so || error +ldconfig -v 2>&1 | grep -q libz.so || RC=1 + +if test ${RC} -ne 0; then + echo + echo " *** Check for zlib library FAILED" +fi + +exit ${RC} diff -r 49d096ef3d76 tools/check/chk --- a/tools/check/chk Fri Oct 13 10:58:29 2006 +0100 +++ b/tools/check/chk Thu Oct 12 14:31:08 2006 +0200 @@ -1,18 +1,7 @@ -#!/bin/bash - -function usage { - echo "Usage:" - echo "\t$0 [build|install|clean]" - echo - echo "Check suitability for Xen build or install." - echo "Exit with 0 if OK, 1 if not." - echo "Prints only failed tests." - echo - echo "Calling with 'clean' removes generated files." - exit 1 -} +#!/bin/sh export PATH=${PATH}:/sbin:/usr/sbin +export OS=`uname -s` case $1 in build) @@ -25,7 +14,15 @@ case $1 in exit 0 ;; *) - usage + echo "Usage:" + echo "\t$0 [build|install|clean]" + echo + echo "Check suitability for Xen build or install." + echo "Exit with 0 if OK, 1 if not." + echo "Prints only failed tests." + echo + echo "Calling with 'clean' removes generated files." + exit 1 ;; esac @@ -54,4 +51,4 @@ for f in check_* ; do fi done -exit $failed +exit ${failed}