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 47c32e1fc56b31818a7e1d3b420b588d1225d24d..e244b7a2535c50f6eb3c6a0a39cfacc980c6ee49 100644 (file)
--- 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 46335f7ac1e6bf1907c85947e09ed142abd69431..78b965f4c79ddfb5648ba683e0f0968816f3bfb0 100644 (file)
--- 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