public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Eduardo Habkost <ehabkost@redhat.com>
To: Avi Kivity <avi@redhat.com>
Cc: kvm@vger.kernel.org, Eduardo Habkost <ehabkost@redhat.com>
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	[thread overview]
Message-ID: <1232736095-26244-2-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1232736095-26244-1-git-send-email-ehabkost@redhat.com>

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 <ehabkost@redhat.com>
---
 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
-- 
1.6.1


  reply	other threads:[~2009-01-23 18:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-23 18:41 [PATCH 0/3] kvm-userspace build and compat fixes Eduardo Habkost
2009-01-23 18:41 ` Eduardo Habkost [this message]
2009-01-26 14:46   ` [PATCH 1/3] kvm: qemu: don't fail building when pc-bios dir is empty Marcelo Tosatti
2009-01-26 15:57     ` Eduardo Habkost
2009-01-26 16:12       ` Marcelo Tosatti
2009-01-23 18:41 ` [PATCH 2/3] Use native anon_inodes on RHEL5 if available Eduardo Habkost
2009-01-23 18:41 ` [PATCH 3/3] compat code fixes for RHEL5 kernels Eduardo Habkost

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1232736095-26244-2-git-send-email-ehabkost@redhat.com \
    --to=ehabkost@redhat.com \
    --cc=avi@redhat.com \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox