qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>,
	Avi Kivity <avi@redhat.com>, Alex Graf <agraf@suse.de>
Subject: [Qemu-devel] [PATCH 3/7] If we built a rom, install it.  Otherwise, use shipped copy.
Date: Wed, 29 Jul 2009 13:45:55 -0500	[thread overview]
Message-ID: <1248893159-18785-3-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 Makefile |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 059696a..4f06ec1 100644
--- a/Makefile
+++ b/Makefile
@@ -242,8 +242,7 @@ ifdef INSTALL_BLOBS
 BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
 video.x openbios-sparc32 openbios-sparc64 openbios-ppc \
 pxe-ne2k_pci.bin pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin \
-bamboo.dtb petalogix-s3adsp1800.dtb \
-multiboot.bin
+bamboo.dtb petalogix-s3adsp1800.dtb
 else
 BLOBS=
 endif
@@ -274,6 +273,20 @@ ifneq ($(BLOBS),)
 		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
 	done
 endif
+        # FIXME: this is terrible
+	for rom in multiboot; do \
+	  case $$rom in \
+	    multiboot) srcbin=multiboot.bin ;; \
+	  esac; \
+	  if test -z "$$dstbin" ; then \
+	    dstbin=$$srcbin ; \
+	  fi; \
+	  if test -e pc-bios/$$rom/$$srcbin ; then \
+	    $(INSTALL_DATA) pc-bios/$$rom/$$srcbin "$(DESTDIR)$(datadir)/$$dstbin"; \
+	  else \
+	    $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$dstbin "$(DESTDIR)$(datadir)"; \
+	  fi; \
+	done
 	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
 	set -e; for x in $(KEYMAPS); do \
 		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
-- 
1.6.2.5

  parent reply	other threads:[~2009-07-29 18:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-29 18:45 [Qemu-devel] [PATCH 1/7] Rename pc-bios/optionrom -> roms/multiboot Anthony Liguori
2009-07-29 18:45 ` [Qemu-devel] [PATCH 2/7] Always build roms in a separate directory Anthony Liguori
2009-07-29 18:45 ` Anthony Liguori [this message]
     [not found]   ` <m37hxr46rt.fsf@neno.mitica>
2009-07-29 22:16     ` [Qemu-devel] Re: [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy Anthony Liguori
2009-07-30  9:34       ` Avi Kivity
2009-07-30  9:39         ` Alexander Graf
2009-07-30 10:07           ` Avi Kivity
2009-07-30 10:04             ` Alexander Graf
2009-07-29 18:45 ` [Qemu-devel] [PATCH 4/7] Allow a cross compiler to be used for rom builds Anthony Liguori
2009-07-29 18:45 ` [Qemu-devel] [PATCH 5/7] Add proper headers to all BIOS patches Anthony Liguori
2009-07-29 18:45 ` [Qemu-devel] [PATCH 6/7] Add pc-bios as a git submodule Anthony Liguori
2009-07-29 21:25   ` [Qemu-devel] " Alexander Graf
2009-07-29 21:40     ` Anthony Liguori
2009-07-29 21:51       ` Alexander Graf
2009-07-29 22:10   ` [Qemu-devel] " Jordan Justen
2009-07-29 22:13     ` Anthony Liguori
2009-07-29 18:45 ` [Qemu-devel] [PATCH 7/7] Remove BIOS patches from the queue and update the README Anthony Liguori
2009-07-30  9:38   ` [Qemu-devel] " Avi Kivity
     [not found] ` <m3eirz474o.fsf@neno.mitica>
2009-07-29 19:35   ` [Qemu-devel] Re: [PATCH 1/7] Rename pc-bios/optionrom -> roms/multiboot Anthony Liguori
2009-07-30  9:38   ` Avi Kivity

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=1248893159-18785-3-git-send-email-aliguori@us.ibm.com \
    --to=aliguori@us.ibm.com \
    --cc=agraf@suse.de \
    --cc=avi@redhat.com \
    --cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).