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

[xen staging] xen/build: Fix `make cscope` rune



commit fa3cc3ff3b7685dd6b930d1901d8de7be9527794
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Dec 16 02:38:57 2021 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Thu Dec 16 20:27:12 2021 +0000

    xen/build: Fix `make cscope` rune
    
    There are two problems, both in the all_sources definition.
    
    First, everything in arch/*/include gets double hits with cscope queries,
    because they end up getting listed twice in cscope.files.
    
    Drop the first `find` rune of the three, because it's redundant with the 
third
    rune following c/s 725381a5eab3 ("xen: move include/asm-* to
    arch/*/include/asm").
    
    Second, and this way for a long time:
    
      $ make cscope
      ( find arch/x86/include -name '*.h' -print; find include -name '*.h' 
-print;
      find xsm arch/x86 common drivers lib test -name '*.[chS]' -print ) >
      cscope.files
      cscope -k -b -q
      cscope: cannot find file arch/x86/efi/efi.h
      cscope: cannot find file arch/x86/efi/ebmalloc.c
      cscope: cannot find file arch/x86/efi/compat.c
      cscope: cannot find file arch/x86/efi/pe.c
      cscope: cannot find file arch/x86/efi/boot.c
      cscope: cannot find file arch/x86/efi/runtime.c
    
    This is caused by these being symlinks to common/efi.  Restrict all find 
runes
    to `-type f` to skip symlinks, because common/efi/*.c are already listed.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Reviewed-by: Volodymyr Babchuk <Volodymyr_Babchuk@xxxxxxxx>
---
 xen/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index 2ad7da7ad6..dc6bdc44c7 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -468,9 +468,8 @@ arch/$(TARGET_ARCH)/include/asm/asm-offsets.h: asm-offsets.s
 
 SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers lib test
 define all_sources
-    ( find arch/$(TARGET_ARCH)/include -name '*.h' -print; \
-      find include -name '*.h' -print; \
-      find $(SUBDIRS) -name '*.[chS]' -print )
+    ( find include -type f -name '*.h' -print; \
+      find $(SUBDIRS) -type f -name '*.[chS]' -print )
 endef
 
 define set_exuberant_flags
--
generated by git-patchbot for /home/xen/git/xen.git#staging



 


Rackspace

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