Hallo
I think I found a bug in the make scripts.
hg clone http://xenbits.xen.org/hg/xen-4.2-testing.hg
hg
changeset: 25959:5acb5967d718
tag: tip
user: Xiantao Zhang <xiantao.zhang@intel.com>
date: Wed Dec 19 12:58:07 2012 +0100
summary: nested vmx: fix interrupt delivery to L2 guest
./configure --enable-xenapi --enable-miniterm --enable-lomount
make world
make world stops here:
---------
[....]
+ /usr/src/xen4/xen-4.2-testing.hg/tools/../scripts/git-checkout.sh
git://xenbits.xen.org/qemu-xen-4.2-testing.git xen-4.2.1
qemu-xen-traditional-dir
Cloning into qemu-xen-traditional-dir-remote.tmp...
remote: Counting objects: 106797, done.
remote: Compressing objects: 100% (29142/29142), done.
remote: Total 106797 (delta 81709), reused 101960 (delta 77523)
Receiving objects: 100% (106797/106797), 37.44 MiB | 340 KiB/s, done.
Resolving deltas: 100% (81709/81709), done.
Switched to a new branch ''dummy''
make[2]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg/tools''
make -C tools qemu-xen-dir-find
make[2]: Entering directory `/usr/src/xen4/xen-4.2-testing.hg/tools''
if test -d git://xenbits.xen.org/qemu-upstream-4.2-testing.git ; then \
mkdir -p qemu-xen-dir; \
else \
export GIT=git; \
/usr/src/xen4/xen-4.2-testing.hg/tools/../scripts/git-checkout.sh
git://xenbits.xen.org/qemu-upstream-4.2-testing.git qemu-xen-4.2.1
qemu-xen-dir ; \
fi
Cloning into qemu-xen-dir-remote.tmp...
remote: Counting objects: 92332, done.
remote: Compressing objects: 100% (19773/19773), done.
remote: Total 92332 (delta 73134), reused 91552 (delta 72438)
Receiving objects: 100% (92332/92332), 34.73 MiB | 340 KiB/s, done.
Resolving deltas: 100% (73134/73134), done.
fatal: git checkout: updating paths is incompatible with switching branches.
Did you intend to checkout ''qemu-xen-4.2.1'' which can not be
resolved as
commit?
make[2]: *** [qemu-xen-dir-find] Error 128
make[2]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg/tools''
make[1]: *** [tools/qemu-xen-dir] Error 2
make[1]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg''
make: *** [world] Error 2
------
The reason is, that there is no tag qemu-xen-4.2.1 in the repository
git://xenbits.xen.org/qemu-upstream-4.2-testing.git
If I change git-checkout.sh to use
git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git instead all
works fine.
-----
TREE=$1
TAG=$2
DIR=$3
+ if [ "${TREE}" =
"git://xenbits.xen.org/qemu-upstream-4.2-testing.git"
]; then
+ TREE=git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git
+ fi
set -e
---
Thanks
Best wishes
Andreas
_______________________________________________
Xen-users mailing list
Xen-users@lists.xen.org
http://lists.xen.org/xen-users
Ian Campbell
2013-Jan-02 12:18 UTC
Re: xen 4.2.1 make world faild at building qemu-upstream
Thanks for reporting. I can see the qemu-xen-4.2.1 tag in staging/qemu-upstream-4.2-testing but not the main tree. I think this ought to have been propagated automatically but hasn''t been for some reason. Copying xen-devel and various folks involved with the 4.2.1 release and not trimming my quotes for their benefit. Ian. On Sat, 2012-12-29 at 10:18 +0000, Andreas Greve wrote:> Hallo > > I think I found a bug in the make scripts. > > hg clone http://xenbits.xen.org/hg/xen-4.2-testing.hg > hg > changeset: 25959:5acb5967d718 > tag: tip > user: Xiantao Zhang <xiantao.zhang@intel.com> > date: Wed Dec 19 12:58:07 2012 +0100 > summary: nested vmx: fix interrupt delivery to L2 guest > > ./configure --enable-xenapi --enable-miniterm --enable-lomount > make world > > make world stops here: > > --------- > [....] > + /usr/src/xen4/xen-4.2-testing.hg/tools/../scripts/git-checkout.sh > git://xenbits.xen.org/qemu-xen-4.2-testing.git xen-4.2.1 > qemu-xen-traditional-dir > Cloning into qemu-xen-traditional-dir-remote.tmp... > remote: Counting objects: 106797, done. > remote: Compressing objects: 100% (29142/29142), done. > remote: Total 106797 (delta 81709), reused 101960 (delta 77523) > Receiving objects: 100% (106797/106797), 37.44 MiB | 340 KiB/s, done. > Resolving deltas: 100% (81709/81709), done. > Switched to a new branch ''dummy'' > make[2]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg/tools'' > make -C tools qemu-xen-dir-find > make[2]: Entering directory `/usr/src/xen4/xen-4.2-testing.hg/tools'' > if test -d git://xenbits.xen.org/qemu-upstream-4.2-testing.git ; then > \ > mkdir -p qemu-xen-dir; \ > else \ > export GIT=git; \ > /usr/src/xen4/xen-4.2-testing.hg/tools/../scripts/git-checkout.sh git://xenbits.xen.org/qemu-upstream-4.2-testing.git qemu-xen-4.2.1 qemu-xen-dir ; \ > fi > Cloning into qemu-xen-dir-remote.tmp... > remote: Counting objects: 92332, done. > remote: Compressing objects: 100% (19773/19773), done. > remote: Total 92332 (delta 73134), reused 91552 (delta 72438) > Receiving objects: 100% (92332/92332), 34.73 MiB | 340 KiB/s, done. > Resolving deltas: 100% (73134/73134), done. > fatal: git checkout: updating paths is incompatible with switching > branches. > Did you intend to checkout ''qemu-xen-4.2.1'' which can not be resolved > as commit? > make[2]: *** [qemu-xen-dir-find] Error 128 > make[2]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg/tools'' > make[1]: *** [tools/qemu-xen-dir] Error 2 > make[1]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg'' > make: *** [world] Error 2 > ------ > > The reason is, that there is no tag qemu-xen-4.2.1 in the repository > git://xenbits.xen.org/qemu-upstream-4.2-testing.git > > If I change git-checkout.sh to use > git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git instead > all works fine. > ----- > TREE=$1 > TAG=$2 > DIR=$3 > > + if [ "${TREE}" > "git://xenbits.xen.org/qemu-upstream-4.2-testing.git" ]; then > + TREE=git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git > + fi > > set -e > --- > > Thanks > > Best wishes > > > Andreas > > >
Ian Campbell
2013-Jan-02 12:18 UTC
Re: [Xen-users] xen 4.2.1 make world faild at building qemu-upstream
Thanks for reporting. I can see the qemu-xen-4.2.1 tag in staging/qemu-upstream-4.2-testing but not the main tree. I think this ought to have been propagated automatically but hasn''t been for some reason. Copying xen-devel and various folks involved with the 4.2.1 release and not trimming my quotes for their benefit. Ian. On Sat, 2012-12-29 at 10:18 +0000, Andreas Greve wrote:> Hallo > > I think I found a bug in the make scripts. > > hg clone http://xenbits.xen.org/hg/xen-4.2-testing.hg > hg > changeset: 25959:5acb5967d718 > tag: tip > user: Xiantao Zhang <xiantao.zhang@intel.com> > date: Wed Dec 19 12:58:07 2012 +0100 > summary: nested vmx: fix interrupt delivery to L2 guest > > ./configure --enable-xenapi --enable-miniterm --enable-lomount > make world > > make world stops here: > > --------- > [....] > + /usr/src/xen4/xen-4.2-testing.hg/tools/../scripts/git-checkout.sh > git://xenbits.xen.org/qemu-xen-4.2-testing.git xen-4.2.1 > qemu-xen-traditional-dir > Cloning into qemu-xen-traditional-dir-remote.tmp... > remote: Counting objects: 106797, done. > remote: Compressing objects: 100% (29142/29142), done. > remote: Total 106797 (delta 81709), reused 101960 (delta 77523) > Receiving objects: 100% (106797/106797), 37.44 MiB | 340 KiB/s, done. > Resolving deltas: 100% (81709/81709), done. > Switched to a new branch ''dummy'' > make[2]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg/tools'' > make -C tools qemu-xen-dir-find > make[2]: Entering directory `/usr/src/xen4/xen-4.2-testing.hg/tools'' > if test -d git://xenbits.xen.org/qemu-upstream-4.2-testing.git ; then > \ > mkdir -p qemu-xen-dir; \ > else \ > export GIT=git; \ > /usr/src/xen4/xen-4.2-testing.hg/tools/../scripts/git-checkout.sh git://xenbits.xen.org/qemu-upstream-4.2-testing.git qemu-xen-4.2.1 qemu-xen-dir ; \ > fi > Cloning into qemu-xen-dir-remote.tmp... > remote: Counting objects: 92332, done. > remote: Compressing objects: 100% (19773/19773), done. > remote: Total 92332 (delta 73134), reused 91552 (delta 72438) > Receiving objects: 100% (92332/92332), 34.73 MiB | 340 KiB/s, done. > Resolving deltas: 100% (73134/73134), done. > fatal: git checkout: updating paths is incompatible with switching > branches. > Did you intend to checkout ''qemu-xen-4.2.1'' which can not be resolved > as commit? > make[2]: *** [qemu-xen-dir-find] Error 128 > make[2]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg/tools'' > make[1]: *** [tools/qemu-xen-dir] Error 2 > make[1]: Leaving directory `/usr/src/xen4/xen-4.2-testing.hg'' > make: *** [world] Error 2 > ------ > > The reason is, that there is no tag qemu-xen-4.2.1 in the repository > git://xenbits.xen.org/qemu-upstream-4.2-testing.git > > If I change git-checkout.sh to use > git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git instead > all works fine. > ----- > TREE=$1 > TAG=$2 > DIR=$3 > > + if [ "${TREE}" > "git://xenbits.xen.org/qemu-upstream-4.2-testing.git" ]; then > + TREE=git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git > + fi > > set -e > --- > > Thanks > > Best wishes > > > Andreas > > >
Ian Jackson
2013-Jan-02 12:22 UTC
Re: xen 4.2.1 make world faild at building qemu-upstream
Ian Campbell writes ("Re: [Xen-users] xen 4.2.1 make world faild at
building qemu-upstream"):> Thanks for reporting.
>
> I can see the qemu-xen-4.2.1 tag in staging/qemu-upstream-4.2-testing
> but not the main tree. I think this ought to have been propagated
> automatically but hasn''t been for some reason.
>
> Copying xen-devel and various folks involved with the 4.2.1 release and
> not trimming my quotes for their benefit.
The automatic testing system doesn''t copy any tags. Tags need to be
"manually" (ie actually manually or via git config) pushed to all the
output trees.
Ian.
Ian Jackson
2013-Jan-02 12:22 UTC
Re: [Xen-users] xen 4.2.1 make world faild at building qemu-upstream
Ian Campbell writes ("Re: [Xen-users] xen 4.2.1 make world faild at
building qemu-upstream"):> Thanks for reporting.
>
> I can see the qemu-xen-4.2.1 tag in staging/qemu-upstream-4.2-testing
> but not the main tree. I think this ought to have been propagated
> automatically but hasn''t been for some reason.
>
> Copying xen-devel and various folks involved with the 4.2.1 release and
> not trimming my quotes for their benefit.
The automatic testing system doesn''t copy any tags. Tags need to be
"manually" (ie actually manually or via git config) pushed to all the
output trees.
Ian.