From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L5j3Q-0005Fy-O4 for qemu-devel@nongnu.org; Thu, 27 Nov 2008 10:45:20 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L5j3P-0005F8-VZ for qemu-devel@nongnu.org; Thu, 27 Nov 2008 10:45:19 -0500 Received: from [199.232.76.173] (port=37318 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L5j3P-0005F1-K9 for qemu-devel@nongnu.org; Thu, 27 Nov 2008 10:45:19 -0500 Received: from savannah.gnu.org ([199.232.41.3]:39813 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L5j3P-0001im-5D for qemu-devel@nongnu.org; Thu, 27 Nov 2008 10:45:19 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L5j3O-0005yD-AE for qemu-devel@nongnu.org; Thu, 27 Nov 2008 15:45:18 +0000 Received: from ths by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L5j3N-0005y9-RX for qemu-devel@nongnu.org; Thu, 27 Nov 2008 15:45:18 +0000 MIME-Version: 1.0 Errors-To: ths Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Thiemo Seufer Message-Id: Date: Thu, 27 Nov 2008 15:45:17 +0000 Subject: [Qemu-devel] [5800] Make installing bios files optional. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5800 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5800 Author: ths Date: 2008-11-27 15:45:16 +0000 (Thu, 27 Nov 2008) Log Message: ----------- Make installing bios files optional. Signed-off-by: Riku Voipio Modified Paths: -------------- trunk/Makefile trunk/configure Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2008-11-25 22:13:57 UTC (rev 5799) +++ trunk/Makefile 2008-11-27 15:45:16 UTC (rev 5800) @@ -221,6 +221,14 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr +ifdef INSTALL_BLOBS +BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ +video.x openbios-sparc32 openbios-sparc64 pxe-ne2k_pci.bin \ +pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin +else +BLOBS= +endif + install-doc: $(DOCS) mkdir -p "$(DESTDIR)$(docdir)" $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" @@ -236,12 +244,12 @@ ifneq ($(TOOLS),) $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" endif +ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" - set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ - video.x openbios-sparc32 openbios-sparc64 pxe-ne2k_pci.bin \ - pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin; do \ + set -e; for x in $(BLOBS); do \ $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ done +endif ifndef CONFIG_WIN32 mkdir -p "$(DESTDIR)$(datadir)/keymaps" set -e; for x in $(KEYMAPS); do \ Modified: trunk/configure =================================================================== --- trunk/configure 2008-11-25 22:13:57 UTC (rev 5799) +++ trunk/configure 2008-11-27 15:45:16 UTC (rev 5800) @@ -118,6 +118,7 @@ kvm="yes" kerneldir="" aix="no" +blobs="yes" # OS specific targetos=`uname -s` @@ -372,6 +373,8 @@ ;; --disable-aio) aio="no" ;; + --disable-blobs) blobs="no" + ;; --kerneldir=*) kerneldir="$optarg" ;; *) echo "ERROR: unknown option $opt"; show_help="yes" @@ -483,6 +486,7 @@ echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9" echo " --disable-vde disable support for vde network" echo " --disable-aio disable AIO support" +echo " --disable-blobs disable installing provided firmware blobs" echo " --kerneldir=PATH look for kernel includes in PATH" echo "" echo "NOTE: The object files are built at the place where configure is launched" @@ -1083,6 +1087,7 @@ echo "NPTL support $nptl" echo "vde support $vde" echo "AIO support $aio" +echo "Install blobs $blobs" echo "KVM support $kvm" if test $sdl_too_old = "yes"; then @@ -1357,6 +1362,9 @@ echo "#define CONFIG_AIO 1" >> $config_h echo "CONFIG_AIO=yes" >> $config_mak fi +if test "$blobs" = "yes" ; then + echo "INSTALL_BLOBS=yes" >> $config_mak +fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then