Wei Li (1): Fix wrong provides
Xie XiuQi (1): kernel.spec: provide /boot/symvers-kernelver.gz even no kabichk
kernel.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I78EH1
Signed-off-by: Wei Li liwei391@huawei.com --- kernel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/kernel.spec b/kernel.spec index 46b4dda..5c7bcaf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global upstream_sublevel 0 %global devel_release 1 %global maintenance_release .0.0 -%global pkg_release .1 +%global pkg_release .2
%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 @@ -877,6 +877,9 @@ fi %endif
%changelog +* 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
From: Xie XiuQi xiexiuqi@huawei.com
hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7MARC
Signed-off-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Wei Li liwei391@huawei.com --- kernel.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/kernel.spec b/kernel.spec index 5c7bcaf..43775b4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global upstream_sublevel 0 %global devel_release 1 %global maintenance_release .0.0 -%global pkg_release .2 +%global pkg_release .3
%define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -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,9 @@ 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
反馈： 您发送到kernel-build@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/src-openeuler/kernel/pulls/1124 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel-build@openeuler.org/mes...
FeedBack: The patch(es) which you have sent to kernel-build@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/src-openeuler/kernel/pulls/1124 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel-build@openeuler.org/mes...
-
patchwork bot -
Wei Li