From f7a017bb2f62f5529b29b65a4e93d223a799ce65 Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Mon, 1 Apr 2019 17:19:21 +0800 Subject: [PATCH] LU-12141 build: correct the required kernel version for lustre kmod Use %kversion rather than %kver when creating preamble for lustre kmods in lustre spec, to avoid *Requires kernel version* mismatch. Test-Parameters: trivial Lustre-change: https://review.whamcloud.com/#/c/34559/ Lustre-commit: fa9922e8f0af3ddadce07aed7d27b00e42f4b487 Change-Id: I9929471abd48b214510bcb499e25793ad120e6d1 Signed-off-by: Gu Zheng Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/34614 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre.spec.in b/lustre.spec.in index 75a705c..fe79189 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -186,7 +186,7 @@ Userspace tools and files for the Lustre file system. %define preamble %{expand:%( TMPFILE=`mktemp` cat %{SOURCE1} > $TMPFILE -kver=%{kver} +kver=%{kversion} linuxversion=${kver%%%%-*} linuxrelease=${kver##*-} kabiminor=${linuxrelease%%%%.*} -- 1.8.3.1