Skip to content

Commit b0d6207

Browse files
committed
kbuild: clean .tmp_* pattern by make clean
Change the "make clean" rule to remove all the .tmp_* files. .tmp_objdiff is the only exception, which should be removed by "make mrproper". Rename the record directory of objdiff, .tmp_objdiff to .objdiff to avoid the removal by "make clean". Signed-off-by: Masahiro Yamada <[email protected]> Tested-by: Sedat Dilek <[email protected]> # LLVM-14 (x86-64)
1 parent a78b6af commit b0d6207

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,7 +1490,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers modules-only.symvers \
14901490

14911491
# Directories & files removed with 'make mrproper'
14921492
MRPROPER_FILES += include/config include/generated \
1493-
arch/$(SRCARCH)/include/generated .tmp_objdiff \
1493+
arch/$(SRCARCH)/include/generated .objdiff \
14941494
debian snap tar-install \
14951495
.config .config.old .version \
14961496
Module.symvers \
@@ -1857,7 +1857,7 @@ clean: $(clean-dirs)
18571857
-o -name '*.lex.c' -o -name '*.tab.[ch]' \
18581858
-o -name '*.asn1.[ch]' \
18591859
-o -name '*.symtypes' -o -name 'modules.order' \
1860-
-o -name '.tmp_*.o.*' \
1860+
-o -name '.tmp_*' \
18611861
-o -name '*.c.[012]*.*' \
18621862
-o -name '*.ll' \
18631863
-o -name '*.gcno' \

scripts/link-vmlinux.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,6 @@ sorttable()
303303
cleanup()
304304
{
305305
rm -f .btf.*
306-
rm -f .tmp_System.map
307-
rm -f .tmp_initcalls.lds
308-
rm -f .tmp_vmlinux*
309306
rm -f System.map
310307
rm -f vmlinux
311308
rm -f vmlinux.map

scripts/objdiff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
# $ ./scripts/objdiff diff COMMIT_A COMMIT_B
2121
# $
2222

23-
# And to clean up (everything is in .tmp_objdiff/*)
23+
# And to clean up (everything is in .objdiff/*)
2424
# $ ./scripts/objdiff clean all
2525
#
26-
# Note: 'make mrproper' will also remove .tmp_objdiff
26+
# Note: 'make mrproper' will also remove .objdiff
2727

2828
SRCTREE=$(cd $(git rev-parse --show-toplevel 2>/dev/null); pwd)
2929

@@ -32,7 +32,7 @@ if [ -z "$SRCTREE" ]; then
3232
exit 1
3333
fi
3434

35-
TMPD=$SRCTREE/.tmp_objdiff
35+
TMPD=$SRCTREE/.objdiff
3636

3737
usage() {
3838
echo >&2 "Usage: $0 <command> <args>"

0 commit comments

Comments
 (0)