From 1dee6fe1e3031a80ddce4d201222477c36dcdf89 Mon Sep 17 00:00:00 2001 From: Kemeng Shi Date: Mon, 26 Jun 2023 10:58:51 +0800 Subject: [PATCH] use full version-release instead of devel_release for mkgrub-menu Signed-off-by: Kemeng Shi --- kernel.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kernel.spec b/kernel.spec index 8578416..d88226b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global upstream_sublevel 8 %global devel_release 3 %global maintenance_release .0.0 -%global pkg_release .7 +%global pkg_release .8 %define with_debuginfo 0 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -460,7 +460,7 @@ install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KernelVer} gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-%{KernelVer}.gz mkdir -p $RPM_BUILD_ROOT%{_sbindir} -install -m 755 %{SOURCE200} $RPM_BUILD_ROOT%{_sbindir}/mkgrub-menu-%{devel_release}.sh +install -m 755 %{SOURCE200} $RPM_BUILD_ROOT%{_sbindir}/mkgrub-menu-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh %if 0%{?with_debuginfo} @@ -717,7 +717,7 @@ popd %preun if [ `uname -i` == "aarch64" ] && [ -f /boot/EFI/grub2/grub.cfg ]; then - /usr/bin/sh %{_sbindir}/mkgrub-menu-%{devel_release}.sh %{version}-%{devel_release}.aarch64 /boot/EFI/grub2/grub.cfg remove + /usr/bin/sh %{_sbindir}/mkgrub-menu-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh %{version}-%{release}.aarch64 /boot/EFI/grub2/grub.cfg remove fi %postun @@ -737,7 +737,7 @@ fi %{_sbindir}/new-kernel-pkg --package kernel --rpmposttrans %{KernelVer} || exit $? if [ `uname -i` == "aarch64" ] && [ -f /boot/EFI/grub2/grub.cfg ]; then - /usr/bin/sh %{_sbindir}/mkgrub-menu-%{devel_release}.sh %{version}-%{devel_release}.aarch64 /boot/EFI/grub2/grub.cfg update + /usr/bin/sh %{_sbindir}/mkgrub-menu-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh %{version}-%{release}.aarch64 /boot/EFI/grub2/grub.cfg update fi if [ -x %{_sbindir}/weak-modules ] then @@ -886,6 +886,9 @@ fi %endif %changelog +* Mon Jun 26 2023 Shi Kemeng - 6.1.8-3.0.0.8 +- use full version-release instead of devel_release for mkgrub-menu + * Tue Feb 7 2023 Zheng Zengkai - 6.1.8-3.0.0.7 - update to v6.1.8-3.0.0.7 - arm64/vmalloc: use module region only for module_alloc() if CONFIG_RANDOMIZE_BASE is set