From: George Dunlap <george.dunlap@citrix.com>
Date: Wed, 13 Dec 2017 16:54:08 +0000 (+0000)
Subject: firmware/xen-shim: Make a new copy of the xen tree to avoid dependencies
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c55dd9f41b2fa29d62e97c6b43e43a94a718e8d2;p=people%2Fiwj%2Fxen.git

firmware/xen-shim: Make a new copy of the xen tree to avoid dependencies

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 47c32e1fc5..e244b7a253 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -5,14 +5,24 @@ all: xen-shim
 .PHONY: FORCE
 FORCE:
 
+D=xen-root
+
+# Copy enough of the tree to build the shim hypervisor
+$(D):
+	mkdir -p $D
+	cp -rs $(XEN_ROOT)/xen $(D)
+	cp -s $(XEN_ROOT)/Config.mk $(D)
+	cp -rs $(XEN_ROOT)/config $(D)
+	$(MAKE) -C $(D)/xen distclean
+
 .PHONY: shim-%config
-shim-%config: FORCE
-	$(MAKE) -C $(XEN_ROOT)/xen $*config \
+shim-%config: $(D) FORCE
+	$(MAKE) -C $(D)/xen $*config \
 		XEN_CONFIG_EXPERT=y \
 		KCONFIG_CONFIG=$(CURDIR)/shim.config
 
-xen-shim: shim-olddefconfig
-	$(MAKE) -C $(XEN_ROOT)/xen install-shim \
+xen-shim: $(D) shim-olddefconfig
+	$(MAKE) -C $(D)/xen install-shim \
 		XEN_CONFIG_EXPERT=y \
 		KCONFIG_CONFIG=$(CURDIR)/shim.config \
 		DESTDIR=$(CURDIR)
@@ -20,3 +30,4 @@ xen-shim: shim-olddefconfig
 .PHONY: distclean clean
 distclean clean:
 	rm -f xen-shim *.old
+	rm -rf $(D)
diff --git a/tools/firmware/xen-dir/shim.config b/tools/firmware/xen-dir/shim.config
index 46335f7ac1..78b965f4c7 100644
--- a/tools/firmware/xen-dir/shim.config
+++ b/tools/firmware/xen-dir/shim.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Xen/x86 4.11.0-unstable Configuration
+# Xen/x86 4.11-unstable Configuration
 #
 CONFIG_X86_64=y
 CONFIG_X86=y