From 8a5e7d3864a97543b155502d0f1db8e67b2e100f Mon Sep 17 00:00:00 2001
From: Min Li <gumi@linux.alibaba.com>
Date: Fri, 17 May 2024 11:31:24 +0800
Subject: [PATCH] anolis: sw64: modify spec and config for sw6b adaption

ANBZ: #4688

replenish head info in sw_64 config, fix corresponding scripts and
spec content for compilation.

Signed-off-by: Min Li <gumi@linux.alibaba.com>
---
 anolis/genrpmtree.sh                        | 4 ++--
 anolis/rpm/kernel.spec.template             | 2 --
 arch/sw_64/configs/anolis_xuelang_defconfig | 4 ++++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/anolis/genrpmtree.sh b/anolis/genrpmtree.sh
index 0279b4533d86..5742fe2bbb5c 100644
--- a/anolis/genrpmtree.sh
+++ b/anolis/genrpmtree.sh
@@ -40,9 +40,9 @@ function do_prep() {
 
     # the kconfigs of sw_64 and loongarch keep the legacy way,
     # so still copy them from arch/${arch}/configs/ directory.
-    cp ${DIST_SRCROOT}/arch/sw_64/configs/anolis_defconfig \
+    cp ${DIST_SRCROOT}/arch/sw_64/configs/anolis_xuelang_defconfig \
     ${DIST_RPMBUILDDIR_OUTPUT}/SOURCES/kernel-${DIST_KERNELVERSION}-sw_64.config
-    cp ${DIST_SRCROOT}/arch/sw_64/configs/anolis-debug_defconfig \
+    cp ${DIST_SRCROOT}/arch/sw_64/configs/anolis_xuelang_defconfig \
     ${DIST_RPMBUILDDIR_OUTPUT}/SOURCES/kernel-${DIST_KERNELVERSION}-sw_64-debug.config
     cp ${DIST_SRCROOT}/arch/loongarch/configs/anolis_defconfig \
     ${DIST_RPMBUILDDIR_OUTPUT}/SOURCES/kernel-${DIST_KERNELVERSION}-loongarch64.config
diff --git a/anolis/rpm/kernel.spec.template b/anolis/rpm/kernel.spec.template
index 77bf3df08dc3..5a733e0fedba 100644
--- a/anolis/rpm/kernel.spec.template
+++ b/anolis/rpm/kernel.spec.template
@@ -1809,9 +1809,7 @@ fi
 /usr/src/kernels/%{KVERREL}%{?2:+%{2}}\
 %{expand:%%files -f %{name}-%{?2:%{2}-}modules-extra.list %{?2:%{2}-}modules-extra}\
 %defattr(-,root,root)\
-%ifnarch sw_64\
 %config(noreplace) /etc/modprobe.d/*-blacklist.conf\
-%endif\
 %{expand:%%files -f %{name}-%{?2:%{2}-}modules-internal.list %{?2:%{2}-}modules-internal}\
 %if %{with_debuginfo}\
 %ifnarch noarch\
diff --git a/arch/sw_64/configs/anolis_xuelang_defconfig b/arch/sw_64/configs/anolis_xuelang_defconfig
index 62a81e2935b5..9c358c9dd683 100644
--- a/arch/sw_64/configs/anolis_xuelang_defconfig
+++ b/arch/sw_64/configs/anolis_xuelang_defconfig
@@ -1,3 +1,7 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/sw_64 5.10.134 Kernel Configuration
+#
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-- 
Gitee