From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: Re: [PATCH] tools/vtpm: fix version.h error during
 parallel build
Date: Mon, 23 Jul 2012 19:12:01 +0200
Message-ID: <20120723171201.GA4555@aepfle.de>
References: <51506c407f3ef3e238a4.1342105720@probook.site>
	<20493.33251.292891.101019@mariner.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <20493.33251.292891.101019@mariner.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 Jackson <Ian.Jackson@eu.citrix.com>
Cc: xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

On Mon, Jul 23, Ian Jackson wrote:

> Olaf Hering writes ("[Xen-devel] [PATCH] tools/vtpm: fix version.h error during parallel build"):
> > tools/vtpm: fix version.h error during parallel build
> > 
> > Generating the tpm_version.h is not make -j safe:
> 
> Thanks for tracking this down.  However, wouldn't it be possible to
> fix this entirely in our Makefile, somehow ?  The patch to the
> upstream Makefile risks getting conflicts in the future with changes
> to the upstream code.

The build_sub rule in tools/vtpm/Makefile could be changed to 
$(MAKE) -C $(VTPM_DIR) version && $(MAKE) -C $(VTPM_DIR) all-recursive; \

And the install rule in that Makefile perhaps to 
$(MAKE) -C $(VTPM_DIR) install-recursive

I will see how that works, the failure happens rarely.

Olaf