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

[Xen-devel] [PATCH v3] firmware/shim : filter output files during Xen tree setup

Exclude named output files from the Xen tree setup.

The linkfarm.stamp content will differ between top level "make"
and "make install" invocations, due to the introduction of these
output files that are produced during the "make" build.

Filter these out to prevent an unnecessary rebuild of the shim
during "make install", after "make" within a fresh source tree.

Excluded from consideration with this change: differences in stamp
content when performing incremental builds in an existing tree.

Signed-off-by: Christopher Clark <christopher.clark6@xxxxxxxxxxxxxx>
Changes in v3: added '.xen.efi.*' '.xen-syms.*' to the exclude list.

Tested with: Xen 4.10.1, 4.11.0 and staging,
Yocto poky, OpenEmbedded meta-openembedded, meta-virtualization
with binutils 2.3.0 with x86_64-pep target enabled.

 tools/firmware/xen-dir/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 84648c3..af789d0 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -11,6 +11,11 @@ D=xen-root
 LINK_DIRS=config xen
+# Files to exclude from the link farm
+EXCLUDE_FILES=xen xen.gz xen-syms xen-syms.map xen.efi xen.efi.map \
+              efi.lds xen.lds mkelf32 mkreloc \
+              '.xen.efi.*' '.xen-syms.*'
 DEP_DIRS=$(foreach i, $(LINK_DIRS), $(XEN_ROOT)/$(i))
 DEP_FILES=$(foreach i, $(LINK_FILES), $(XEN_ROOT)/$(i))
@@ -26,7 +31,8 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
        $(foreach d, $(LINK_DIRS), \
                (cd $(XEN_ROOT); \
                 find $(d) ! -type l -type f \
-                $(addprefix ! -name , '*.[isoa]' '.*.d' '.*.d2')) \
+                $(addprefix ! -name , '*.[isoa]' '.*.d' '.*.d2' \
+                                      $(EXCLUDE_FILES) )) \
                 >> linkfarm.stamp.tmp ; ) \
        $(foreach f, $(LINK_FILES), \
                echo $(f) >> linkfarm.stamp.tmp ;)

Xen-devel mailing list



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