RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2024-12-24 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #561 from euspectre/gcc-gnu-fix

Browse Source 
kpatch-build: fix gcc_version_check: both "GNU" and "GCC" are possible
This commit is contained in:
Josh Poimboeuf 2015-11-18 10:28:18 -06:00
commit f4b5eded0c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kpatch-build/kpatch-build
View File

@ -119,8 +119,8 @@ find_dirs() {
gcc_version_check() { gcc_version_check() {
# ensure gcc version matches that used to build the kernel # ensure gcc version matches that used to build the kernel
local gccver=$(gcc --version |head -n1 |cut -d' ' -f2-) local gccver=$(gcc --version | head -n1 | cut -d' ' -f2- | sed 's/GNU/GCC/g')
local kgccver=$(readelf -p .comment $VMLINUX |grep GCC: | tr -s ' ' | cut -d ' ' -f5-) local kgccver=$(readelf -p .comment $VMLINUX | grep GCC: | tr -s ' ' | cut -d ' ' -f5- | sed 's/GNU/GCC/g')
if [[ "$gccver" != "$kgccver" ]]; then if [[ "$gccver" != "$kgccver" ]]; then
warn "gcc/kernel version mismatch" warn "gcc/kernel version mismatch"
echo "gcc version: $gccver" echo "gcc version: $gccver"