Skip to content
Snippets Groups Projects
Commit a2aa765a authored by Florian Pose's avatar Florian Pose
Browse files

Fixed bad configure behavior with complex kernel version strings.

parent a51e618b
No related branches found
No related tags found
No related merge requests found
...@@ -50,10 +50,10 @@ if test \! -r ${sourcedir}/.config; then ...@@ -50,10 +50,10 @@ if test \! -r ${sourcedir}/.config; then
fi fi
# Try to get kernel release string # Try to get kernel release string
if test -r ${sourcedir}/.kernelrelease; then if test -r ${sourcedir}/include/config/kernel.release; then
kernelrelease=`cat $sourcedir/.kernelrelease`
elif test -r ${sourcedir}/include/config/kernel.release; then
kernelrelease=`cat $sourcedir/include/config/kernel.release` kernelrelease=`cat $sourcedir/include/config/kernel.release`
elif test -r ${sourcedir}/.kernelrelease; then
kernelrelease=`cat $sourcedir/.kernelrelease`
elif test -r ${sourcedir}/include/linux/utsrelease.h; then elif test -r ${sourcedir}/include/linux/utsrelease.h; then
hdr=${sourcedir}/include/linux/utsrelease.h hdr=${sourcedir}/include/linux/utsrelease.h
kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"` kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"`
...@@ -68,7 +68,7 @@ if test -z "$kernelrelease"; then ...@@ -68,7 +68,7 @@ if test -z "$kernelrelease"; then
fi fi
# Extract three numbers from kernel release string # Extract three numbers from kernel release string
linuxversion=`echo $kernelrelease | grep -oE [[0-9]]+\.[[0-9]]+\.[[0-9]]+` linuxversion=`echo $kernelrelease | grep -oE "^[[0-9]]+\.[[0-9]]+\.[[0-9]]+"`
AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir]) AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir])
AC_SUBST(LINUX_KERNEL_RELEASE,[$kernelrelease]) AC_SUBST(LINUX_KERNEL_RELEASE,[$kernelrelease])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment