Rasmus Villemoes
2dcb0c6c38
scripts/setlocalversion: make git describe output more reliable ...
commit 548b8b5168c90c42e88f70fcf041b4ce0b8e7aa8 upstream.
When building for an embedded target using Yocto, we're sometimes
observing that the version string that gets built into vmlinux (and
thus what uname -a reports) differs from the path under /lib/modules/
where modules get installed in the rootfs, but only in the length of
the -gabc123def suffix. Hence modprobe always fails.
The problem is that Yocto has the concept of "sstate" (shared state),
which allows different developers/buildbots/etc. to share build
artifacts, based on a hash of all the metadata that went into building
that artifact - and that metadata includes all dependencies (e.g. the
compiler used etc.). That normally works quite well; usually a clean
build (without using any sstate cache) done by one developer ends up
being binary identical to a build done on another host. However, one
thing that can cause two developers to end up with different builds
[and thus make one's vmlinux package incompatible with the other's
kernel-dev package], which is not captured by the metadata hashing, is
this `git describe`: The output of that can be affected by
(1) git version: before 2.11 git defaulted to a minimum of 7, since
2.11 (git.git commit e6c587) the default is dynamic based on the
number of objects in the repo
(2) hence even if both run the same git version, the output can differ
based on how many remotes are being tracked (or just lots of local
development branches or plain old garbage)
(3) and of course somebody could have a core.abbrev config setting in
~/.gitconfig
So in order to avoid `uname -a` output relying on such random details
of the build environment which are rather hard to ensure are
consistent between developers and buildbots, make sure the abbreviated
sha1 always consists of exactly 12 hex characters. That is consistent
with the current rule for -stable patches, and is almost always enough
to identify the head commit unambigously - in the few cases where it
does not, the v5.4.3-00021- prefix would certainly nail it down.
[Adapt to `` vs $() differences between 5.4 and upstream.]
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-11-01 12:01:01 +01:00
locking/atomics: Use sed(1) instead of non-standard head(1) option
2019-06-25 10:17:07 +02:00
kbuild: remove unneeded comments and code from scripts/basic/Makefile
2019-08-29 23:54:29 +09:00
scripts: add dummy report mode to add_namespace.cocci
2020-08-11 15:33:35 +02:00
scripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting
2020-10-07 08:01:29 +02:00
gcc-common.h: Update for GCC 10
2020-05-27 17:46:24 +02:00
scripts/gdb: fix lx-symbols 'gdb.error' while loading modules
2020-07-29 10:18:35 +02:00
genksyms: convert to SPDX License Identifier for lex.l and parse.y
2019-09-14 11:40:13 +09:00
kconfig: qconf: fix signal connection to invalid slots
2020-08-26 10:41:04 +02:00
modpost: move the namespace field in Module.symvers last
2020-03-25 08:25:55 +01:00
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
2020-09-03 11:27:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156
2019-05-30 11:26:35 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
kbuild: remove the first line of *.mod files
2019-07-18 02:19:31 +09:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36
2019-05-24 17:27:11 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 391
2019-06-05 17:37:11 +02:00
bpf: fix script for generating man page on BPF helpers
2019-05-13 01:12:45 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
checkpatch: fix the usage of capture group ( ... )
2020-09-09 19:12:37 +02:00
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
2019-06-05 02:33:10 +09:00
scripts/config: allow colons in option strings for sed
2020-05-10 10:31:27 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 54
2019-05-24 17:36:42 +02:00
scripts/decode_stacktrace: strip basepath from all paths
2020-07-29 10:18:35 +02:00
scripts/decodecode: fix trapping instruction formatting
2020-05-14 07:58:29 +02:00
scripts/documentation-file-ref-check: ignore output dir
2019-06-14 14:43:01 -06:00
modpost: move the namespace field in Module.symvers last
2020-03-25 08:25:55 +01:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 339
2019-06-05 17:37:07 +02:00
scripts/find-unused-docs: Fix massive false positives
2020-02-11 04:35:23 -08:00
gen_compile_commands: lower the entry count threshold
2019-07-27 12:18:19 +09:00
doc: ABI scripts: add a SPDX header file
2019-06-21 16:58:37 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61
2019-05-24 17:36:45 +02:00
get_maintainer: add ability to skip moderated mailing lists
2019-07-16 19:23:22 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
scripts: headers_install: Exit with error on config leak
2020-06-24 17:50:33 +02:00
scripts/kallsyms: fix definitely-lost memory leak
2020-01-04 19:18:23 +01:00
kbuild: improve cc-option to clean up all temporary files
2020-06-30 15:37:05 -04:00
kconfig: introduce m32-flag and m64-flag
2020-04-08 09:08:37 +02:00
kernel-doc: Allow anonymous enum
2019-08-12 15:00:37 -06:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
bpf: Support llvm-objcopy for vmlinux BTF
2020-06-17 16:40:20 +02:00
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
2019-09-27 19:37:27 -07:00
kbuild: force all architectures except um to include mandatory-y
2019-03-17 12:56:32 +09:00
kbuild: remove header compile test
2020-03-05 16:43:47 +01:00
kbuild: clean up subdir-ymn calculation in Makefile.clean
2019-08-29 23:54:29 +09:00
kbuild: Disable -Wpointer-to-enum-cast
2020-03-25 08:25:54 +01:00
kbuild: move headers_check rule to usr/include/Makefile
2020-03-05 16:43:47 +01:00
kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
2019-09-04 23:12:50 +09:00
kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE
2019-08-15 13:24:04 +01:00
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
2020-09-03 11:27:10 +02:00
kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin}
2019-07-17 22:39:27 +09:00
kbuild: move modkern_{c,a}flags to Makefile.lib from Makefile.build
2019-08-22 01:14:11 +09:00
kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod
2019-07-17 22:39:27 +09:00
Modules updates for v5.4
2019-09-22 10:34:46 -07:00
kbuild: modsign: read modules.order instead of $(MODVERDIR)/*.mod
2019-07-17 22:39:27 +09:00
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
2020-09-03 11:27:10 +02:00
ubsan: Remove vla bound checks.
2019-05-06 11:12:09 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 373
2019-06-05 17:37:10 +02:00
Kbuild: Handle PREEMPT_RT for version string and magic
2019-08-14 01:10:42 +09:00
kbuild: get rid of $(realpath ...) from scripts/mkmakefile
2019-08-29 23:54:29 +09:00
mksysmap: Fix the mismatch of '.L' symbols in System.map
2020-06-24 17:50:19 +02:00
kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin}
2019-07-17 22:39:27 +09:00
namespace: fix namespace.pl script to support relative paths
2019-10-05 15:29:49 +09:00
scripts: add dummy report mode to add_namespace.cocci
2020-08-11 15:33:35 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 199
2019-05-30 11:29:23 -07:00
parse-maintainers: Mark as executable
2020-03-25 08:25:49 +01:00
recordmcount: Fix build failure on non arm64
2020-08-21 13:05:36 +02:00
recordmcount: support >64k sections
2020-06-30 15:37:05 -04:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
scripts/setlocalversion: make git describe output more reliable
2020-11-01 12:01:01 +01:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 438
2019-06-05 17:37:17 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
spdxcheck.py: fix directory structures
2019-06-01 15:51:31 -07:00
scripts/spelling.txt: add more spellings to spelling.txt
2019-07-12 11:05:41 -07:00
scripts/sphinx-pre-install: seek for Noto CJK fonts for pdf output
2019-07-17 06:57:52 -03:00
kbuild: add a flag to force absolute path for srctree
2019-07-11 00:05:09 +09:00
scripts/tools-support-relr.sh: un-quote variables
2019-11-13 10:52:05 +00:00
kbuild: add variables for compression tools
2020-09-03 11:27:10 +02:00
2dcb0c6c38