RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-19 19:26:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #560 from euspectre/get-kernel-version

Browse Source 
Get kernel version from vmlinux if the kernel source tree is used
This commit is contained in:
Seth Jennings 2015-11-18 15:28:42 -06:00
commit b60d3acddb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kpatch-build/kpatch-build
View File

@ -283,12 +283,6 @@ rm -f "$LOGFILE"
trap cleanup EXIT INT TERM HUP
KVER=${ARCHVERSION%%-*}
if [[ $ARCHVERSION =~ - ]]; then
KREL=${ARCHVERSION##*-}
KREL=${KREL%.*}
fi
if [[ -n $USERSRCDIR ]]; then
# save .config and vmlinux since they'll get removed with mrproper so
# we can restore them later and be able to run kpatch-build multiple
@ -300,6 +294,15 @@ if [[ -n $USERSRCDIR ]]; then
[[ -z $VMLINUX ]] && VMLINUX="$USERSRCDIR"/vmlinux
[[ ! -e "$VMLINUX" ]] && die "can't find vmlinux"
[[ "$VMLINUX" = "$USERSRCDIR"/vmlinux ]] && cp -f "$VMLINUX" $TEMPDIR/vmlinux && VMLINUX=$TEMPDIR/vmlinux
# Extract the target kernel version from vmlinux in this case.
ARCHVERSION=$(strings "$VMLINUX" | grep -e "^Linux version" | awk '{ print($3); }')
fi
KVER=${ARCHVERSION%%-*}
if [[ $ARCHVERSION =~ - ]]; then
KREL=${ARCHVERSION##*-}
KREL=${KREL%.*}
fi
[[ -z $TARGETS ]] && TARGETS="vmlinux modules"