From 3179f252be5c9bdbb6231a9dd3a59a50a4218db2 Mon Sep 17 00:00:00 2001
From: Jianping Liu <frankjpliu@tencent.com>
Date: Sun, 26 May 2024 14:37:07 +0800
Subject: [PATCH] dist: revert "add a modules-private rpm subpackage"

Private rpms are compiled as mod-xxx.rpm, and we do not need
kernel-modules-private*.rpm now.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
---
 dist/sources/filter-modules.sh      |  5 -----
 dist/templates/kernel.template.spec | 28 ----------------------------
 2 files changed, 33 deletions(-)

diff --git a/dist/sources/filter-modules.sh b/dist/sources/filter-modules.sh
index cc456fa0537c..cd2426d9249c 100755
--- a/dist/sources/filter-modules.sh
+++ b/dist/sources/filter-modules.sh
@@ -42,8 +42,6 @@ fsdrvs="affs befs cifs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix ncpf
 # .ko files to be filtered
 singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_ib mlx5_vdpa spi-altera-dfl nct6775 hid-playstation hid-nintendo ntc_thermistor configs cifs"
 
-privatemods="rue emm_extentions emm_coreutils emm_zram"
-
 # Overrides is individual modules which need to remain in kernel-core due to deps.
 overrides="cec mfd-core intel-m10-bmc-core mlx5_core mlxfw wmi"
 
@@ -172,9 +170,6 @@ case $MODULEPKG in
 		# Now process the override list to bring those modules back into core
 		filter_override "$overrides"
 		;;
-	modules-private )
-		filter_mods "" "$privatemods" /
-		;;
 	* )
 		error "Invalid module packaging param '$1'"
 		exit 1
diff --git a/dist/templates/kernel.template.spec b/dist/templates/kernel.template.spec
index d706973a9925..de2a45df2008 100644
--- a/dist/templates/kernel.template.spec
+++ b/dist/templates/kernel.template.spec
@@ -259,19 +259,6 @@ Requires(postun): kmod
 %description modules
 This package provides commonly used kernel modules for the %{?2:%{2}-}core kernel package.
 
-### Kernel module private package
-%package modules-private
-Summary: %{rpm_vendor} Kernel modules private to match the %{rpm_name}-core kernel
-Provides: installonlypkg(kernel-module-private)
-Requires: %{rpm_name} = %{version}-%{release}
-AutoReq: no
-AutoProv: yes
-Requires(pre): kmod
-Requires(postun): kmod
-%description modules-private
-This package provides modules for private release, e.g. rue.ko,
-for %{name} of version %{version}-%{release}.
-
 ### Kernel devel package
 %package devel
 Summary: Development package for building kernel modules to match the %{version}-%{release} kernel
@@ -1080,15 +1067,9 @@ CollectKernelFile() {
 	# Rest of the modules stay in core package
 	%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" non-core-modules >> modules.list || exit $?
 
-	# Do module splitting for public release modules
-	%SOURCE10 "%{buildroot}" "$KernUnameR" "%{_target_cpu}" "$_KernBuild/System.map" modules-private >> modules-private.list || exit $?
-
 	comm -23 core.list modules.list > core.list.tmp
 	mv core.list.tmp core.list
 
-	comm -23 core.list modules-private.list > core.list.tmp
-	mv core.list.tmp core.list
-
 	popd
 
 	# Make these file list usable in rpm build dir
@@ -1256,13 +1237,6 @@ fi
 %postun modules
 depmod -a %{kernel_unamer}
 
-### Module package
-%post modules-private
-depmod -a %{kernel_unamer}
-
-%postun modules-private
-depmod -a %{kernel_unamer}
-
 ### Devel package
 %post devel
 if [ -f /etc/sysconfig/kernel ]; then
@@ -1320,8 +1294,6 @@ fi
 %files modules -f modules.list
 %defattr(-,root,root)
 
-%files modules-private -f modules-private.list
-
 %if %{with_keypkg}
 %files signing-keys -f signing-keys.list
 %defattr(-,root,root)