From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH OSSTEST v3] ts-libvirt-build: use Osstest::BuildSupport::submodulefixup Date: Tue, 6 Jan 2015 13:54:43 +0000 Message-ID: <1420552483.28863.159.camel@citrix.com> References: <1420453074.17628.3.camel@citrix.com> <1420472211-3531-1-git-send-email-ian.campbell@citrix.com> <1420473183.28863.46.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1420473183.28863.46.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, Konrad Rzeszutek Wilk Cc: xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Mon, 2015-01-05 at 15:53 +0000, Ian Campbell wrote: > On Mon, 2015-01-05 at 15:36 +0000, Ian Campbell wrote: > > Instead of cloning gnulib manually which can break if upstream gnulib > > gets ahead of libvirt.git (which applies patches on the fly etc). By > > using submodulefixup we automatically DTRT and use the version of > > gnulib specified by the libvirt.git submodule metadata, but with a > > runvar override if necessary. > > > > This also removes a whole bunch of faffing in ap-*, cr-daily-branch > > and mfi-common to get the version of gnulib to use, which was always a > > bit of a wart (ungated for one thing...). > > > > We continue to use --no-git and GNULIB_SRCDIR because otherwise > > autogen.sh (via bootstrap) will force its own version, overwriting > > what submodulefixup has done. For this we need a way to get the hash > > representing the module, so introduce submodule_find (and rework > > submodule_have in terms of it). > > > > Tested in standalone mode with build-amd64-libvirt and > > build-amd64-rumpuserxen (because I touched submodule_have, AFAICT the > > bodges were not run). The libvirt build was tested both with the > > automatic revisions and with: > > revision_libvirt=2360fe5d24175835d3f5fd1c7e8e6e13addab629 > > revision_libvirt_gnulib=16518d9ed8f25d3e53931dd1aa343072933e4604 > > (used in successful libvirt flight 32648), in both cases confirming > > that the build used the desired versions. > > > > Signed-off-by: Ian Campbell > > Ian J acked on IRC so I have pushed to osstests' pretest branch. The flight which tested this had a couple of fails, but everything related to this change passed, so after consulting with Ian J I force pushed this changeset and killed all the inprogress jobs (none of which could have passed). Any new flights have a chance of passing again now. Ian.