WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-users

Re: [Xen-users] Make world problem compiling Xen 4.0.1 from source

To: "Scott A. Wozny" <sawozny@xxxxxxxxxxx>
Subject: Re: [Xen-users] Make world problem compiling Xen 4.0.1 from source
From: Teck Choon Giam <giamteckchoon@xxxxxxxxx>
Date: Mon, 6 Dec 2010 23:50:29 +0800
Cc: tlviewer@xxxxxxxxx, Xen Users <xen-users@xxxxxxxxxxxxxxxxxxx>
Delivery-date: Mon, 06 Dec 2010 07:52:00 -0800
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=AyeQR6GyTka+Vgd4VX7/TFl/y2OuPITHDvpx9Bh2iQM=; b=aB22OYzOnSbowC+Ar5hOxqAtW/nMDT0rnf4EVqL3msfCQWyqEYFMVXhCpztrR1Ya8w sMnYzMASh93j4jri0MzeGWmRq56jms/2SfUeR0U3rb+23QaoOxIZBAel3+JcsVP4xxNB S4sUsnZ8TlCOHhvmzC0wnirIqzJDUlLcN+lS4=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=FAvEythiA7ixJsptlhW054iGoFAKSfDZg+ANbcX85hX+uY86HGh8sulSBi5FvZPSM6 HGwlMDSiC1GveAy1kqBEyfsek8gImgXT890xUigt7P8uvpWedAR8dcmL1t+UvhyudRKq H7powTRmVEtt0GQB1KRVU7Ok8dTk4DRVhQn5Y=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <SNT111-W44E7C5813993E9C64F4F16A8290@xxxxxxx>
List-help: <mailto:xen-users-request@lists.xensource.com?subject=help>
List-id: Xen user discussion <xen-users.lists.xensource.com>
List-post: <mailto:xen-users@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-users>, <mailto:xen-users-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-users>, <mailto:xen-users-request@lists.xensource.com?subject=unsubscribe>
References: <410744.2489.qm@xxxxxxxxxxxxxxxxxxxxxxxxxxx> <SNT111-W44E7C5813993E9C64F4F16A8290@xxxxxxx>
Sender: xen-users-bounces@xxxxxxxxxxxxxxxxxxx

+ cd linux-2.6-pvops.git.tmp
+ git checkout -b xen/stable-2.6.32.x xen/xen/stable-2.6.32.x
fatal: git checkout: branch xen/stable-2.6.32.x already exists

Can you go into linux-2.6-pvops.git directory and do:

git branch -a

And show us the output?

I guess the remote branches are there but with git checkout -b option to create a local branch name conflict with remote branch somehow if I am not wrong.  Someone correct me if I am wrong.

Here is the patch which I only tested with unpack the xen-4.0.1.tar.gz then cd to the source then make prep-kernels after applying the below patch:

--- a/buildconfigs/src.git-clone    2010-12-06 23:37:52.000000000 +0800
+++ b/buildconfigs/src.git-clone    2010-12-06 23:38:47.000000000 +0800
@@ -26,7 +26,7 @@
         rm -rf $(LINUX_SRCDIR) $(LINUX_SRCDIR).tmp; \
         mkdir $(LINUX_SRCDIR).tmp; rmdir $(LINUX_SRCDIR).tmp; \
         $(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) ); \
+        (cd $(LINUX_SRCDIR).tmp; git checkout -b local/$(XEN_LINUX_GIT_LOCALBRANCH) --track $(XEN_LINUX_GITREV) ); \
         mv $(LINUX_SRCDIR).tmp $(LINUX_SRCDIR); \
     fi
     touch $@

OR without the patch you can do:

# make V=2 XEN_LINUX_GIT_LOCALBRANCH=local/xen/stable-2.6.32.x prep-kernels

Basically, just overwrite the default XEN_LINUX_GIT_LOCALBRANCH variable which is default to:

XEN_LINUX_GIT_LOCALBRANCH ?= $(XEN_LINUX_GIT_REMOTEBRANCH)

# grep XEN_LINUX_GIT_LOCALBRANCH ./*/*
./buildconfigs/src.git-clone:XEN_LINUX_GIT_LOCALBRANCH ?= $(XEN_LINUX_GIT_REMOTEBRANCH)
./buildconfigs/src.git-clone:        (cd $(LINUX_SRCDIR).tmp; git checkout -b $(XEN_LINUX_GIT_LOCALBRANCH) $(XEN_LINUX_GITREV) ); \


Hope the above is useful ;)

Thanks.

Kindest regards,
Giam Teck Choon
_______________________________________________
Xen-users mailing list
Xen-users@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-users