diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-18 13:43:35 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-18 13:43:35 +0100 |
| commit | a3ef82b068b46a4c0058f25ec61145afab81b8ab (patch) | |
| tree | 653bb06d6db9ee12a33ed0998a3f6f2e05197f65 | |
| parent | 68666c06e8026af131ad5ada05adb4dd638f82cf (diff) | |
| download | xen-a3ef82b068b46a4c0058f25ec61145afab81b8ab.tar.gz xen-a3ef82b068b46a4c0058f25ec61145afab81b8ab.tar.bz2 xen-a3ef82b068b46a4c0058f25ec61145afab81b8ab.zip | |
Avoid need for GREP variable by avoiding GNUisms. The
only one we appear to have is use of '-q'. Replace it
with redirection to /dev/null.
Also avoid use of 'tail' by replacing with 'head' or
'grep' as appropriate.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | Config.mk | 2 | ||||
| -rw-r--r-- | buildconfigs/Rules.mk | 4 | ||||
| -rw-r--r-- | config/Linux.mk | 2 | ||||
| -rw-r--r-- | config/SunOS.mk | 1 | ||||
| -rw-r--r-- | xen/Makefile | 4 | ||||
| -rw-r--r-- | xen/arch/x86/Makefile | 3 |
6 files changed, 6 insertions, 10 deletions
@@ -26,7 +26,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include 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 " $(2) " >/dev/null 2>&1 && echo $(2)) ifneq ($(debug),y) CFLAGS += -DNDEBUG diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index 9e64c5a5eb..ae61ea0095 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -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 @@ config-update-pae: 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 --git a/config/Linux.mk b/config/Linux.mk index 91363906d1..be9fab97df 100644 --- a/config/Linux.mk +++ b/config/Linux.mk @@ -11,8 +11,6 @@ STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump -GREP = grep - INSTALL = install INSTALL_DIR = $(INSTALL) -d -m0755 INSTALL_DATA = $(INSTALL) -m0644 diff --git a/config/SunOS.mk b/config/SunOS.mk index d409d04aba..638281a480 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -11,7 +11,6 @@ STRIP = $(CROSS_COMPILE)gstrip OBJCOPY = $(CROSS_COMPILE)gobjcopy OBJDUMP = $(CROSS_COMPILE)gobjdump -GREP = ggrep SHELL = bash INSTALL = ginstall diff --git a/xen/Makefile b/xen/Makefile index bbadbe2b45..0c06e081fe 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -96,7 +96,7 @@ include/xen/compile.h: include/xen/compile.h.in -e 's/@@whoami@@/$(USER)/g' \ -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \ -e 's/@@hostname@@/$(shell hostname)/g' \ - -e 's|@@compiler@@|$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -n 1 | sed -e "s;|;/;")|g' \ + -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) -v 2>&1 | grep -i "gcc.*version")!g' \ -e 's/@@version@@/$(XEN_VERSION)/g' \ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ @@ -154,7 +154,7 @@ _cscope: .PHONY: MAP MAP: - $(NM) $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map + $(NM) -n $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' > System.map .PHONY: FORCE FORCE: diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index e303ec7b59..e8b1dd02e8 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -46,8 +46,7 @@ obj-$(crash_debug) += gdbstub.o $(TARGET): $(TARGET)-syms boot/mkelf32 ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \ - `$(NM) $(TARGET)-syms | sort | tail -n 1 | \ - sed -e 's/^\([^ ]*\).*/0x\1/'` + `$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` $(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) xen.lds $(MAKE) -f $(BASEDIR)/Rules.mk $(BASEDIR)/common/symbols-dummy.o |