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
285285 # application from appending it with '+' due to a dirty git working tree.
286286 set_kernelversion() {
287287 local file="$SRC/scripts/setlocalversion"
288− local localversion
288+ local kernelrelease
289289
290290 stash_file "$file"
291291
292− localversion="$(cd "$SRC" && make --no-print-directory kernelversion)"
293− localversion="$(cd "$SRC" && KERNELVERSION="$localversion" ./scripts/setlocalversion)"
294− [[ -z "$localversion" ]] && die "setlocalversion failed"
292+ kernelrelease="$(cd "$SRC" && make syncconfig &>/dev/null && make -s kernelrelease)"
293+ [[ -z "$kernelrelease" ]] && die "failed to get kernel version"
295294
296− sed -i "2i echo $localversion; exit 0" scripts/setlocalversion
295+ sed -i "2i echo $kernelrelease; exit 0" scripts/setlocalversion
297296 }
298297
299298 get_patch_files() {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t