Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kheaders: rebuild kheaders_data.tar.xz when KBUILD_BUILD_TIMESTAMP is changed
This problem is similar to commit 7f8256ae0efb ("initramfs: Encode
dependency on KBUILD_BUILD_TIMESTAMP"): kernel/gen_kheaders.sh has an
internal dependency on KBUILD_BUILD_TIMESTAMP that is not exposed to
make, so changing KBUILD_BUILD_TIMESTAMP will not trigger a rebuild
of the archive.
Move $(KBUILD_BUILD_TIMESTAMP) to the Makefile so that is is recorded
in the *.cmd file.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+3
-2
+1
-1
kernel/Makefile
+1
-1
kernel/Makefile
···
162
162
$(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz
163
163
164
164
quiet_cmd_kheaders_data = GEN $@
165
-
cmd_kheaders_data = "$<" "$@" "$(obj)/kheaders-srclist" "$(obj)/kheaders-objlist"
165
+
cmd_kheaders_data = "$<" "$@" "$(obj)/kheaders-srclist" "$(obj)/kheaders-objlist" "$(KBUILD_BUILD_TIMESTAMP)"
166
166
cmd_kheaders_data_dep = cat $(depfile) >> $(dot-target).cmd; rm -f $(depfile)
167
167
168
168
define rule_kheaders_data
+2
-1
kernel/gen_kheaders.sh
+2
-1
kernel/gen_kheaders.sh
···
7
7
tarfile=$1
8
8
srclist=$2
9
9
objlist=$3
10
+
timestamp=$4
10
11
11
12
dir=$(dirname "${tarfile}")
12
13
tmpdir=${dir}/.tmp_dir
···
43
42
rm -f "${tmpdir}.contents.txt"
44
43
45
44
# Create archive and try to normalize metadata for reproducibility.
46
-
tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
45
+
tar "${timestamp:+--mtime=$timestamp}" \
47
46
--owner=0 --group=0 --sort=name --numeric-owner --mode=u=rw,go=r,a+X \
48
47
-I $XZ -cf $tarfile -C "${tmpdir}/" . > /dev/null
49
48