From a278bc0ea1507c7241733804bb66fdb90cc44e6f Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Tue, 17 Oct 2006 16:48:05 +0100 Subject: Introduce Makefile config fragments for OS-specific differences. Signed-off-by: John Levon --- buildconfigs/Rules.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'buildconfigs') diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index 6eca30ef0a..ae61ea0095 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -3,6 +3,9 @@ include Config.mk export DESTDIR +# Choose the best mirror to download linux kernel +KERNEL_REPO = http://www.kernel.org + ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*)) ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse)) -- cgit v1.2.3 From 7ffd47fbf69a7a972c1f7fd27757b86e3d710643 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Tue, 17 Oct 2006 16:53:39 +0100 Subject: [SOLARIS] Use GNU grep on Solaris. Signed-off-by: John Levon --- buildconfigs/Rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildconfigs') diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index ae61ea0095..9e64c5a5eb 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. -- cgit v1.2.3 From a3ef82b068b46a4c0058f25ec61145afab81b8ab Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 18 Oct 2006 13:43:35 +0100 Subject: 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 --- buildconfigs/Rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildconfigs') 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. -- cgit v1.2.3