[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH v2] shim: don't let build modify shim.config

Currently building the shim will modify shim.config in case some config
option was added or modified in the hypervisor.

Avoid that by copying shim.config to an intermediate file instead.

Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
Not sure whether its worth to take that for 4.11.
In case the maintainers think it should be part of 4.11 then LGTM.
A followup patch should reduce the config options specified in
 tools/firmware/xen-dir/Makefile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index a7e69ae777..99e1139864 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -41,16 +41,14 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
 $(D): linkfarm.stamp
        $(MAKE) -C $(D)/xen distclean
-.PHONY: shim-%config
-shim-%config: $(D) FORCE
-       $(MAKE) -C $(D)/xen $*config \
-               XEN_CONFIG_EXPERT=y \
-               KCONFIG_CONFIG=$(CURDIR)/shim.config
+$(D)/xen/.config: shim.config $(D)
+       cp $< $@
+       $(MAKE) -C $(D)/xen olddefconfig \
+               XEN_CONFIG_EXPERT=y
-xen-shim: $(D) shim-olddefconfig
+xen-shim: $(D) $(D)/xen/.config
        $(MAKE) -C $(D)/xen build \
-               XEN_CONFIG_EXPERT=y \
-               KCONFIG_CONFIG=$(CURDIR)/shim.config
+               XEN_CONFIG_EXPERT=y
        ln -sf $(D)/xen/xen $@
        ln -sf $(D)/xen/xen-syms $@-syms

Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.