From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Nick Desaulniers <ndesaulniers@google.com>,
linux-kernel@vger.kernel.org,
Josh Poimboeuf <jpoimboe@redhat.com>,
Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>
Subject: [PATCH 2/4] kbuild: clean .tmp_* pattern by make clean
Date: Sun, 29 May 2022 00:47:02 +0900 [thread overview]
Message-ID: <20220528154704.2576290-2-masahiroy@kernel.org> (raw)
In-Reply-To: <20220528154704.2576290-1-masahiroy@kernel.org>
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 <masahiroy@kernel.org>
---
Makefile | 4 ++--
scripts/link-vmlinux.sh | 3 ---
scripts/objdiff | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index edc3f44cd96c..7011d43dff35 100644
--- a/Makefile
+++ b/Makefile
@@ -1490,7 +1490,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers modules-only.symvers \
# Directories & files removed with 'make mrproper'
MRPROPER_FILES += include/config include/generated \
- arch/$(SRCARCH)/include/generated .tmp_objdiff \
+ arch/$(SRCARCH)/include/generated .objdiff \
debian snap tar-install \
.config .config.old .version \
Module.symvers \
@@ -1857,7 +1857,7 @@ clean: $(clean-dirs)
-o -name '*.lex.c' -o -name '*.tab.[ch]' \
-o -name '*.asn1.[ch]' \
-o -name '*.symtypes' -o -name 'modules.order' \
- -o -name '.tmp_*.o.*' \
+ -o -name '.tmp_*' \
-o -name '*.c.[012]*.*' \
-o -name '*.ll' \
-o -name '*.gcno' \
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 844fc0125d72..b593cb1a8137 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -303,9 +303,6 @@ sorttable()
cleanup()
{
rm -f .btf.*
- rm -f .tmp_System.map
- rm -f .tmp_initcalls.lds
- rm -f .tmp_vmlinux*
rm -f System.map
rm -f vmlinux
rm -f vmlinux.map
diff --git a/scripts/objdiff b/scripts/objdiff
index 72b0b63c3fe1..68b8d74e5c6f 100755
--- a/scripts/objdiff
+++ b/scripts/objdiff
@@ -32,7 +32,7 @@ if [ -z "$SRCTREE" ]; then
exit 1
fi
-TMPD=$SRCTREE/.tmp_objdiff
+TMPD=$SRCTREE/.objdiff
usage() {
echo >&2 "Usage: $0 <command> <args>"
--
2.32.0
next prev parent reply other threads:[~2022-05-28 15:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-28 15:47 [PATCH 1/4] kbuild: remove redundant cleanups in scripts/link-vmlinux.sh Masahiro Yamada
2022-05-28 15:47 ` Masahiro Yamada [this message]
2022-05-29 14:40 ` [PATCH 2/4] kbuild: clean .tmp_* pattern by make clean Sedat Dilek
2022-05-29 17:32 ` Masahiro Yamada
2022-05-30 9:34 ` Sedat Dilek
2022-06-01 19:49 ` Nicolas Schier
2022-06-03 13:22 ` Masahiro Yamada
2022-05-28 15:47 ` [PATCH 3/4] kbuild: move vmlinux.o link to scripts/Makefile.vmlinux_o Masahiro Yamada
2022-05-29 14:42 ` Sedat Dilek
2022-05-28 15:47 ` [PATCH 4/4] kbuild: factor out the common objtool arguments Masahiro Yamada
2022-05-29 14:46 ` Sedat Dilek
2022-05-29 17:34 ` Masahiro Yamada
2022-05-30 9:36 ` Sedat Dilek
2022-05-29 14:37 ` [PATCH 1/4] kbuild: remove redundant cleanups in scripts/link-vmlinux.sh Sedat Dilek
2022-05-29 17:30 ` Masahiro Yamada
2022-05-30 9:33 ` Sedat Dilek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220528154704.2576290-2-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=ndesaulniers@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.