diff options
| author | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2011-09-14 11:38:13 +0100 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2011-09-14 11:38:13 +0100 |
| commit | dcbc297aea6a159f2f5fad5de84666f23c2d17ad (patch) | |
| tree | 3295980699da6f3ad181008469ea380a8f59ce69 /tools/firmware/Makefile | |
| parent | 2093b2b5db510fbfac4417326f8cbf16a2896abe (diff) | |
| download | xen-dcbc297aea6a159f2f5fad5de84666f23c2d17ad.tar.gz xen-dcbc297aea6a159f2f5fad5de84666f23c2d17ad.tar.bz2 xen-dcbc297aea6a159f2f5fad5de84666f23c2d17ad.zip | |
tools: Revert seabios and upstream qemu build changes
These have broken the build and it seems to be difficult to fix. So
we will revert the whole lot for now, and await corrected patch(es).
Revert "fix the build when CONFIG_QEMU is specified by the user"
Revert "tools: fix permissions of git-checkout.sh"
Revert "scripts/git-checkout.sh: Is not bash specific. Invoke with /bin/sh."
Revert "Clone and build Seabios by default"
Revert "Clone and build upstream Qemu by default"
Revert "Rename ioemu-dir as qemu-xen-traditional-dir"
Revert "Move the ioemu-dir-find shell script to an external file"
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/firmware/Makefile')
| -rw-r--r-- | tools/firmware/Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 1e8a4db03a..4b6d144134 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -6,18 +6,13 @@ TARGET := hvmloader/hvmloader INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS := -SUBDIRS += seabios-dir SUBDIRS += rombios SUBDIRS += vgabios SUBDIRS += etherboot SUBDIRS += hvmloader -seabios-dir: - $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir - cp seabios-config seabios-dir/.config; - .PHONY: all -all: seabios-dir +all: @set -e; if [ $$((`( bcc -v 2>&1 | grep version || echo 0.0.0 ) | cut -d' ' -f 3 | awk -F. '{ printf "0x%02x%02x%02x", $$1, $$2, $$3}'`)) -lt $$((0x00100e)) ] ; then \ echo "==========================================================================="; \ echo "Require dev86 rpm or bin86 & bcc debs version >= 0.16.14 to build firmware!"; \ @@ -40,7 +35,4 @@ clean: subdirs-clean distclean: subdirs-distclean subdir-distclean-etherboot: .phony - $(MAKE) -C etherboot distclean - -subdir-distclean-seabios-dir: .phony - rm -rf seabios-dir seabios-dir-remote + $(MAKE) -C etherboot distclean
\ No newline at end of file |