From 3dd94a9f97819c99b048baa601fb0bd36622e783 Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Thu, 20 Apr 2023 04:20:13 +0000 Subject: [PATCH] Fix release number Fix release number contains double %{dist}, e.g. *.oe1.oe1.aarch64.rpm Fix sort by version number when finding the latest kernel version. Signed-off-by: Xinliang Liu --- lustre.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre.spec b/lustre.spec index 14db31a..86ac76f 100644 --- a/lustre.spec +++ b/lustre.spec @@ -51,7 +51,7 @@ %{!?version: %global version 2.15.54} # if you want a custom kernel version set it variable with $ver.$arch -%{!?kver: %global kver %(rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}' `rpm -q kernel-devel | sort -r|head -n 1`)} +%{!?kver: %global kver %(rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}' `rpm -q kernel-devel | sort -rV|head -n 1`)} # cut epoch for kmodtool %define _kver %(echo %{kver} | sed -e 's/^[0-9]*://') # trust version from kdir - but it can lost 'epoch' @@ -179,7 +179,7 @@ Summary: Lustre File System Name: %{lustre_name} Version: 2.15.54 -Release: 1%{?dist} +Release: 2 License: GPL-2.0-only AND LGPL-2.1-or-later Group: System Environment/Kernel Source: https://github.com/lustre/lustre-release/archive/refs/tags/%{version}.tar.gz @@ -876,5 +876,9 @@ rm -rf $RPM_BUILD_ROOT rm -rf %{_tmppath}/kmp %changelog +* Thu Apr 20 2023 Xinliang Liu - 2.15.54-2 +- Fix release number contains double %{dist}, e.g. *.oe1.oe1.aarch64.rpm +- Fix sort by version number when finding the latest kernel version. + * Tue Mar 28 2023 Xinliang Liu - 2.15.54-1 - Initial RPM release, client support, with kernel 6.1 client patches -- Gitee