[PATCH] Switch default kernel branch to xen/stable-2.6.31.x

[PATCH] Switch default kernel branch to xen/stable-2.6.31.x

[Jeremy Fitzhardinge]

This is functionally identical to xen/master at the moment, but more meaningful.

Signed-off-by: Jeremy Fitzhardinge<jeremy.fitzhardinge@citrix.com>

diff -r 55a6afb8bdbe -r 2c8d8a205479 buildconfigs/mk.linux-2.6-pvops
--- a/buildconfigs/mk.linux-2.6-pvops	Tue Apr 06 11:42:33 2010 -0700
+++ b/buildconfigs/mk.linux-2.6-pvops	Tue Apr 06 12:05:59 2010 -0700
@@ -10,7 +10,7 @@
  else
  XEN_LINUX_GIT_URL ?= git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
  endif
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/master
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x

  EXTRAVERSION ?=

[PATCH] Update git clone command

[Jeremy Fitzhardinge]

When cloning the kernel repo:
   1. make remote called "xen" rather than the default "origin"
   2. directly checkout the desired branch in one step

Signed-off-by: Jeremy Fitzhardinge<jeremy.fitzhardinge@citrix.com>

diff -r 2c8d8a205479 -r 7c0224e12012 buildconfigs/src.git-clone
--- a/buildconfigs/src.git-clone	Tue Apr 06 12:05:59 2010 -0700
+++ b/buildconfigs/src.git-clone	Tue Apr 06 12:06:52 2010 -0700
@@ -23,9 +23,7 @@
  	if ! [ -d $(LINUX_SRCDIR) ]; then \
  		rm -rf $(LINUX_SRCDIR) $(LINUX_SRCDIR).tmp; \
  		mkdir $(LINUX_SRCDIR).tmp; rmdir $(LINUX_SRCDIR).tmp; \
-		$(GIT) clone $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \
-		cd $(LINUX_SRCDIR).tmp; \
-		$(GIT) checkout $(XEN_LINUX_GIT_REMOTEBRANCH); \
-		cd ..; mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
+		$(GIT) clone -o xen -b $(XEN_LINUX_GIT_REMOTEBRANCH) $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \
+		mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
  	fi
  	touch $@

Re: [PATCH] Switch default kernel branch to xen/stable-2.6.31.x

[Pasi Kärkkäinen]

On Tue, Apr 06, 2010 at 12:10:53PM -0700, Jeremy Fitzhardinge wrote:
> This is functionally identical to xen/master at the moment, but more meaningful.
>
> Signed-off-by: Jeremy Fitzhardinge<jeremy.fitzhardinge@citrix.com>
>

Hello,

I see xen-4.0-testing.hg doesn't have this.. it's only in xen-unstable.
I guess this should go to 4.0 aswell..

-- Pasi

> diff -r 55a6afb8bdbe -r 2c8d8a205479 buildconfigs/mk.linux-2.6-pvops
> --- a/buildconfigs/mk.linux-2.6-pvops	Tue Apr 06 11:42:33 2010 -0700
> +++ b/buildconfigs/mk.linux-2.6-pvops	Tue Apr 06 12:05:59 2010 -0700
> @@ -10,7 +10,7 @@
>  else
>  XEN_LINUX_GIT_URL ?= git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
>  endif
> -XEN_LINUX_GIT_REMOTEBRANCH ?= xen/master
> +XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
>
>  EXTRAVERSION ?=
>
>
>

Re: [PATCH] Switch default kernel branch to xen/stable-2.6.31.x

[Keir Fraser]

On 07/04/2010 17:10, "Pasi Kärkkäinen" <pasik@iki.fi> wrote:

> On Tue, Apr 06, 2010 at 12:10:53PM -0700, Jeremy Fitzhardinge wrote:
>> This is functionally identical to xen/master at the moment, but more
>> meaningful.
>> 
>> Signed-off-by: Jeremy Fitzhardinge<jeremy.fitzhardinge@citrix.com>
>> 
> 
> Hello,
> 
> I see xen-4.0-testing.hg doesn't have this.. it's only in xen-unstable.
> I guess this should go to 4.0 aswell..

It broke automated tests so Ian Jackson requested it be reverted from
xen-unstable too. So I did.

 -- Keir