From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [kvm-unit-tests PATCH 2/6] mkstandalone: fix generation for arm Date: Tue, 26 Jan 2016 12:01:17 +0100 Message-ID: <56A751FD.6040106@redhat.com> References: <1453474709-10679-1-git-send-email-drjones@redhat.com> <1453474709-10679-3-git-send-email-drjones@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: rkrcmar@redhat.com To: Andrew Jones , kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:57959 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756725AbcAZLBY (ORCPT ); Tue, 26 Jan 2016 06:01:24 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id C419BC0AC928 for ; Tue, 26 Jan 2016 11:01:24 +0000 (UTC) In-Reply-To: <1453474709-10679-3-git-send-email-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 22/01/2016 15:58, Andrew Jones wrote: > The mkstandalone rewrite now packages the architecture run scripts. > This brings many benefits, but at the cost of no longer being able > to source additional files from the run script, at least not while > in standalone mode. We can live with that, but arm/run was sourcing > config.mak, so we need to stop that in standalone mode, as well as > to provide the standalone arm/run script what it needs. > > Signed-off-by: Andrew Jones > --- > arm/run | 10 ++++++---- > scripts/mkstandalone.sh | 11 ++++++++++- > 2 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/arm/run b/arm/run > index 4a648697d7fb5..0158ca5649a9f 100755 > --- a/arm/run > +++ b/arm/run > @@ -1,10 +1,12 @@ > #!/bin/bash > > -if [ ! -f config.mak ]; then > - echo run ./configure first. See ./configure -h > - exit 2 > +if [ -z "$STANDALONE" ]; then What do you think about checking: if [ "${ARCH:+set}" != set ]; then instead? Paolo > + if [ ! -f config.mak ]; then > + echo "run ./configure && make first. See ./configure -h" > + exit 2 > + fi > + source config.mak > fi > -source config.mak > processor="$PROCESSOR" >