From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWHRl-0005sL-GK for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:16:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWHRg-0005rv-LF for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:16:29 -0400 Received: from [199.232.76.173] (port=39408 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWHRg-0005rp-7N for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:16:24 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:59952) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MWHRe-0005e3-Ks for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:16:22 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e6.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id n6TMJvPK002240 for ; Wed, 29 Jul 2009 18:19:57 -0400 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n6TMGI9S221792 for ; Wed, 29 Jul 2009 18:16:18 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n6TMGIDF024835 for ; Wed, 29 Jul 2009 18:16:18 -0400 Message-ID: <4A70CA30.6050309@us.ibm.com> Date: Wed, 29 Jul 2009 17:16:16 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> <1248893159-18785-3-git-send-email-aliguori@us.ibm.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [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: Juan Quintela Cc: Alex Graf , qemu-devel@nongnu.org, Avi Kivity Juan Quintela wrote: > Anthony Liguori wrote: > >> Signed-off-by: Anthony Liguori >> > > Hi > > If we are shuffling directories anyways, can we: > > >> + # 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)"; \ >> > ^^^^^^^^ > move this one to something like roms_precompiled/ or similar? > > At this point we are going to have: > > source bios in $TOP_LEVEL/roms/ > prebuilt bios in $TOP_LEVEL/pc-bios/ > compiled bios in $TOP_LEVEL// > pc-bios should go away as it's a misnomer. Long term, I think we want something like: $TOP_LEVEL/roms $TOP_LEVEL/roms/shipped $TOP_LEVEL/roms/src/$ROMNAME $TOP_LEVEL/roms/build/$BUILDNAME and pc-bios goes away. But there are greater ramifications to this because -L /path/to/git/pc-bios no longer works. I think we probably need to think through a reorganization of /share/qemu or make -L smarter wrt the build system. Either way, I see this sort of reorganization a follow on to this series. I want to get this series in so we can start pulling in new roms like seabios. -- Regards, Anthony Liguori