Hi,
forced update of qemu in xen-unstable fails (I''m using GIT_HTTP=y, if
this matters):
# make tools/ioemu-dir-force-update
make -C tools ioemu-dir-force-update
make[1]: Entering directory `/root/xen-unstable.hg/tools''
set -ex; \
if [ "60766b459c41e429a4b2405124b42512ea362984" ]; then \
cd ioemu-remote; \
git reset --hard 60766b459c41e429a4b2405124b42512ea362984; \
fi
+ ''['' 60766b459c41e429a4b2405124b42512ea362984
'']''
+ cd ioemu-remote
+ git reset --hard 60766b459c41e429a4b2405124b42512ea362984
fatal: Could not parse object
''60766b459c41e429a4b2405124b42512ea362984''.
make[1]: *** [ioemu-dir-force-update] Error 128
make[1]: Leaving directory `/root/xen-unstable.hg/tools''
make: *** [tools/ioemu-dir-force-update] Error 2
Juergen
--
Juergen Gross Principal Developer Operating Systems
TSP ES&S SWE OS6 Telephone: +49 (0) 89 3222 2967
Fujitsu Technology Solutions e-mail: juergen.gross@ts.fujitsu.com
Domagkstr. 28 Internet: ts.fujitsu.com
D-80807 Muenchen Company details: ts.fujitsu.com/imprint.html
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Ian Campbell
2010-Nov-22 09:26 UTC
Re: [Xen-devel] "make tools/ioemu-dir-force-update" fails
On Mon, 2010-11-22 at 07:18 +0000, Juergen Gross wrote:> Hi, > > forced update of qemu in xen-unstable fails (I''m using GIT_HTTP=y, if > this matters): > > # make tools/ioemu-dir-force-update > make -C tools ioemu-dir-force-update > make[1]: Entering directory `/root/xen-unstable.hg/tools'' > set -ex; \ > if [ "60766b459c41e429a4b2405124b42512ea362984" ]; then \ > cd ioemu-remote; \ > git reset --hard 60766b459c41e429a4b2405124b42512ea362984; \ > fi > + ''['' 60766b459c41e429a4b2405124b42512ea362984 '']'' > + cd ioemu-remote > + git reset --hard 60766b459c41e429a4b2405124b42512ea362984 > fatal: Could not parse object ''60766b459c41e429a4b2405124b42512ea362984''. > make[1]: *** [ioemu-dir-force-update] Error 128 > make[1]: Leaving directory `/root/xen-unstable.hg/tools'' > make: *** [tools/ioemu-dir-force-update] Error 2When I added this I was motivated by doing bisection -- i.e. switching between versions which are already in the local repository. This obviously doesn''t handle the (most common) case where an entirely new qemu version is required. We obviously need a "git fetch" of some description in there: 8<----------- # HG changeset patch # User Ian Campbell <ian.campbell@citrix.com> # Date 1290417947 0 # Node ID 5854108a8305913ebe5c5f02c1dac6bd0f389770 # Parent 4c6b73eacd4747e89ea7aacc2d91b14a83f2c8e3 tools: fetch remote changesets when force refetching/resetting qemu This makes "make tools/ioemu-dir-force-update" usable for picking up an entirely new QEMU_TAG. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> diff -r 4c6b73eacd47 -r 5854108a8305 tools/Makefile --- a/tools/Makefile Mon Nov 22 09:21:02 2010 +0000 +++ b/tools/Makefile Mon Nov 22 09:25:47 2010 +0000 @@ -122,6 +122,7 @@ ioemu-dir-force-update: set -ex; \ if [ "$(QEMU_TAG)" ]; then \ cd ioemu-remote; \ + $(GIT) fetch origin; \ $(GIT) reset --hard $(QEMU_TAG); \ fi _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Nov-23 19:29 UTC
Re: [Xen-devel] "make tools/ioemu-dir-force-update" fails
Ian Campbell writes ("Re: [Xen-devel] "make
tools/ioemu-dir-force-update" fails"):> tools: fetch remote changesets when force refetching/resetting qemu
Applied, thanks.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel