Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild fixes from Masahiro Yamada:
- fix a bashism of setlocalversion
- do not use the too new --sort option of tar
* tag 'kbuild-fixes-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kheaders: substituting --sort in archive creation
scripts: setlocalversion: fix a bashism
kbuild: update comment about KBUILD_ALLDIRS
+9
-6
+1
-1
Makefile
+1
-1
Makefile
···
1037
1037
export KBUILD_VMLINUX_LIBS := $(libs-y1)
1038
1038
export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
1039
1039
export LDFLAGS_vmlinux
1040
-
# used by scripts/package/Makefile
1040
+
# used by scripts/Makefile.package
1041
1041
export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)
1042
1042
1043
1043
vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)
+7
-4
kernel/gen_kheaders.sh
+7
-4
kernel/gen_kheaders.sh
···
71
71
find $cpio_dir -type f -print0 |
72
72
xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;'
73
73
74
-
# Create archive and try to normalize metadata for reproducibility
75
-
tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
76
-
--owner=0 --group=0 --sort=name --numeric-owner \
77
-
-Jcf $tarfile -C $cpio_dir/ . > /dev/null
74
+
# Create archive and try to normalize metadata for reproducibility.
75
+
# For compatibility with older versions of tar, files are fed to tar
76
+
# pre-sorted, as --sort=name might not be available.
77
+
find $cpio_dir -printf "./%P\n" | LC_ALL=C sort | \
78
+
tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
79
+
--owner=0 --group=0 --numeric-owner --no-recursion \
80
+
-Jcf $tarfile -C $cpio_dir/ -T - > /dev/null
78
81
79
82
echo "$src_files_md5" > kernel/kheaders.md5
80
83
echo "$obj_files_md5" >> kernel/kheaders.md5
+1
-1
scripts/setlocalversion
+1
-1
scripts/setlocalversion
···
93
93
# Check for mercurial and a mercurial repo.
94
94
if test -d .hg && hgid=`hg id 2>/dev/null`; then
95
95
# Do we have an tagged version? If so, latesttagdistance == 1
96
-
if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then
96
+
if [ "`hg log -r . --template '{latesttagdistance}'`" = "1" ]; then
97
97
id=`hg log -r . --template '{latesttag}'`
98
98
printf '%s%s' -hg "$id"
99
99
else