From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: Re: [PATCH] switch default kernel to 2.6.32 in xen-4.0-testing.hg Date: Thu, 12 Aug 2010 11:20:15 -0700 Message-ID: <4C643B5F.8080308@goop.org> References: <4C4E81D5.7030604@goop.org> <20100812162712.GR2804@reaktio.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080403060000090404000206" Return-path: In-Reply-To: <20100812162712.GR2804@reaktio.net> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: =?ISO-8859-1?Q?Pasi_K=E4rkk=E4inen?= Cc: Xen-devel , Keir Fraser List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------080403060000090404000206 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable On 08/12/2010 09:27 AM, Pasi K=E4rkk=E4inen wrote: > On Fri, Jul 30, 2010 at 11:34:36AM +0100, Keir Fraser wrote: >> On 27/07/2010 07:51, "Jeremy Fitzhardinge" wrote: >> >>> On 07/26/2010 11:46 PM, Keir Fraser wrote: >>>> 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 chan= ges >> the REMOTEBRANCH tag. Since you're not totally sure it will work anywa= y >> without other adjustments, please test and send a complete working pat= ch 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=20 the kernel to stable-2.6.32.x for the Xen 4.0 branch. The third fixes a=20 shell syntax thingy that should be applied to xen-4 and to unstable. Thanks, J --------------080403060000090404000206 Content-Type: text/plain; name="update-git-pull" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="update-git-pull" 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 diff -r 8e8dd38374e9 buildconfigs/src.git-clone --- a/buildconfigs/src.git-clone Wed Aug 11 16:44:03 2010 +0100 +++ b/buildconfigs/src.git-clone Thu Aug 12 10:42:45 2010 -0700 @@ -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 $@ --------------080403060000090404000206 Content-Type: text/plain; name="update-default-kernel" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="update-default-kernel" Update default kernel to 2.6.32.x Signed-off-by: Jeremy Fitzhardinge diff -r 8e8dd38374e9 buildconfigs/mk.linux-2.6-pvops --- a/buildconfigs/mk.linux-2.6-pvops Wed Aug 11 16:44:03 2010 +0100 +++ b/buildconfigs/mk.linux-2.6-pvops Thu Aug 12 10:42:45 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.32.x EXTRAVERSION ?= --------------080403060000090404000206 Content-Type: text/plain; name="fix-config-quoting" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fix-config-quoting" Fix quoting error Prevent shell syntax error if $(XEN_LINUX_CONFIG) is empty. Signed-off-by: Jeremy Fitzhardinge diff -r 650fc0e08631 -r 80125f40a748 buildconfigs/mk.linux-2.6-common --- a/buildconfigs/mk.linux-2.6-common Thu Aug 12 10:42:46 2010 -0700 +++ b/buildconfigs/mk.linux-2.6-common Thu Aug 12 11:11:10 2010 -0700 @@ -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) ; \ --------------080403060000090404000206 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------080403060000090404000206--