debuggers.hg

changeset 21163:f0ef396d8c33

Revert 21110:d791173ca65b and 21111:986d3b1d30fb

Break automated tests.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Apr 07 15:44:29 2010 +0100 (2010-04-07)
parents 3376c90960e8
children 28e5409e3fb3
files buildconfigs/mk.linux-2.6-pvops buildconfigs/src.git-clone
line diff
     1.1 --- a/buildconfigs/mk.linux-2.6-pvops	Wed Apr 07 10:17:27 2010 +0100
     1.2 +++ b/buildconfigs/mk.linux-2.6-pvops	Wed Apr 07 15:44:29 2010 +0100
     1.3 @@ -10,7 +10,7 @@ XEN_LINUX_GIT_URL ?= http://www.kernel.o
     1.4  else
     1.5  XEN_LINUX_GIT_URL ?= git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
     1.6  endif
     1.7 -XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
     1.8 +XEN_LINUX_GIT_REMOTEBRANCH ?= xen/master
     1.9  
    1.10  EXTRAVERSION ?=
    1.11  
     2.1 --- a/buildconfigs/src.git-clone	Wed Apr 07 10:17:27 2010 +0100
     2.2 +++ b/buildconfigs/src.git-clone	Wed Apr 07 15:44:29 2010 +0100
     2.3 @@ -23,7 +23,9 @@ XEN_LINUX_GITREV  ?=
     2.4  	if ! [ -d $(LINUX_SRCDIR) ]; then \
     2.5  		rm -rf $(LINUX_SRCDIR) $(LINUX_SRCDIR).tmp; \
     2.6  		mkdir $(LINUX_SRCDIR).tmp; rmdir $(LINUX_SRCDIR).tmp; \
     2.7 -		$(GIT) clone -o xen -b $(XEN_LINUX_GIT_REMOTEBRANCH) $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \
     2.8 -		mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
     2.9 +		$(GIT) clone $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \
    2.10 +		cd $(LINUX_SRCDIR).tmp; \
    2.11 +		$(GIT) checkout $(XEN_LINUX_GIT_REMOTEBRANCH); \
    2.12 +		cd ..; mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
    2.13  	fi
    2.14  	touch $@