From mboxrd@z Thu Jan  1 00:00:00 1970
From: George Dunlap <george.dunlap@eu.citrix.com>
Subject: Re: [PATCH 1/2] make: Check
 tools/qemu-xen[-traditional] for qemu before downloading
Date: Thu, 3 Jul 2014 10:04:06 +0100
Message-ID: <53B51C86.20502@eu.citrix.com>
References: <1404317712-4191-1-git-send-email-george.dunlap@eu.citrix.com>
	<1404375913.11440.6.camel@kazak.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1404375913.11440.6.camel@kazak.uk.xensource.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@citrix.com>, Jan Beulich <jbeulich@suse.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

On 07/03/2014 09:25 AM, Ian Campbell wrote:
> On Wed, 2014-07-02 at 17:15 +0100, George Dunlap wrote:
>> Currently xen, qemu-xen, and qemu-xen-traditional are kept in separate
>> repositories, but when we release them as a tarball, qemu-xen and
>> qemu-xen-traditional are in-lined into the tools/ directory.
>>
>> In order to make this "just work", at the moment developer doing the
>> release manually modifies Config.mk as part of the relase process so
>> that CONFIG_QEMU and QEMU_UPSTREAM_URL point into the tools/ directory
>> instead.
> Since this mainly means Ian I'll mostly leave both of these patches to
> him.
>
>> +# Specify which qemu-dm to use. This may be `ioemu' to use the old
>> +# Mercurial in-tree version, or a local directory, or a git URL.
>> +# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
>> +ifneq (,$(wildcard $(XEN_ROOT)/tools/qemu-xen-traditional))
>> +CONFIG_QEMU ?= $(XEN_ROOT)/tools/qemu-xen-traditional
>> +else
>> +CONFIG_QEMU ?= $(QEMU_REMOTE)
>> +endif
> Does this DTRT on subsequent runs after the automatic git clone has
> happened on the first run? I suspect so, but I'm not 100% sure. f.e.
> does "make tools/qemu-xen-traditional-dir-force-update" still work?

Yes, all that still works, because the directories it creates when 
automatically cloning the qemu repos are named differently 
(qemu-xen[-traditional]-dir[-remote]).

  -George