[Xen-changelog] [xen-unstable] [SOLARIS] Use GNU grep on Solaris.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 4154ba04725a824e1dcd81fc70185666e14918d3
# Parent  f4b7b8aefc0585c7e4e08f080f971b4cb3d69cf3
[SOLARIS] Use GNU grep on Solaris.

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 Config.mk             |    2 +-
 buildconfigs/Rules.mk |    4 ++--
 config/Linux.mk       |    2 ++
 config/SunOS.mk       |    2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff -r f4b7b8aefc05 -r 4154ba04725a Config.mk
--- a/Config.mk Tue Oct 17 16:51:09 2006 +0100
+++ b/Config.mk Tue Oct 17 16:53:39 2006 +0100
@@ -24,7 +24,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
 EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
 endif
 
-test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
+test-gcc-flag = $(shell $(1) -v --help 2>&1 | $(GREP) -q " $(2) " && echo $(2))
 
 ifneq ($(debug),y)
 CFLAGS += -DNDEBUG
diff -r f4b7b8aefc05 -r 4154ba04725a buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     Tue Oct 17 16:51:09 2006 +0100
+++ b/buildconfigs/Rules.mk     Tue Oct 17 16:53:39 2006 +0100
@@ -22,7 +22,7 @@ endif
 
 # Expand Linux series to Linux version
 LINUX_SERIES   ?= 2.6
-LINUX_VER      ?= $(shell grep "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | 
sed -e 's/.*=[ ]*//')
+LINUX_VER      ?= $(shell $(GREP) "^LINUX_VER " buildconfigs/mk.linux-2.6-xen 
| sed -e 's/.*=[ ]*//')
 
 # Setup Linux search path
 LINUX_SRC_PATH ?= .:..
@@ -125,7 +125,7 @@ ifeq ($(XEN_TARGET_X86_PAE),y)
 ifeq ($(XEN_TARGET_X86_PAE),y)
        sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# 
CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > 
$(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE)
 else
-       grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 
's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# 
CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > 
$(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true
+       $(GREP) '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 
's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# 
CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > 
$(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true
 endif
 
 # never delete any intermediate files.
diff -r f4b7b8aefc05 -r 4154ba04725a config/Linux.mk
--- a/config/Linux.mk   Tue Oct 17 16:51:09 2006 +0100
+++ b/config/Linux.mk   Tue Oct 17 16:53:39 2006 +0100
@@ -10,6 +10,8 @@ STRIP      = $(CROSS_COMPILE)strip
 STRIP      = $(CROSS_COMPILE)strip
 OBJCOPY    = $(CROSS_COMPILE)objcopy
 OBJDUMP    = $(CROSS_COMPILE)objdump
+
+GREP       = grep
 
 INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755
diff -r f4b7b8aefc05 -r 4154ba04725a config/SunOS.mk
--- a/config/SunOS.mk   Tue Oct 17 16:51:09 2006 +0100
+++ b/config/SunOS.mk   Tue Oct 17 16:53:39 2006 +0100
@@ -10,6 +10,8 @@ STRIP      = $(CROSS_COMPILE)gstrip
 STRIP      = $(CROSS_COMPILE)gstrip
 OBJCOPY    = $(CROSS_COMPILE)gobjcopy
 OBJDUMP    = $(CROSS_COMPILE)gobjdump
+
+GREP       = ggrep
 
 INSTALL      = ginstall
 INSTALL_DIR  = $(INSTALL) -d -m0755

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog