# HG changeset patch
# User chris@ubuntu.eng.hq.xensource.com
# Node ID 6691252943d19c76fca75a243e8c70116b340c47
# Parent d48b19263e4687c82d9c58f339077759a5dffb2b
Revert changes slipped in during merge.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
diff -r d48b19263e46 -r 6691252943d1 .hgignore
--- a/.hgignore Wed Dec 14 02:05:57 2005
+++ b/.hgignore Wed Dec 14 02:11:27 2005
@@ -10,7 +10,6 @@
.*\.tar\.bz2$
.*\.tar\.gz$
.*~$
-^build.*$
^dist/.*$
^docs/.*\.aux$
^docs/.*\.dvi$
diff -r d48b19263e46 -r 6691252943d1 Config.mk
--- a/Config.mk Wed Dec 14 02:05:57 2005
+++ b/Config.mk Wed Dec 14 02:11:27 2005
@@ -3,7 +3,7 @@
# Currently supported architectures: x86_32, x86_64
XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/)
XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH)
-XEN_TARGET_X86_PAE ?= y
+XEN_TARGET_X86_PAE ?= n
# Tools to run on system hosting the build
HOSTCC = gcc
diff -r d48b19263e46 -r 6691252943d1 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen Wed Dec 14 02:05:57 2005
+++ b/buildconfigs/mk.linux-2.6-xen Wed Dec 14 02:11:27 2005
@@ -6,8 +6,7 @@
EXTRAVERSION ?= xen
-LINUX_SRCDIR = $(OS)-$(LINUX_VER)-xen
-LINUX_DIR = build-$(OS)-$(LINUX_VER)-$(EXTRAVERSION)_$(XEN_TARGET_ARCH)
+LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
include buildconfigs/Rules.mk
@@ -21,32 +20,25 @@
fi
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
-$(LINUX_SRCDIR)/.valid-src: ref-$(OS)-$(LINUX_VER)/.valid-ref
- rm -rf $(LINUX_SRCDIR)
- cp -al $(<D) $(LINUX_SRCDIR)
+$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
+ rm -rf $(LINUX_DIR)
+ cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
( cd linux-$(LINUX_SERIES)-xen-sparse ; \
- LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_SRCDIR) )
- # Patch kernel Makefile to set EXTRAVERSION
- ( cd $(LINUX_SRCDIR) ; \
- sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)/' \
- -e 's,^KERNELRELEASE=,XENGUEST := $$(shell [ -r $$(objtree)/.xenguest ] \&\& cat $$(objtree)/.xenguest)\n&,' Makefile >Mk.tmp ; \
- rm -f Makefile ; mv Mk.tmp Makefile )
- touch $@
-
-$(LINUX_DIR)/include/linux/autoconf.h: $(LINUX_SRCDIR)/.valid-src
- rm -rf $(LINUX_DIR)
- mkdir -p $(LINUX_DIR)
+ LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_DIR) )
# Re-use config from install dir if one exits else use default config
- CONFIG_VERSION=$$(sed -ne 's/$$(XENGUEST)//; s/^EXTRAVERSION = //p' $(LINUX_SRCDIR)/Makefile); \
+ CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
- || cp $(LINUX_SRCDIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
+ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
$(LINUX_DIR)/.config
# See if we need to munge config to enable PAE
$(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae
- echo "-$(EXTRAVERSION)" >$(LINUX_DIR)/.xenguest
- $(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) oldconfig O=$$(/bin/pwd)/$(LINUX_DIR)
+ # Patch kernel Makefile to set EXTRAVERSION
+ ( cd $(LINUX_DIR) ; \
+ sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+ rm -f Makefile ; mv Mk.tmp Makefile )
+ $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig
prep: $(LINUX_DIR)/include/linux/autoconf.h
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog
# User chris@ubuntu.eng.hq.xensource.com
# Node ID 6691252943d19c76fca75a243e8c70116b340c47
# Parent d48b19263e4687c82d9c58f339077759a5dffb2b
Revert changes slipped in during merge.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
diff -r d48b19263e46 -r 6691252943d1 .hgignore
--- a/.hgignore Wed Dec 14 02:05:57 2005
+++ b/.hgignore Wed Dec 14 02:11:27 2005
@@ -10,7 +10,6 @@
.*\.tar\.bz2$
.*\.tar\.gz$
.*~$
-^build.*$
^dist/.*$
^docs/.*\.aux$
^docs/.*\.dvi$
diff -r d48b19263e46 -r 6691252943d1 Config.mk
--- a/Config.mk Wed Dec 14 02:05:57 2005
+++ b/Config.mk Wed Dec 14 02:11:27 2005
@@ -3,7 +3,7 @@
# Currently supported architectures: x86_32, x86_64
XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/)
XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH)
-XEN_TARGET_X86_PAE ?= y
+XEN_TARGET_X86_PAE ?= n
# Tools to run on system hosting the build
HOSTCC = gcc
diff -r d48b19263e46 -r 6691252943d1 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen Wed Dec 14 02:05:57 2005
+++ b/buildconfigs/mk.linux-2.6-xen Wed Dec 14 02:11:27 2005
@@ -6,8 +6,7 @@
EXTRAVERSION ?= xen
-LINUX_SRCDIR = $(OS)-$(LINUX_VER)-xen
-LINUX_DIR = build-$(OS)-$(LINUX_VER)-$(EXTRAVERSION)_$(XEN_TARGET_ARCH)
+LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
include buildconfigs/Rules.mk
@@ -21,32 +20,25 @@
fi
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
-$(LINUX_SRCDIR)/.valid-src: ref-$(OS)-$(LINUX_VER)/.valid-ref
- rm -rf $(LINUX_SRCDIR)
- cp -al $(<D) $(LINUX_SRCDIR)
+$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
+ rm -rf $(LINUX_DIR)
+ cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
( cd linux-$(LINUX_SERIES)-xen-sparse ; \
- LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_SRCDIR) )
- # Patch kernel Makefile to set EXTRAVERSION
- ( cd $(LINUX_SRCDIR) ; \
- sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)/' \
- -e 's,^KERNELRELEASE=,XENGUEST := $$(shell [ -r $$(objtree)/.xenguest ] \&\& cat $$(objtree)/.xenguest)\n&,' Makefile >Mk.tmp ; \
- rm -f Makefile ; mv Mk.tmp Makefile )
- touch $@
-
-$(LINUX_DIR)/include/linux/autoconf.h: $(LINUX_SRCDIR)/.valid-src
- rm -rf $(LINUX_DIR)
- mkdir -p $(LINUX_DIR)
+ LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_DIR) )
# Re-use config from install dir if one exits else use default config
- CONFIG_VERSION=$$(sed -ne 's/$$(XENGUEST)//; s/^EXTRAVERSION = //p' $(LINUX_SRCDIR)/Makefile); \
+ CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
- || cp $(LINUX_SRCDIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
+ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
$(LINUX_DIR)/.config
# See if we need to munge config to enable PAE
$(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae
- echo "-$(EXTRAVERSION)" >$(LINUX_DIR)/.xenguest
- $(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) oldconfig O=$$(/bin/pwd)/$(LINUX_DIR)
+ # Patch kernel Makefile to set EXTRAVERSION
+ ( cd $(LINUX_DIR) ; \
+ sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
+ rm -f Makefile ; mv Mk.tmp Makefile )
+ $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig
prep: $(LINUX_DIR)/include/linux/autoconf.h
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog