History

Merge tag 'v7.0-rc5' into driver-core-next

We need the driver-core fixes in here as well to build on top of.

Danilo Krummrich committed 7 months ago

Commit 14cf4062 parents 9aa64d2 c369299332 files · +3559 −1498Browse files

Showing the changes to scripts (1 of 332 files). Show all

Unified · Split

scripts/livepatch/klp-build+4−5
@@ -285,15 +285,14 @@ set_module_name() { · 284 unmodified lines
285# application from appending it with '+' due to a dirty git working tree.285# application from appending it with '+' due to a dirty git working tree.
286set_kernelversion() {286set_kernelversion() {
287 local file="$SRC/scripts/setlocalversion"287 local file="$SRC/scripts/setlocalversion"
288 local localversion288 local kernelrelease
289 289
290 stash_file "$file"290 stash_file "$file"
291 291
292 localversion="$(cd "$SRC" && make --no-print-directory kernelversion)"292 kernelrelease="$(cd "$SRC" && make syncconfig &>/dev/null && make -s kernelrelease)"
293 localversion="$(cd "$SRC" && KERNELVERSION="$localversion" ./scripts/setlocalversion)"293 [[ -z "$kernelrelease" ]] && die "failed to get kernel version"
294 [[ -z "$localversion" ]] && die "setlocalversion failed"
295 294
296 sed -i "2i echo $localversion; exit 0" scripts/setlocalversion295 sed -i "2i echo $kernelrelease; exit 0" scripts/setlocalversion
297}296}
298 297
299get_patch_files() {298get_patch_files() {