Skip to contentSkip to conversation

switch default kernel to 2.6.32

PATCH In review Jeremy Fitzhardinge 5 participants 11 messages Jun 17, 2010 – Aug 13, 2010

lore
Share & tools
lore

Jeremy Fitzhardinge

author
#0 lore raw

PATCH 1/1 switch default kernel to 2.6.32

Use 2.6.32 now.

Signed-off-by Jeremy Fitzhardinge <[email protected]>
buildconfigs/mk.linux-2.6-pvops +1 -1
diff -r b9c541d9c138 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/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
 EXTRAVERSION ?=
#1 lore raw
Quoted 2 lines · Jeremy Fitzhardinge

Use 2.6.32 now.

Hello,

How about xen-4.0-testing.hg ?
It seems to be still using 'xen/master' ..

-- Pasi

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

diff -r b9c541d9c138 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/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
 EXTRAVERSION ?=

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#2 lore raw
Quoted 7 lines · Pasi Kärkkäinen
Quoted 2 lines · Jeremy Fitzhardinge

Use 2.6.32 now.

Hello,

How about xen-4.0-testing.hg ?
It seems to be still using 'xen/master' ..

Keir, did you switch it over too?

Thanks,
J

Quoted 23 lines

-- Pasi

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

diff -r b9c541d9c138 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/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
  EXTRAVERSION ?=

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#3 lore raw

Done. I assume just changing the REMOTEBRANCH tag will work.

K.

Quoted 39 lines · Jeremy Fitzhardinge
Quoted 7 lines · Pasi Kärkkäinen
Quoted 2 lines · Jeremy Fitzhardinge

Use 2.6.32 now.

Hello,

How about xen-4.0-testing.hg ?
It seems to be still using 'xen/master' ..

Keir, did you switch it over too?

Thanks,
J

Quoted 24 lines

-- Pasi

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

diff -r b9c541d9c138 buildconfigs/mk.linux-2.6-pvops

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +0 -0
@@ -10,7 +10,7 @@
  else
  XEN_LINUX_GIT_URL ?=

git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
endif

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +1 -1
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
  EXTRAVERSION ?=

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#4 lore raw
Quoted 1 line · Keir Fraser

Done. I assume just changing the REMOTEBRANCH tag will work.

Hm, perhaps. I had to do that other git magic to make it work, and I'm guessing that didn't make it into 4.0-testing? I'll check tomorrow...

J

Quoted 42 lines

K.

Quoted 37 lines · Jeremy Fitzhardinge
Quoted 7 lines · Pasi Kärkkäinen
Quoted 2 lines · Jeremy Fitzhardinge

Use 2.6.32 now.

Hello,

How about xen-4.0-testing.hg ?
It seems to be still using 'xen/master' ..

Keir, did you switch it over too?

Thanks,
J

Quoted 24 lines

-- Pasi

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

diff -r b9c541d9c138 buildconfigs/mk.linux-2.6-pvops

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +0 -0
@@ -10,7 +10,7 @@
   else
   XEN_LINUX_GIT_URL ?=

git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
endif

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +1 -1
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
   EXTRAVERSION ?=

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#5 lore raw
Quoted 5 lines · Jeremy Fitzhardinge
Quoted 1 line · Keir Fraser

Done. I assume just changing the REMOTEBRANCH tag will work.

Hm, perhaps. I had to do that other git magic to make it work, and I'm guessing that didn't make it into 4.0-testing? I'll check tomorrow...

That's fine. There won't be another RC tag this week I think.

K.

Quoted 45 lines

J

Quoted 42 lines

K.

Quoted 37 lines · Jeremy Fitzhardinge
Quoted 7 lines · Pasi Kärkkäinen
Quoted 2 lines · Jeremy Fitzhardinge

Use 2.6.32 now.

Hello,

How about xen-4.0-testing.hg ?
It seems to be still using 'xen/master' ..

Keir, did you switch it over too?

Thanks,
J

Quoted 24 lines

-- Pasi

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

diff -r b9c541d9c138 buildconfigs/mk.linux-2.6-pvops

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +0 -0
@@ -10,7 +10,7 @@
   else
   XEN_LINUX_GIT_URL ?=

git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
endif

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +1 -1
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
   EXTRAVERSION ?=

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#6 lore raw
In reply to Jeremy Fitzhardinge
Quoted 5 lines · Jeremy Fitzhardinge
Quoted 1 line · Keir Fraser

Done. I assume just changing the REMOTEBRANCH tag will work.

Hm, perhaps. I had to do that other git magic to make it work, and I'm guessing that didn't make it into 4.0-testing? I'll check tomorrow...

Actually I just noticed that I omitted to push the changeset that changes the REMOTEBRANCH tag. Since you're not totally sure it will work anyway without other adjustments, please test and send a complete working patch for 4.0-testing, and I'll then check it in.

Thanks,
Keir

Quoted 45 lines

J

Quoted 42 lines

K.

Quoted 37 lines · Jeremy Fitzhardinge
Quoted 7 lines · Pasi Kärkkäinen
Quoted 2 lines · Jeremy Fitzhardinge

Use 2.6.32 now.

Hello,

How about xen-4.0-testing.hg ?
It seems to be still using 'xen/master' ..

Keir, did you switch it over too?

Thanks,
J

Quoted 24 lines

-- Pasi

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

diff -r b9c541d9c138 buildconfigs/mk.linux-2.6-pvops

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +0 -0
@@ -10,7 +10,7 @@
   else
   XEN_LINUX_GIT_URL ?=

git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
endif

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +1 -1
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
   EXTRAVERSION ?=

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#7 lore raw

Re: [PATCH] switch default kernel to 2.6.32 in xen-4.0-testing.hg

Quoted 5 lines · Keir Fraser
Quoted 3 lines · Jeremy Fitzhardinge
Quoted 1 line · Keir Fraser

Done. I assume just changing the REMOTEBRANCH tag will work.

Quoted 8 lines
Quoted 2 lines

Hm, perhaps. I had to do that other git magic to make it work, and I'm guessing that didn't make it into 4.0-testing? I'll check tomorrow...

Actually I just noticed that I omitted to push the changeset that changes the REMOTEBRANCH tag. Since you're not totally sure it will work anyway without other adjustments, please test and send a complete working patch for 4.0-testing, and I'll then check it in.

I'm still nagging about this so we get it proper for Xen 4.0.1 release :)

-- Pasi

Quoted 50 lines

Thanks,
Keir

Quoted 45 lines

J

Quoted 42 lines

K.

Quoted 37 lines · Jeremy Fitzhardinge
Quoted 7 lines · Pasi Kärkkäinen
Quoted 2 lines · Jeremy Fitzhardinge

Use 2.6.32 now.

Hello,

How about xen-4.0-testing.hg ?
It seems to be still using 'xen/master' ..

Keir, did you switch it over too?

Thanks,
J

Quoted 24 lines

-- Pasi

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

diff -r b9c541d9c138 buildconfigs/mk.linux-2.6-pvops

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +0 -0
@@ -10,7 +10,7 @@
   else
   XEN_LINUX_GIT_URL ?=

git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
endif

buildconfigs/mk.linux-2.6-pvops Thu Jun 17 14:24:17 2010 +0100 renamed from buildconfigs/mk.linux-2.6-pvops Tue Jun 15 13:27:14 2010 +0100 +1 -1
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.31.x
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen/stable-2.6.32.x
 
   EXTRAVERSION ?=

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#8 lore raw

Re: [PATCH] switch default kernel to 2.6.32 in xen-4.0-testing.hg

Quoted 5 lines · Pasi Kärkkäinen
Quoted 4 lines · Keir Fraser
Quoted 2 lines · Jeremy Fitzhardinge
Quoted 1 line · Keir Fraser

Done. I assume just changing the REMOTEBRANCH tag will work.

Quoted 8 lines
Quoted 7 lines
Quoted 2 lines

Hm, perhaps. I had to do that other git magic to make it work, and I'm guessing that didn't make it into 4.0-testing? I'll check tomorrow...

Actually I just noticed that I omitted to push the changeset that changes the REMOTEBRANCH tag. Since you're not totally sure it will work anyway without other adjustments, please test and send a complete working patch for 4.0-testing, and I'll then check it in.

I'm still nagging about this so we get it proper for Xen 4.0.1 release :)

OK, here's three patches. The first two update the git pull stuff and the kernel to stable-2.6.32.x for the Xen 4.0 branch. The third fixes a shell syntax thingy that should be applied to xen-4 and to unstable.

Thanks,
J

Update git pull machinery

This is needed to pull a non-default branch, and to allow the test infrastructure's bisection machinery to work.

Signed-off-by Jeremy Fitzhardinge <[email protected]>
buildconfigs/src.git-clone +7 -6
diff -r 8e8dd38374e9 buildconfigs/src.git-clone
@@ -13,19 +13,20 @@
 .ERROR: XEN_LINUX_GIT_REMOTEBRANCH not specified
 endif
 
-XEN_LINUX_GIT_LOCALBRANCH ?= master
+XEN_GIT_ORIGIN ?= xen
+
+XEN_LINUX_GIT_LOCALBRANCH ?= $(XEN_LINUX_GIT_REMOTEBRANCH)
 
 # Set XEN_LINUX_GITREV to update to a particlar revision.
-XEN_LINUX_GITREV  ?= 
+XEN_LINUX_GITREV  ?= $(XEN_GIT_ORIGIN)/$(XEN_LINUX_GIT_REMOTEBRANCH)
 
 $(LINUX_SRCDIR)/.valid-src: $(__XEN_LINUX_UPDATE)
 	set -ex; \
 	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_GIT_ORIGIN) -n $(XEN_LINUX_GIT_URL) $(LINUX_SRCDIR).tmp; \
+		(cd $(LINUX_SRCDIR).tmp; git checkout -b $(XEN_LINUX_GIT_LOCALBRANCH) $(XEN_LINUX_GITREV) ); \
+		mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
 	fi
 	touch $@

Update default kernel to 2.6.32.x

Signed-off-by Jeremy Fitzhardinge <[email protected]>
buildconfigs/mk.linux-2.6-pvops +1 -1
diff -r 8e8dd38374e9 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.32.x
 
 EXTRAVERSION ?=

Fix quoting error

Prevent shell syntax error if $(XEN_LINUX_CONFIG) is empty.

Signed-off-by Jeremy Fitzhardinge <[email protected]>
buildconfigs/mk.linux-2.6-common +1 -1
diff -r 650fc0e08631 -r 80125f40a748 buildconfigs/mk.linux-2.6-common
@@ -75,7 +75,7 @@
 	# tree. Finally attempt to use make defconfig.
 	set -e ; \
 	CONFIG_VERSION=$$(sed -ne 's/$$(XENGUEST)//; s/^EXTRAVERSION = //p' $(LINUX_SRCDIR)/Makefile); \
-	if [ ! -z "$(XEN_LINUX_CONFIG)" -a -r $(XEN_LINUX_CONFIG) ]; then \
+	if [ ! -z "$(XEN_LINUX_CONFIG)" -a -r "$(XEN_LINUX_CONFIG)" ]; then \
 	  cp $(XEN_LINUX_CONFIG) $(CONFIG_FILE); \
 	elif [ -r $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION$(EXTRAVERSION) ] ; then \
 	  cp $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION$(EXTRAVERSION) $(CONFIG_FILE) ; \

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Acked-by
#9 lore raw

Re: [PATCH] switch default kernel to 2.6.32 in xen-4.0-testing.hg

Jeremy Fitzhardinge writes ("Re: [Xen-devel] [PATCH] switch default kernel to 2.6.32 in xen-4.0-testing.hg"):

Quoted 3 lines

OK, here's three patches. The first two update the git pull stuff and the kernel to stable-2.6.32.x for the Xen 4.0 branch. The third fixes a shell syntax thingy that should be applied to xen-4 and to unstable.

...
Re the third patch:

Quoted 5 lines

Fix quoting error

Prevent shell syntax error if $(XEN_LINUX_CONFIG) is empty.

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

I haven't reviewed the other two. Is the first patch (update the git pull stuff) a backport of the corresponding changes from xen-unstable ? If so, great.

Ian.

#10 lore raw

Re: [PATCH] switch default kernel to 2.6.32 in xen-4.0-testing.hg

Quoted 10 lines · Ian Jackson
Quoted 5 lines

Fix quoting error

Prevent shell syntax error if $(XEN_LINUX_CONFIG) is empty.

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

I haven't reviewed the other two. Is the first patch (update the git pull stuff) a backport of the corresponding changes from xen-unstable ? If so, great.

Yes, they're just a copy of the xen-unstable version of the file.

J