|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] build: rework "clean" to clean from the root dir
commit 17f5c115210c7674437691f42cdfaf14164efbb6
Author: Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Fri Feb 25 11:07:21 2022 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Feb 25 11:07:21 2022 +0100
build: rework "clean" to clean from the root dir
This will allow "clean" to work from an out-of-tree build when
it will be available.
Some of the file been removed in current "clean" target aren't added
to $(clean-files) because they are already listed in $(extra-) or
$(extra-y).
Also start to clean files listed in $(targets). This allows to clean
"common/config_data.S" and "xsm/flask/flask-policy.S" without
having to list them a second time.
Also clean files in "arch/x86/boot" from that directory by allowing
"clean" to descend into the subdir by adding "boot" into $(subdir-).
Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx> # XSM
Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
---
xen/Makefile | 24 ++++++++++++------------
xen/arch/arm/Makefile | 5 +----
xen/arch/x86/Makefile | 20 ++++++++++++--------
xen/arch/x86/boot/Makefile | 2 ++
xen/common/Makefile | 3 +--
xen/include/Makefile | 4 +---
xen/scripts/Kbuild.include | 4 ++--
xen/scripts/Makefile.clean | 14 +++++++++++---
xen/test/livepatch/Makefile | 4 +---
xen/xsm/flask/Makefile | 4 +---
10 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/xen/Makefile b/xen/Makefile
index 84774eaf05..133b382f86 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -409,18 +409,18 @@ _debug:
.PHONY: _clean
_clean:
- $(MAKE) $(clean) tools
- $(MAKE) $(clean) include
- $(MAKE) $(clean) common
- $(MAKE) $(clean) drivers
- $(MAKE) $(clean) lib
- $(MAKE) $(clean) xsm
- $(MAKE) $(clean) crypto
- $(MAKE) $(clean) arch/arm
- $(MAKE) $(clean) arch/riscv
- $(MAKE) $(clean) arch/x86
- $(MAKE) $(clean) test
- $(MAKE) $(clean) tools/kconfig
+ $(Q)$(MAKE) $(clean)=tools
+ $(Q)$(MAKE) $(clean)=include
+ $(Q)$(MAKE) $(clean)=common
+ $(Q)$(MAKE) $(clean)=drivers
+ $(Q)$(MAKE) $(clean)=lib
+ $(Q)$(MAKE) $(clean)=xsm
+ $(Q)$(MAKE) $(clean)=crypto
+ $(Q)$(MAKE) $(clean)=arch/arm
+ $(Q)$(MAKE) $(clean)=arch/riscv
+ $(Q)$(MAKE) $(clean)=arch/x86
+ $(Q)$(MAKE) $(clean)=test
+ $(Q)$(MAKE) $(clean)=tools/kconfig
find . \( -name "*.o" -o -name ".*.d" -o -name ".*.d2" \
-o -name ".*.o.tmp" -o -name "*~" -o -name "core" \
-o -name '*.lex.c' -o -name '*.tab.[ch]' \
diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 3ce5f1674f..cecfaf4f3c 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -116,7 +116,4 @@ $(obj)/xen.lds: $(src)/xen.lds.S FORCE
$(obj)/dtb.o: $(patsubst "%",%,$(CONFIG_DTB_FILE))
-.PHONY: clean
-clean::
- rm -f $(obj)/xen.lds
- rm -f $(BASEDIR)/.xen-syms.[0-9]*
+clean-files := $(objtree)/.xen-syms.[0-9]*
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index d083c5653b..79a6467b07 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -77,6 +77,9 @@ obj-$(CONFIG_COMPAT) += x86_64/platform_hypercall.o
obj-y += sysctl.o
endif
+# Allows "clean" to descend into boot/
+subdir- += boot
+
extra-y += asm-macros.i
extra-y += xen.lds
@@ -193,8 +196,8 @@ note_file :=
endif
note_file_option ?= $(note_file)
+extra-$(XEN_BUILD_PE) += efi.lds
ifeq ($(XEN_BUILD_PE),y)
-extra-y += efi.lds
$(TARGET).efi: $(BASEDIR)/prelink.o $(note_file) $(obj)/efi.lds
$(obj)/efi/relocs-dummy.o $(obj)/efi/mkreloc
ifeq ($(CONFIG_DEBUG_INFO),y)
$(if $(filter --strip-debug,$(EFI_LDFLAGS)),echo,:) "Will strip debug
info from $(@F)"
@@ -262,10 +265,11 @@ $(obj)/boot/mkelf32: $(src)/boot/mkelf32.c
$(obj)/efi/mkreloc: $(src)/efi/mkreloc.c
$(HOSTCC) $(HOSTCFLAGS) -g -o $@ $<
-.PHONY: clean
-clean::
- rm -f *.lds boot/mkelf32
- rm -f asm-macros.i $(BASEDIR)/arch/x86/include/asm/asm-macros.*
- rm -f $(BASEDIR)/.xen-syms.[0-9]* $(BASEDIR)/.xen.elf32
- rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.efi efi/mkreloc
- rm -f boot/cmdline.S boot/reloc.S boot/*.lnk boot/*.bin
+clean-files := \
+ boot/mkelf32 \
+ include/asm/asm-macros.* \
+ $(objtree)/.xen-syms.[0-9]* \
+ $(objtree)/.xen.elf32 \
+ $(objtree)/.xen.efi.[0-9]* \
+ efi/*.efi \
+ efi/mkreloc
diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile
index ba732e4a88..1ac8cb435e 100644
--- a/xen/arch/x86/boot/Makefile
+++ b/xen/arch/x86/boot/Makefile
@@ -21,3 +21,5 @@ $(obj)/cmdline.S: $(src)/cmdline.c $(CMDLINE_DEPS)
$(src)/build32.lds
$(obj)/reloc.S: $(src)/reloc.c $(RELOC_DEPS) $(src)/build32.lds
$(MAKE) -f $(abs_srctree)/$(src)/build32.mk -C $(obj) $(@F)
RELOC_DEPS="$(RELOC_DEPS)"
+
+clean-files := cmdline.S reloc.S *.lnk *.bin
diff --git a/xen/common/Makefile b/xen/common/Makefile
index ca839118e4..dc8d3a13f5 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -84,5 +84,4 @@ $(obj)/config_data.S: $(BASEDIR)/tools/binfile FORCE
$(call if_changed,binfile,$(obj)/config.gz xen_config_data)
targets += config_data.S
-clean::
- rm -f config_data.S config.gz 2>/dev/null
+clean-files := config.gz
diff --git a/xen/include/Makefile b/xen/include/Makefile
index cd40d5b4c9..a3c2511f5f 100644
--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -131,6 +131,4 @@ lib-x86-all:
all: lib-x86-all
endif
-clean::
- rm -rf compat config generated headers*.chk
- rm -f $(BASEDIR)/include/xen/lib/x86/cpuid-autogen.h
+clean-files := compat config generated headers*.chk xen/lib/x86/cpuid-autogen.h
diff --git a/xen/scripts/Kbuild.include b/xen/scripts/Kbuild.include
index ed48fb39f1..6e7a403b35 100644
--- a/xen/scripts/Kbuild.include
+++ b/xen/scripts/Kbuild.include
@@ -99,8 +99,8 @@ build := -f $(srctree)/Rules.mk obj
# Shorthand for $(MAKE) clean
# Usage:
-# $(MAKE) $(clean) dir
-clean := -f $(BASEDIR)/scripts/Makefile.clean clean -C
+# $(Q)$(MAKE) $(clean)=dir
+clean := -f $(srctree)/scripts/Makefile.clean obj
# echo command.
# Short version is used, if $(quiet) equals `quiet_', otherwise full one.
diff --git a/xen/scripts/Makefile.clean b/xen/scripts/Makefile.clean
index c2689d4af5..4eed319745 100644
--- a/xen/scripts/Makefile.clean
+++ b/xen/scripts/Makefile.clean
@@ -3,7 +3,6 @@
# Cleaning up
# ==========================================================================
-obj := .
src := $(obj)
clean::
@@ -17,11 +16,20 @@ include $(src)/Makefile
subdir-all := $(subdir-y) $(subdir-n) $(subdir-) \
$(patsubst %/,%, $(filter %/, $(obj-y) $(obj-n) $(obj-)))
+subdir-all := $(addprefix $(obj)/,$(subdir-all))
+
__clean-files := \
$(clean-files) $(hostprogs-y) $(hostprogs-) \
+ $(extra-y) $(extra-) $(targets) \
$(hostprogs-always-y) $(hostprogs-always-)
-__clean-files := $(wildcard $(__clean-files))
+# clean-files is given relative to the current directory, unless it
+# starts with $(objtree)/ (which means "./", so do not add "./" unless
+# you want to delete a file from the toplevel object directory).
+
+__clean-files := $(wildcard \
+ $(addprefix $(obj)/, $(filter-out /% $(objtree)/%,
$(__clean-files))) \
+ $(filter /% $(objtree)/%, $(__clean-files)))
.PHONY: clean
clean:: $(subdir-all)
@@ -35,6 +43,6 @@ endif
PHONY += $(subdir-all)
$(subdir-all):
- $(MAKE) $(clean) $@
+ $(Q)$(MAKE) $(clean)=$@
.PHONY: $(PHONY)
diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile
index adb484dc5d..e6fee84b69 100644
--- a/xen/test/livepatch/Makefile
+++ b/xen/test/livepatch/Makefile
@@ -160,6 +160,4 @@ install: $(addprefix $(obj)/,$(LIVEPATCHES))
uninstall:
cd $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) && rm -f $(LIVEPATCHES)
-.PHONY: clean
-clean::
- rm -f *.livepatch config.h expect_config.h
+clean-files := config.h expect_config.h
diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile
index 832f65274c..4ac6fb8778 100644
--- a/xen/xsm/flask/Makefile
+++ b/xen/xsm/flask/Makefile
@@ -49,6 +49,4 @@ $(obj)/policy.bin: FORCE
FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) POLICY_FILENAME=$(POLICY_SRC)
cmp -s $(POLICY_SRC) $@ || cp $(POLICY_SRC) $@
-.PHONY: clean
-clean::
- rm -f $(ALL_H_FILES) policy.* $(POLICY_SRC) flask-policy.S
+clean-files := policy.* $(POLICY_SRC)
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |