From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWEAH-0005eo-8V for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWEAD-0005af-8x for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:12 -0400 Received: from [199.232.76.173] (port=34449 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWEAC-0005aO-7n for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:08 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:54937) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MWEAA-0003jl-IP for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:06 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e7.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id n6TIjicr010591 for ; Wed, 29 Jul 2009 14:45:44 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n6TIk3QZ253318 for ; Wed, 29 Jul 2009 14:46:03 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n6TIk3bu011748 for ; Wed, 29 Jul 2009 14:46:03 -0400 From: Anthony Liguori Date: Wed, 29 Jul 2009 13:45:55 -0500 Message-Id: <1248893159-18785-3-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> References: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Avi Kivity , Alex Graf Signed-off-by: Anthony Liguori --- 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