[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] If we built a rom, install it. Otherwise, use
From: |
Anthony Liguori |
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 |
Signed-off-by: Anthony Liguori <address@hidden>
---
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
- [Qemu-devel] [PATCH 1/7] Rename pc-bios/optionrom -> roms/multiboot, Anthony Liguori, 2009/07/29
- [Qemu-devel] [PATCH 5/7] Add proper headers to all BIOS patches, Anthony Liguori, 2009/07/29
- [Qemu-devel] [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy.,
Anthony Liguori <=
- Message not available
- [Qemu-devel] Re: [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy., Anthony Liguori, 2009/07/29
- [Qemu-devel] Re: [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy., Avi Kivity, 2009/07/30
- [Qemu-devel] Re: [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy., Alexander Graf, 2009/07/30
- [Qemu-devel] Re: [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy., Avi Kivity, 2009/07/30
- [Qemu-devel] Re: [PATCH 3/7] If we built a rom, install it. Otherwise, use shipped copy., Alexander Graf, 2009/07/30
[Qemu-devel] [PATCH 2/7] Always build roms in a separate directory, Anthony Liguori, 2009/07/29
[Qemu-devel] [PATCH 4/7] Allow a cross compiler to be used for rom builds, Anthony Liguori, 2009/07/29
[Qemu-devel] [PATCH 6/7] Add pc-bios as a git submodule, Anthony Liguori, 2009/07/29