# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID cbc181eb54fa226606499bc405ecf90967c4e0be
# Parent 2ae6000abda3d0bcdcafde3074fa77febf57fbdd
Fix 'chk' scripts for generic shell (non-bash) and *BSD.
From: Christoph Egger <Christoph.Egger@xxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/check/check_brctl | 31 ++++++++++++++++++++++++-------
tools/check/check_iproute | 29 ++++++++++++++++++++++-------
tools/check/check_python | 17 ++++++++++-------
tools/check/check_zlib_devel | 17 ++++++++++-------
tools/check/check_zlib_lib | 17 ++++++++++-------
tools/check/chk | 19 ++++++++++++-------
6 files changed, 88 insertions(+), 42 deletions(-)
diff -r 2ae6000abda3 -r cbc181eb54fa tools/check/check_brctl
--- a/tools/check/check_brctl Wed Oct 18 15:16:37 2006 +0100
+++ b/tools/check/check_brctl Wed Oct 18 15:26:08 2006 +0100
@@ -1,10 +1,27 @@
-#!/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
+ TOOL="brconfig"
+ which ${TOOL} 1>/dev/null 2>&1 || RC=1
+ ;;
+Linux)
+ TOOL="brctl"
+ which ${TOOL} 1>/dev/null 2>&1 || RC=1
+ ;;
+*)
+ TOOL=""
+ echo "Unknown OS" && RC=1
+ ;;
+esac
+
+if test ${RC} -ne 0; then
+ echo
+ echo " *** Check for the bridge control utils (${TOOL}) FAILED"
+fi
+
+exit ${RC}
diff -r 2ae6000abda3 -r cbc181eb54fa tools/check/check_iproute
--- a/tools/check/check_iproute Wed Oct 18 15:16:37 2006 +0100
+++ b/tools/check/check_iproute Wed Oct 18 15:26:08 2006 +0100
@@ -1,11 +1,26 @@
-#!/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)
+ TOOL="ifconfig"
+ eval ${TOOL} -a 1>/dev/null 2>&1 || RC=1
+ ;;
+Linux)
+ TOOL="ip addr"
+ eval ${TOOL} list 1>/dev/null 2>&1 || RC=1
+ ;;
+*)
+ TOOL=""
+ echo "Unknown OS" && RC=1
+ ;;
+esac
+if test ${RC} -ne 0; then
+ echo
+ echo " *** Check for iproute (${TOOL}) FAILED"
+fi
+
+exit ${RC}
diff -r 2ae6000abda3 -r cbc181eb54fa tools/check/check_python
--- a/tools/check/check_python Wed Oct 18 15:16:37 2006 +0100
+++ b/tools/check/check_python Wed Oct 18 15:26:08 2006 +0100
@@ -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 2ae6000abda3 -r cbc181eb54fa tools/check/check_zlib_devel
--- a/tools/check/check_zlib_devel Wed Oct 18 15:16:37 2006 +0100
+++ b/tools/check/check_zlib_devel Wed Oct 18 15:26:08 2006 +0100
@@ -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 2ae6000abda3 -r cbc181eb54fa tools/check/check_zlib_lib
--- a/tools/check/check_zlib_lib Wed Oct 18 15:16:37 2006 +0100
+++ b/tools/check/check_zlib_lib Wed Oct 18 15:26:08 2006 +0100
@@ -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 2ae6000abda3 -r cbc181eb54fa tools/check/chk
--- a/tools/check/chk Wed Oct 18 15:16:37 2006 +0100
+++ b/tools/check/chk Wed Oct 18 15:26:08 2006 +0100
@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/bin/sh
-function usage {
+func_usage ()
+{
echo "Usage:"
- echo "\t$0 [build|install|clean]"
+ echo " $0 [build|install|clean]"
echo
echo "Check suitability for Xen build or install."
echo "Exit with 0 if OK, 1 if not."
@@ -12,9 +13,13 @@ function usage {
exit 1
}
-export PATH=${PATH}:/sbin:/usr/sbin
+PATH=${PATH}:/sbin:/usr/sbin
+OS=`uname -s`
+export PATH OS
-[ `uname -s` = SunOS ] && exit 0
+if test "${OS}" = "SunOS"; then
+ exit 0
+fi
case $1 in
build)
@@ -27,7 +32,7 @@ case $1 in
exit 0
;;
*)
- usage
+ func_usage
;;
esac
@@ -56,4 +61,4 @@ for f in check_* ; do
fi
done
-exit $failed
+exit ${failed}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home