From: "Joel Fernandes (Google)" <joel@joelfernandes.org>
To: linux-kernel@vger.kernel.org
Cc: "Joel Fernandes (Google)" <joel@joelfernandes.org>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Adrian Ratiu" <adrian.ratiu@collabora.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
atishp04@gmail.com, bpf@vger.kernel.org,
"Brendan Gregg" <bgregg@netflix.com>,
"Brendan Gregg" <brendan.d.gregg@gmail.com>,
dancol@google.com, "Daniel Borkmann" <daniel@iogearbox.net>,
"Dan Williams" <dan.j.williams@intel.com>,
dietmar.eggemann@arm.com, duyuchao <yuchao.du@unisoc.com>,
gregkh@linuxfoundation.org, "Guenter Roeck" <groeck@chromium.org>,
"Jonathan Corbet" <corbet@lwn.net>,
"Karim Yaghmour" <karim.yaghmour@opersys.com>,
"Kees Cook" <keescook@chromium.org>,
kernel-team@android.com, linux-doc@vger.kernel.org,
linux-kselftest@vger.kernel.org,
linux-trace-devel@vger.kernel.org,
"Manjo Raja Rao" <linux@manojrajarao.com>,
"Masahiro Yamada" <yamada.masahiro@socionext.com>,
"Masami Hiramatsu" <mhiramat@kernel.org>,
"Michał Gregorczyk" <michalgr@fb.com>,
"Michal Gregorczyk" <michalgr@live.com>,
"Mohammad Husain" <russoue@gmail.com>,
"Olof Johansson" <olof@lixom.net>,
qais.yousef@arm.com, rdunlap@infradead.org, rostedt@goodmis.org,
"Shuah Khan" <shuah@kernel.org>,
"Srinivas Ramana" <sramana@codeaurora.org>,
"Tamir Carmeli" <carmeli.tamir@gmail.com>,
yhs@fb.com
Subject: [PATCH v4 2/2] kheaders: Do not regenerate archive if config is not changed
Date: Wed, 15 May 2019 17:35:52 -0400 [thread overview]
Message-ID: <20190515213552.203737-3-joel@joelfernandes.org> (raw)
In-Reply-To: <20190515213552.203737-1-joel@joelfernandes.org>
Linus reported an issue that doing an allmodconfig was causing the
kheaders archive to be regenerated even though the config is the same.
This patch fixes the issue by ignoring the config-related header files
for "knowing when to regenerate based on timestamps". Instead, if the
CONFIG_X_Y option really changes, then we there are the
include/config/X/Y.h which will already tells us "if a config really
changed". So we don't really need these files for regeneration detection
anyway, and ignoring them fixes Linus's issue.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
---
| 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
--git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh
index 581b83534587..9a34e1d9bd7f 100755
--- a/kernel/gen_kheaders.sh
+++ b/kernel/gen_kheaders.sh
@@ -31,9 +31,8 @@ arch/$SRCARCH/include/
# This block is useful for debugging the incremental builds.
# Uncomment it for debugging.
-# iter=1
-# if [ ! -f /tmp/iter ]; then echo 1 > /tmp/iter;
-# else; iter=$(($(cat /tmp/iter) + 1)); fi
+# if [ ! -f /tmp/iter ]; then iter=1; echo 1 > /tmp/iter;
+# else iter=$(($(cat /tmp/iter) + 1)); echo $iter > /tmp/iter; fi
# find $src_file_list -type f | xargs ls -lR > /tmp/src-ls-$iter
# find $obj_file_list -type f | xargs ls -lR > /tmp/obj-ls-$iter
@@ -43,10 +42,18 @@ arch/$SRCARCH/include/
pushd $kroot > /dev/null
src_files_md5="$(find $src_file_list -type f |
grep -v "include/generated/compile.h" |
+ grep -v "include/generated/autoconf.h" |
+ grep -v "include/config/auto.conf" |
+ grep -v "include/config/auto.conf.cmd" |
+ grep -v "include/config/tristate.conf" |
xargs ls -lR | md5sum | cut -d ' ' -f1)"
popd > /dev/null
obj_files_md5="$(find $obj_file_list -type f |
grep -v "include/generated/compile.h" |
+ grep -v "include/generated/autoconf.h" |
+ grep -v "include/config/auto.conf" |
+ grep -v "include/config/auto.conf.cmd" |
+ grep -v "include/config/tristate.conf" |
xargs ls -lR | md5sum | cut -d ' ' -f1)"
if [ -f $tarfile ]; then tarfile_md5="$(md5sum $tarfile | cut -d ' ' -f1)"; fi
@@ -82,7 +89,7 @@ find $cpio_dir -type f -print0 |
tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null
-echo "$src_files_md5" > kernel/kheaders.md5
+echo "$src_files_md5" > kernel/kheaders.md5
echo "$obj_files_md5" >> kernel/kheaders.md5
echo "$(md5sum $tarfile | cut -d ' ' -f1)" >> kernel/kheaders.md5
--
2.21.0.1020.gf2820cf01a-goog
prev parent reply other threads:[~2019-05-15 21:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 21:35 [PATCH v4 0/2] kheaders fixes for -rc Joel Fernandes (Google)
2019-05-15 21:35 ` [PATCH v4 1/2] kheaders: Move from proc to sysfs Joel Fernandes (Google)
2019-05-15 21:35 ` Joel Fernandes (Google) [this message]
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=20190515213552.203737-3-joel@joelfernandes.org \
--to=joel@joelfernandes.org \
--cc=adrian.ratiu@collabora.com \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=atishp04@gmail.com \
--cc=bgregg@netflix.com \
--cc=bpf@vger.kernel.org \
--cc=brendan.d.gregg@gmail.com \
--cc=carmeli.tamir@gmail.com \
--cc=corbet@lwn.net \
--cc=dan.j.williams@intel.com \
--cc=dancol@google.com \
--cc=daniel@iogearbox.net \
--cc=dietmar.eggemann@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=groeck@chromium.org \
--cc=karim.yaghmour@opersys.com \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=linux@manojrajarao.com \
--cc=mhiramat@kernel.org \
--cc=michalgr@fb.com \
--cc=michalgr@live.com \
--cc=olof@lixom.net \
--cc=qais.yousef@arm.com \
--cc=rdunlap@infradead.org \
--cc=rostedt@goodmis.org \
--cc=russoue@gmail.com \
--cc=shuah@kernel.org \
--cc=sramana@codeaurora.org \
--cc=torvalds@linux-foundation.org \
--cc=yamada.masahiro@socionext.com \
--cc=yhs@fb.com \
--cc=yuchao.du@unisoc.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).