!1124 Fix kernel.spec bugs

From: @ci-robot 
Reviewed-by: @zhengzengkai 
Signed-off-by: @zhengzengkai
This commit is contained in:
openeuler-ci-bot 2023-07-20 11:05:53 +00:00 committed by Gitee
commit 5f7e3f7fb1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -12,7 +12,7 @@
%global upstream_sublevel 0
%global devel_release 1
%global maintenance_release .0.0
%global pkg_release .1
%global pkg_release .3
%define with_debuginfo 1
# Do not recompute the build-id of vmlinux in find-debuginfo.sh
@ -106,7 +106,7 @@ Conflicts: mdadm < 3.2.1-5 nfs-utils < 1.0.7-12 oprofile < 0.9.1-2 ppp < 2.4.3-3
Conflicts: reiserfs-utils < 3.6.19-2 selinux-policy-targeted < 1.25.3-14 squashfs-tools < 4.0
Conflicts: udev < 063-6 util-linux < 2.12 wireless-tools < 29-3 xfsprogs < 2.6.13-4
Provides: kernel-aarch64 = %{version}-%{release} kernel-drm = 4.3.0 kernel-drm-nouveau = 16 kernel-modeset = 1
Provides: kernel-%{_target_cpu} = %{version}-%{release} kernel-drm = 4.3.0 kernel-drm-nouveau = 16 kernel-modeset = 1
Provides: kernel-uname-r = %{KernelVer} kernel=%{KernelVer}
Requires: dracut >= 001-7 grubby >= 8.28-2 initscripts >= 8.11.1-1 linux-firmware >= 20100806-2 module-init-tools >= 3.16-2
@ -447,9 +447,7 @@ popd
install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KernelVer}
install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KernelVer}
%if 0%{?with_kabichk}
gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-%{KernelVer}.gz
%endif
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-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh
@ -769,9 +767,7 @@ fi
%ifarch aarch64
/boot/dtb-*
%endif
%if 0%{?with_kabichk}
/boot/symvers-*
%endif
/boot/System.map-*
/boot/vmlinuz-*
%ghost /boot/initramfs-%{KernelVer}.img
@ -877,6 +873,12 @@ fi
%endif
%changelog
* Thu Jul 20 2023 Wei Li <liwei391@huawei.com> - 6.4.0-1.0.0.3
- provide /boot/symvers-kernelver.gz even no kabichk
* Wed Jul 19 2023 Wei Li <liwei391@huawei.com> - 6.4.0-1.0.0.2
- fix wrong provides
* Wed May 31 2023 Wei Li <liwei391@huawei.com> - 6.4.0-1.0.0.1
- update to 6.4.0-1.0.0.1