mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-06-21 15:43:21 +02:00
klp-build: Fix hang on out-of-date .config
If .config is out of date with the kernel source, 'make syncconfig'
hangs while waiting for user input on new config options. Detect the
mismatch and return an error.
Fixes: 6f93f7b068 ("livepatch/klp-build: Fix inconsistent kernel version")
Acked-by: Song Liu <song@kernel.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
This commit is contained in:
@@ -306,7 +306,12 @@ set_kernelversion() {
|
||||
|
||||
stash_file "$file"
|
||||
|
||||
kernelrelease="$(cd "$SRC" && make syncconfig &>/dev/null && make -s kernelrelease)"
|
||||
if [[ -n "$(make -s listnewconfig 2>/dev/null)" ]]; then
|
||||
die ".config mismatch, check your .config or run 'make olddefconfig'"
|
||||
fi
|
||||
make syncconfig &>/dev/null || die "make syncconfig failed"
|
||||
|
||||
kernelrelease="$(make -s kernelrelease)"
|
||||
[[ -z "$kernelrelease" ]] && die "failed to get kernel version"
|
||||
|
||||
sed -i "2i echo $kernelrelease; exit 0" scripts/setlocalversion
|
||||
|
||||
Reference in New Issue
Block a user