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-devel

Re: [Xen-devel] XEN building "make world" broken?

John C. McCullough writes ("Re: [Xen-devel] XEN building "make world" broken?"):
> + 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
> ...
...
> Looks like the local xen/stable-2.6.32.x branch that is started in the 
> build process got pushed into the main repo.

Jeremy, has something changed in your kernel.org tree ?

> Removing the local branch creation works:
> 
> diff -r 996f7815b070 buildconfigs/src.git-clone
> --- a/buildconfigs/src.git-clone        Thu Feb 10 17:26:19 2011 +0000
> +++ b/buildconfigs/src.git-clone        Thu Feb 17 11:50:35 2011 -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  
> $(XEN_LINUX_GITREV) ); \

This doesn't work because if the XEN_LINUX_GITREV is revision rather
than a branch name, some versions of git won't change HEAD to it.

Ian.

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