mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 13:41:48 -04:00
Merge tag 'v7.0-rc5' into driver-core-next
We need the driver-core fixes in here as well to build on top of. Signed-off-by: Danilo Krummrich <dakr@kernel.org>
This commit is contained in:
@@ -285,15 +285,14 @@ set_module_name() {
|
||||
# application from appending it with '+' due to a dirty git working tree.
|
||||
set_kernelversion() {
|
||||
local file="$SRC/scripts/setlocalversion"
|
||||
local localversion
|
||||
local kernelrelease
|
||||
|
||||
stash_file "$file"
|
||||
|
||||
localversion="$(cd "$SRC" && make --no-print-directory kernelversion)"
|
||||
localversion="$(cd "$SRC" && KERNELVERSION="$localversion" ./scripts/setlocalversion)"
|
||||
[[ -z "$localversion" ]] && die "setlocalversion failed"
|
||||
kernelrelease="$(cd "$SRC" && make syncconfig &>/dev/null && make -s kernelrelease)"
|
||||
[[ -z "$kernelrelease" ]] && die "failed to get kernel version"
|
||||
|
||||
sed -i "2i echo $localversion; exit 0" scripts/setlocalversion
|
||||
sed -i "2i echo $kernelrelease; exit 0" scripts/setlocalversion
|
||||
}
|
||||
|
||||
get_patch_files() {
|
||||
|
||||
Reference in New Issue
Block a user