From 368a721cfdc418228722fc6d7f5d9e7c6f908865 Mon Sep 17 00:00:00 2001
From: Mario Preksavec <mario@slackware.hr>
Date: Fri, 29 Jul 2016 00:37:50 +0200
Subject: system/xen: Additional features, patches and script fixes.

Signed-off-by: Mario Preksavec <mario@slackware.hr>
---
 system/xen/patches/disable_git_checkout.diff   | 44 --------------------------
 system/xen/patches/qemu_configure_options.diff |  4 +--
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 system/xen/patches/disable_git_checkout.diff

(limited to 'system/xen/patches')

diff --git a/system/xen/patches/disable_git_checkout.diff b/system/xen/patches/disable_git_checkout.diff
deleted file mode 100644
index 292a8ba569e96..0000000000000
--- a/system/xen/patches/disable_git_checkout.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- xen-4.6.1/tools/Makefile.orig	2016-02-09 15:44:19.000000000 +0100
-+++ xen-4.6.1/tools/Makefile	2016-02-20 20:22:38.659839628 +0100
-@@ -168,9 +168,9 @@
- 	set -ex; \
- 	if test -d $(QEMU_TRADITIONAL_LOC); then \
- 		mkdir -p qemu-xen-traditional-dir; \
--	else \
--		export GIT=$(GIT); \
--		$(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_TRADITIONAL_LOC) $(QEMU_TRADITIONAL_REVISION) qemu-xen-traditional-dir; \
-+#	else \
-+#		export GIT=$(GIT); \
-+#		$(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_TRADITIONAL_LOC) $(QEMU_TRADITIONAL_REVISION) qemu-xen-traditional-dir; \
- 	fi
- 
- .PHONY: qemu-xen-traditional-dir-force-update
-@@ -214,9 +214,9 @@
- qemu-xen-dir-find:
- 	if test -d $(QEMU_UPSTREAM_LOC) ; then \
- 		mkdir -p qemu-xen-dir; \
--	else \
--		export GIT=$(GIT); \
--		$(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_LOC) $(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \
-+#	else \
-+#		export GIT=$(GIT); \
-+#		$(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_LOC) $(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \
- 	fi
- 
- .PHONY: qemu-xen-dir-force-update
---- xen-4.6.1/tools/firmware/Makefile.orig	2016-02-09 15:44:19.000000000 +0100
-+++ xen-4.6.1/tools/firmware/Makefile	2016-02-20 20:23:33.994923068 +0100
-@@ -20,11 +20,11 @@
- LD32BIT-$(CONFIG_FreeBSD) := LD32BIT_FLAG=-melf_i386_fbsd
- 
- ovmf-dir:
--	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir
-+#	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir
- 	cp ovmf-makefile ovmf-dir/Makefile;
- 
- seabios-dir:
--	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
-+#	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
- 	$(MAKE) -C seabios-dir defconfig
- 
- .PHONY: all
diff --git a/system/xen/patches/qemu_configure_options.diff b/system/xen/patches/qemu_configure_options.diff
index f15cd5bfa7877..747ffadbf6b3f 100644
--- a/system/xen/patches/qemu_configure_options.diff
+++ b/system/xen/patches/qemu_configure_options.diff
@@ -5,8 +5,8 @@
  		--disable-guest-agent \
  		--python=$(PYTHON) \
 +		--sysconfdir=/etc \
-+		--@@LIBSSH2@@able-libssh2 \
-+		--@@BLUEZ@@able-bluez \
++		--@@CONF_LIBSSH2@@able-libssh2 \
++		--@@CONF_BLUEZ@@able-bluez \
  		$(CONFIG_QEMUU_EXTRA_ARGS) \
  		--cpu=$(IOEMU_CPU_ARCH) \
  		$(IOEMU_CONFIGURE_CROSS); \
-- 
cgit v1.2.3