tools/check fixes for xen-unstable

diff -r 0b66e6450ffe -r c2daf20cf860 tools/check/check_logging
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-#  -*- mode: python; -*-
-
-import os
-import sys
-
-def hline():
-    print >>sys.stderr, "*" * 70
-
-def msg(message):
-    print >>sys.stderr, "*" * 3, message
-
-def check_logging():
-    """Check python logging is installed and raise an error if not.
-    Logging is standard from Python 2.3 on.
-    """
-    try:
-        import logging
-    except ImportError:
-        hline()
-        msg("")
-        msg("  *** Python logging is not installed.")
-        msg("  *** Use 'make install-logging' at the xen root to install.")
-        msg("  *** ")
-        msg("  *** Alternatively download and install from")
-        msg("  *** http://www.red-dove.com/python_logging.html")
-        hline()
-        sys.exit(1)
-
-if __name__ == '__main__':
-    check_logging()

diff -r c2daf20cf860 -r bcd7b8ee7e99 install.sh
@@ -51,7 +51,7 @@ echo "All done."
 
 echo "Checking to see whether prerequisite tools are installed..."
 cd $src/../check
-./chk install
+sh chk install
 echo "All done."
 
 exit 0

diff -r c2daf20cf860 -r bcd7b8ee7e99 tools/check/Makefile
@@ -7,13 +7,13 @@ all install: check-build
 # Check this machine is OK for building on.
 .PHONY: check-build
 check-build:
-	PYTHON=$(PYTHON) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk build
+	PYTHON=$(PYTHON) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) $(SHELL) chk build
 
 # Check this machine is OK for installing on.
 .PHONY: check-install
 check-install:
-	PYTHON=$(PYTHON) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk install
+	PYTHON=$(PYTHON) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) $(SHELL) chk install
 
 .PHONY: clean
 clean:
-	./chk clean
+	$(SHELL) chk clean

diff -r c2daf20cf860 -r bcd7b8ee7e99 tools/check/README
@@ -1,11 +1,11 @@
 Checks for the suitability of a machine for Xen build or install.
 To check for build suitability use
 
-        ./chk build
+        sh chk build
 
 To check for install suitability use
 
-        ./chk install
+        sh chk install
 
 The chk script will run checks in this directory and print
 the ones that failed. It prints nothing if checks succeed.

@@ -17,4 +17,4 @@ are run for the build check, and files c
 are run for the install check.
 
 Detailed output from the check scripts is in .chkbuild for build
-and .chkinstall for install.
\ No newline at end of file
+and .chkinstall for install.

diff -r c2daf20cf860 -r bcd7b8ee7e99 tools/check/chk
@@ -53,7 +53,7 @@ for f in check_* ; do
         continue
     fi
     echo -n "Checking $f: "
-    if ./$f 2>&1 ; then
+    if sh $f 2>&1 ; then
         echo OK
     else
         failed=1

diff -r bcd7b8ee7e99 -r 738452bd9f33 tools/check/check_python
@@ -9,5 +9,5 @@ fi
 
 ${PYTHON} -c '
 import sys
-sys.exit(sys.version_info[0] < 2 or sys.version_info[1] < 2)
-' || fail "need python version >= 2.2"
+sys.exit(sys.version_info[0] < 2 or sys.version_info[1] < 3)
+' || fail "need python version >= 2.3"

diff -r 738452bd9f33 -r 6fa23fea4670 stubdom/Makefile
@@ -296,7 +296,7 @@ ioemu: cross-zlib cross-libpci libxc
 	    TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
 	    TARGET_CFLAGS="$(TARGET_CFLAGS)" \
 	    TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
-	    $(QEMU_ROOT)/xen-setup-stubdom )
+	    $(SHELL) $(QEMU_ROOT)/xen-setup-stubdom )
 	$(CROSS_MAKE) -C ioemu -f $(QEMU_ROOT)/Makefile
 
 ######

diff -r 738452bd9f33 -r 6fa23fea4670 tools/Makefile
@@ -106,7 +106,7 @@ ioemu-dir-find:
 	set -e; \
 		$(buildmakevars2shellvars); \
 		cd ioemu-dir; \
-		$(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS)
+		$(SHELL) $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS)
 
 .PHONY: ioemu-dir-force-update
 ioemu-dir-force-update:

diff -r 6fa23fea4670 -r bac6675e4d42 tools/Rules.mk
@@ -6,7 +6,7 @@ all:
 include $(XEN_ROOT)/Config.mk
 
 export _INSTALL := $(INSTALL)
-INSTALL = $(XEN_ROOT)/tools/cross-install
+INSTALL = $(SHELL) $(XEN_ROOT)/tools/cross-install
 
 XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc

diff -r bac6675e4d42 -r c06758bea2f4 tools/Rules.mk
@@ -78,7 +78,7 @@ check-$(CONFIG_X86) = $(call cc-ver-chec
 _PYTHON_PATH := $(shell which $(PYTHON))
 PYTHON_PATH ?= $(_PYTHON_PATH)
 INSTALL_PYTHON_PROG = \
-	$(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
+	$(SHELL) $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" "$(INSTALL_PROG)"
 
 %.opic: %.c
 	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $<

diff -r c06758bea2f4 -r 4c8e7b9ba0d5 tools/firmware/etherboot/Makefile
@@ -28,7 +28,7 @@ all: eb-roms.h
 	$(MAKE) -C $D/src bin/$(*F).rom
 
 eb-roms.h.new: $(ROMS)
-	cat $^ | ../hvmloader/mkhex etherboot >$@
+	cat $^ | $(SHELL) ../hvmloader/mkhex etherboot >$@
 
 eb-roms.h: Config
 	$(MAKE) NO_WERROR=1 [email protected]