packages/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use full version-release instead of devel_release for mkgrub-menu

Browse Source 
Signed-off-by: Kemeng Shi <shikemeng@huawei.com>
This commit is contained in:
Kemeng Shi 2023-06-26 10:58:51 +08:00
parent caa214ef58
commit 1dee6fe1e3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel.spec
View File

@ -12,7 +12,7 @@
%global upstream_sublevel 8 %global upstream_sublevel 8
%global devel_release 3 %global devel_release 3
%global maintenance_release .0.0 %global maintenance_release .0.0
%global pkg_release .7 %global pkg_release .8
%define with_debuginfo 0 %define with_debuginfo 0
# Do not recompute the build-id of vmlinux in find-debuginfo.sh # 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 gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-%{KernelVer}.gz
mkdir -p $RPM_BUILD_ROOT%{_sbindir} 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} %if 0%{?with_debuginfo}
@ -717,7 +717,7 @@ popd
%preun %preun
if [ `uname -i` == "aarch64" ] && if [ `uname -i` == "aarch64" ] &&
[ -f /boot/EFI/grub2/grub.cfg ]; then [ -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 fi
%postun %postun
@ -737,7 +737,7 @@ fi
%{_sbindir}/new-kernel-pkg --package kernel --rpmposttrans %{KernelVer} || exit $? %{_sbindir}/new-kernel-pkg --package kernel --rpmposttrans %{KernelVer} || exit $?
if [ `uname -i` == "aarch64" ] && if [ `uname -i` == "aarch64" ] &&
[ -f /boot/EFI/grub2/grub.cfg ]; then [ -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 fi
if [ -x %{_sbindir}/weak-modules ] if [ -x %{_sbindir}/weak-modules ]
then then
@ -886,6 +886,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Jun 26 2023 Shi Kemeng <shikemeng@huawei.com> - 6.1.8-3.0.0.8
- use full version-release instead of devel_release for mkgrub-menu
* Tue Feb 7 2023 Zheng Zengkai <zhengzengkai@huawei.com> - 6.1.8-3.0.0.7 * Tue Feb 7 2023 Zheng Zengkai <zhengzengkai@huawei.com> - 6.1.8-3.0.0.7
- update to v6.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 - arm64/vmalloc: use module region only for module_alloc() if CONFIG_RANDOMIZE_BASE is set