| Message ID | 1232736095-26244-2-git-send-email-ehabkost@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Jan 23, 2009 at 04:41:33PM -0200, Eduardo Habkost wrote: > 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. Hi Eduardo, Can you send this one to qemu upstream please? Applied the other two. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jan 26, 2009 at 12:46:36PM -0200, Marcelo Tosatti wrote: > On Fri, Jan 23, 2009 at 04:41:33PM -0200, Eduardo Habkost wrote: > > 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. > > Hi Eduardo, > > Can you send this one to qemu upstream please? qemu upstream doesn't have the '[ -f "$file" ]' conditional, so the fix applies only to the kvm tree. Maybe we could have the conditional (after fixing it) on qemu upstream, but I am not sure about that.
On Mon, Jan 26, 2009 at 01:57:34PM -0200, Eduardo Habkost wrote: > qemu upstream doesn't have the '[ -f "$file" ]' conditional, so the fix > applies only to the kvm tree. > > Maybe we could have the conditional (after fixing it) on qemu upstream, > but I am not sure about that. Oh, sorry. Applied. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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(-)