Skip to contentSkip to conversation

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

PATCH In review Jeremy Fitzhardinge 3 participants 4 messages Apr 6, 2010 – Apr 7, 2010 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): C7E0F255.F6FD%[email protected]

Jeremy Fitzhardinge

author
#1 lore raw

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

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

Signed-off-by Jeremy Fitzhardinge<[email protected]>
buildconfigs/mk.linux-2.6-pvops +1 -1
diff -r 55a6afb8bdbe -r 2c8d8a205479 buildconfigs/mk.linux-2.6-pvops
@@ -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 ?=
#2 lore raw
Quoted 4 lines · Jeremy Fitzhardinge

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

Signed-off-by Jeremy Fitzhardinge<[email protected]>

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

Quoted 14 lines

diff -r 55a6afb8bdbe -r 2c8d8a205479 buildconfigs/mk.linux-2.6-pvops

buildconfigs/mk.linux-2.6-pvops +1 -1
@@ -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 ?=
#3 lore raw
Quoted 11 lines · Pasi Kärkkäinen
Quoted 5 lines · Jeremy Fitzhardinge

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

Signed-off-by Jeremy Fitzhardinge<[email protected]>

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

author
#4 lore raw

PATCH 1/1 Update git clone command

In reply to a message not in the archive

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<[email protected]>
buildconfigs/src.git-clone +2 -4
diff -r 2c8d8a205479 -r 7c0224e12012 buildconfigs/src.git-clone
@@ -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 $@