From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [PATCH v2 4/4] Clone and build Seabios by default
Date: Thu, 8 Sep 2011 11:00:22 -0700
Message-ID: <1315504825.3180.51.camel@cthulhu.hellion.org.uk>
References: <1315504038-21733-1-git-send-email-stefano.stabellini@eu.citrix.com>
	<1315504038-21733-4-git-send-email-stefano.stabellini@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <1315504038-21733-4-git-send-email-stefano.stabellini@eu.citrix.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "stefano.stabellini@eu.citrix.com" <stefano.stabellini@eu.citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, "keir@xen.org" <keir@xen.org>
List-Id: xen-devel@lists.xenproject.org

On Thu, 2011-09-08 at 13:47 -0400, stefano.stabellini@eu.citrix.com
wrote:
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> 
> diff -r ef27b472d4f3 Config.mk
> --- a/Config.mk	Thu Sep 08 17:19:12 2011 +0000
> +++ b/Config.mk	Thu Sep 08 17:29:50 2011 +0000
> @@ -195,6 +195,8 @@ endif
>  # Only available through the git protocol at the moment
>  QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/people/sstabellini/qemu-dm.git
>  QEMU_UPSTREAM_TAG ?= origin/xen-stable-0.15
> +SEABIOS_UPSTREAM_URL=git://git.qemu.org/seabios.git
> +SEABIOS_UPSTREAM_TAG ?= 7fc039e9c262b4199fab497f3e12f4e425c37560

I guess we should have a default tree on xenbits for this?

[...] 
> +$(SEABIOS_DIR):
> +	set -ex; \
> +	if [ ! -d seabios-remote ]; then \
> +		rm -rf seabios-remote seabios-remote.tmp; \
> +		mkdir seabios-remote.tmp; rmdir seabios-remote.tmp; \
> +		$(GIT) clone $(SEABIOS_UPSTREAM_URL) seabios-remote.tmp; \
> +		if [ "$(SEABIOS_UPSTREAM_TAG)" ]; then			\
> +			cd seabios-remote.tmp;			\
> +			$(GIT) branch -D dummy >/dev/null 2>&1 ||:; \
> +			$(GIT) checkout -b dummy $(SEABIOS_UPSTREAM_TAG);	\
> +			cd ..;					\
> +		fi;						\
> +		mv seabios-remote.tmp seabios-remote; \
> +	fi; \
> +	rm -f seabios-dir; \
> +	ln -sf seabios-remote seabios-dir; \
> +	cp seabios-config seabios-dir/.config;

This looks a lot like the qemu stuff which you only just moved into its
own script. Can we not share it?

> diff -r ef27b472d4f3 tools/firmware/hvmloader/Makefile
> --- a/tools/firmware/hvmloader/Makefile	Thu Sep 08 17:19:12 2011 +0000
> +++ b/tools/firmware/hvmloader/Makefile	Thu Sep 08 17:29:50 2011 +0000
> @@ -47,7 +47,7 @@ endif
>  ifneq ($(SEABIOS_DIR),)
>  OBJS += seabios.o
>  CFLAGS += -DENABLE_SEABIOS
> -SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin
> +SEABIOS_ROM := ../$(SEABIOS_DIR)/out/bios.bin
>  endif
>  
>  STDVGA_ROM    := ../vgabios/VGABIOS-lgpl-latest.bin