From ac8052d038a2c6c17dd7a84ec9d74608d731df2b Mon Sep 17 00:00:00 2001
From: Jianping Liu <frankjpliu@tencent.com>
Date: Fri, 27 Sep 2024 11:03:34 +0800
Subject: [PATCH] dist,sepc: supprot kernel-debug in core and modules and devel
 rpm

When CONFIG="generic-release", %{rpm_name} is kernel, when
CONFIG="generic-debug", %{rpm_name} is kernel-debug.

Provides: kernel-debug-core in kernel-debug-core rpm
Provides: kernel-debug-modules in kernel-debug-modules rpm
Provides: kernel-debug-devel in kernel-debug-devel rpm

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
---
 dist/templates/kernel.template.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dist/templates/kernel.template.spec b/dist/templates/kernel.template.spec
index 0167832a5f0b..70e463de9b38 100644
--- a/dist/templates/kernel.template.spec
+++ b/dist/templates/kernel.template.spec
@@ -217,7 +217,8 @@ This is the meta package of %{?rpm_vendor:%{rpm_vendor} }Linux kernel, the core
 Summary: %{rpm_vendor} Linux Kernel
 Provides: installonlypkg(kernel)
 Provides: kernel = %{version}-%{release}
-Provides: kernel-core = %{version}-%{release}
+Provides: %{rpm_name}-core = %{version}-%{release}
+Provides: %{rpm_name}-core-uname-r = %{kernel_unamer}
 Provides: kernel-uname-r = %{kernel_unamer}
 Requires(pre): coreutils
 Requires(post): coreutils kmod dracut
@@ -243,7 +244,9 @@ input and output, etc.
 %package modules
 Summary: %{rpm_vendor} Kernel modules to match the %{rpm_name}-core kernel
 Provides: installonlypkg(kernel-module)
-Provides: kernel-modules = %{version}-%{release}
+Provides: %{rpm_name}-modules = %{version}-%{release}
+Provides: %{rpm_name}-modules-uname-r = %{kernel_unamer}
+Provides: kernel-modules = %{kernel_unamer}
 Provides: kernel-modules-extra = %{version}-%{release}
 Requires: %{rpm_name}-core = %{version}-%{release}
 AutoReq: no
@@ -258,8 +261,8 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
 Summary: Development package for building kernel modules to match the %{version}-%{release} kernel
 Release: %{release}
 Provides: installonlypkg(kernel)
-Provides: kernel-devel = %{version}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}
+Provides: %{rpm_name}-devel = %{version}-%{release}
+Provides: %{rpm_name}-devel-%{_target_cpu} = %{version}-%{release}
 Provides: kernel-devel-uname-r = %{kernel_unamer}
 AutoReqprov: no
 %description devel
@@ -272,7 +275,7 @@ against the %{version}-%{release} kernel package.
 Summary: Debug information for package %{rpm_name}
 Requires: %{rpm_name}-debuginfo-common-%{_target_cpu}
 Provides: installonlypkg(kernel)
-Provides: kernel-debuginfo = %{version}-%{release}
+Provides: %{rpm_name}-debuginfo = %{version}-%{release}
 AutoReqProv: no
 %description debuginfo
 This package provides debug information including
@@ -297,7 +300,7 @@ This is required to use SystemTap with %{rpm_name}.
 %package debuginfo-common-%{_target_cpu}
 Summary: Kernel source files used by %{rpm_name}-debuginfo packages
 Provides: installonlypkg(kernel)
-Provides: kernel-debuginfo-common = %{version}-%{release}
+Provides: %{rpm_name}-debuginfo-common = %{version}-%{release}
 %description debuginfo-common-%{_target_cpu}
 This package is required by %{rpm_name}-debuginfo subpackages.
 It provides the kernel source files common to all builds.