From bdef122aaf5cda4934a1cc19f3bd0ccdbe1bf5ab Mon Sep 17 00:00:00 2001
From: laokz <laokz@foxmail.com>
Date: Wed, 12 Mar 2025 08:26:26 +0000
Subject: [PATCH] Let kernel-extra-modules subpackage only for x86_64, aarch64
 Signed-off-by: laokz <zhangkai@iscas.ac.cn>

---
 kernel.spec | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 3040d50..eb0cca7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig
 %global upstream_sublevel   0
 %global devel_release       72
 %global maintenance_release .3.0
-%global pkg_release         .51
+%global pkg_release         .52
 
 %global openeuler_lts       1
 %global openeuler_major     2403
@@ -236,12 +236,14 @@ Obsoletes: %{name}-tools-libs-devel
 This package contains the development files for the tools/ directory from
 the kernel source.
 
+%ifarch x86_64 aarch64
 %package extra-modules
 Summary: Extra kernel modules to match the kernel
 AutoReqProv: no
 Provides: kernel-extra-modules = %{version}-%{release}
 %description extra-modules
 This package contains optional modules that may be dynamically loaded but not needed for base system operation.
+%endif
 
 %if %{with_perf}
 %package -n perf
@@ -641,7 +643,9 @@ install -m 755 %{SOURCE200} $RPM_BUILD_ROOT%{_sbindir}/mkgrub-menu-%{version}-%{
 # for RPM package specification, while ensuring proper path mapping to /lib/modules/%{KernelVer}/
 
 pushd $RPM_BUILD_ROOT/lib/modules/%{KernelVer}
-
+%ifnarch x86_64 aarch64
+find -type f -name "*.ko" >modnames
+%else
 sed 's!^!kernel/!; s!\.ko$!!' %{_sourcedir}/core-modules_%{_target_cpu}.list > modules.list
 
 %{_sourcedir}/find-module-deps.sh %{KernelVer} "$RPM_BUILD_ROOT" modules.list >modules-core.list
@@ -658,6 +662,7 @@ if [ -s modules-extra.list ]; then
 else
     echo "%ghost /nonexistent/dummy/file" > %{_builddir}/%{name}-%{version}/kernel-extra-modules-filelist
 fi
+%endif
 
 # mark modules executable so that strip-to-file can strip them
 xargs --no-run-if-empty chmod u+x < modnames
@@ -697,7 +702,10 @@ grep -E -v \
 	  'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' \
   modinfo && exit 1
 
-rm -f modinfo modnames drivers.undef modules-extra.list modules-core.list modules.list
+rm -f modinfo modnames drivers.undef
+%ifarch x86_64 aarch64
+rm -f modules-extra.list modules-core.list modules.list
+%endif
 
 for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap
 do
@@ -1001,7 +1009,11 @@ fi
 /sbin/ldconfig
 %systemd_postun cpupower.service
 
+%ifnarch x86_64 aarch64
+%files
+%else
 %files -f kernel-modules-filelist
+%endif
 %defattr (-, root, root)
 %doc
 /boot/config-*
@@ -1014,14 +1026,20 @@ fi
 %ghost /boot/initramfs-%{KernelVer}.img
 /boot/.vmlinuz-*.hmac
 /etc/ld.so.conf.d/*
+%ifnarch x86_64 aarch64
+/lib/modules/%{KernelVer}/
+%else
 /lib/modules/%{KernelVer}/vdso/
 /lib/modules/%{KernelVer}/modules.*
+%endif
 %exclude /lib/modules/%{KernelVer}/source
 %exclude /lib/modules/%{KernelVer}/build
 %{_sbindir}/mkgrub-menu*.sh
 
+%ifarch x86_64 aarch64
 %files extra-modules -f kernel-extra-modules-filelist
 %defattr(-,root,root)
+%endif
 
 %files devel
 %defattr (-, root, root)
@@ -1122,6 +1140,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 12 2025 laokz <zhangkai@iscas.ac.cn> - 6.6.0-72.2.0.52
+- Let kernel-extra-modules subpackage only for x86_64, aarch64
+
 * Thu Mar 06 2025 ZhangPeng <zhangpeng362@huawei.com> - 6.6.0-72.3.0.51
 - !15288 【openEuler-25.03】tlbi: Do not force the broadcasting of TLBI and ICache, and a…
 - tlbi: Do not force the broadcasting of TLBI and ICache, and add TLB flush helpers based on IPI.
-- 
Gitee