From patchwork Fri Jan 23 18:41:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 3815 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0NIbKks006493 for ; Fri, 23 Jan 2009 10:37:21 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754400AbZAWSl7 (ORCPT ); Fri, 23 Jan 2009 13:41:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755646AbZAWSl6 (ORCPT ); Fri, 23 Jan 2009 13:41:58 -0500 Received: from mx2.redhat.com ([66.187.237.31]:37027 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754400AbZAWSlz (ORCPT ); Fri, 23 Jan 2009 13:41:55 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n0NIfsXa007848 for ; Fri, 23 Jan 2009 13:41:54 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n0NIfsaL017192; Fri, 23 Jan 2009 13:41:54 -0500 Received: from blackpad.localdomain (vpn-10-13.bos.redhat.com [10.16.10.13]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n0NIfrP2010610; Fri, 23 Jan 2009 13:41:54 -0500 Received: by blackpad.localdomain (Postfix, from userid 500) id 6658E680674; Fri, 23 Jan 2009 16:41:35 -0200 (BRST) From: Eduardo Habkost To: Avi Kivity Cc: kvm@vger.kernel.org, Eduardo Habkost Subject: [PATCH 1/3] kvm: qemu: don't fail building when pc-bios dir is empty Date: Fri, 23 Jan 2009 16:41:33 -0200 Message-Id: <1232736095-26244-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1232736095-26244-1-git-send-email-ehabkost@redhat.com> References: <1232736095-26244-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The '[ -f "$file" ] && install' command will make the return code of the command to be non-zero, making 'make' abort. Use shell 'if' construct instead. This patch also applies to the maint/2.6.29 branch. Signed-off-by: Eduardo Habkost --- qemu/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemu/Makefile b/qemu/Makefile index 648b849..fe675a9 100644 --- a/qemu/Makefile +++ b/qemu/Makefile @@ -242,8 +242,9 @@ endif ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" set -e; for x in $(BLOBS); do \ - [ -f $(SRC_PATH)/pc-bios/$$x ] && \ - $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ + if [ -f $(SRC_PATH)/pc-bios/$$x ];then \ + $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ + fi \ done endif ifndef CONFIG_WIN32