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

["Scott A. Wozny" <sawozny@xxxxxxxxxxx>]

Just to close the loop on this, I found something in the Ubuntu forums I tried before heading down the path you've described.  I think it's basically the same thing as what you've suggested, I was just more comfortable with directly editing the file.
 
After the untar of the source:
 
nano buildconfigs/src.git-clone
# Replace Line
# (cd $(LINUX_SRCDIR).tmp; git checkout -b $(XEN_LINUX_GIT_LOCALBRANCH) $(XEN_LINUX_GITREV) ); \
# with:
# (cd $(LINUX_SRCDIR).tmp; git checkout -b local/$(XEN_LINUX_GIT_LOCALBRANCH) --track $(XEN_LINUX_GITREV) ); \
make world
sudo make install
 
and everything went swimmingly.  I guess there's some sort of issue with the source tarball as I've seen similar solutions posted in multiple places all dealing with the remote vs. local branch issue.  While I'm sure your solution would have worked, this one seemed easiet for me to implement and the makes went through without errors so I think I'm OK now.  Now to get it to boot...  :)
 
Thanks very much!
 
Scott
 

---

Date: Mon, 6 Dec 2010 23:50:29 +0800
Subject: Re: [Xen-users] Make world problem compiling Xen 4.0.1 from source
From: giamteckchoon@xxxxxxxxx
To: sawozny@xxxxxxxxxxx
CC: tlviewer@xxxxxxxxx; xen-users@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

_______________________________________________
Xen-users mailing list
Xen-users@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-users