From dff29eda4b4d880fbb8cc62be5fc709186bdd82a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 9 Nov 2015 17:55:03 +0000 Subject: [PATCH] scst.spec: Improve robustness of kernel version query code git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6627 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst.spec.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scst.spec.in b/scst.spec.in index b6b528f7b..af674bf2d 100644 --- a/scst.spec.in +++ b/scst.spec.in @@ -8,14 +8,16 @@ # version number when building on a koji build server. # - Otherwise use the version number of the running kernel. %{!?kversion: - %{?kdir:%define kversion %{expand:%%(make -sC %{kdir} kernelversion)}} + %{?kdir:%define kversion %{expand:%%( + make -sC "%{kdir}" kernelversion | grep -v ^make)}} %{!?kdir: %define kversion %{expand:%%( if rpm --quiet -q kernel-headers; then rpm -q --qf '%%%%{BUILDTIME} %%%%{version}-%%%%{release}.%%%%{arch}\\n' \\ kernel-headers | sort | tail -n1 | { read a b; echo $b; }; else - uname -r; + make -sC "/lib/modules/$(uname -r)/build/" kernelversion | + grep -v ^make; fi )}}} %{echo:kversion=%{kversion}