开源软件构建与测试

Changes of Revision 14

_service:tar_scm:kernel.spec Changed

@@ -13,7 +13,7 @@
 
 Name:	 kernel
 Version: 6.1.19
-Release: 1
+Release: 2
 Summary: Linux Kernel for RISC-V
 URL:	 http://www.kernel.org/
 License: GPLv2
@@ -52,10 +52,8 @@
 ExclusiveArch: riscv64
 ExclusiveOS: Linux
 
-%ifarch riscv64
 %define arch_config %{SOURCE1}
 %define hd_arch riscv
-%endif
 
 %description
 This is the Linux kernel Image for RISC-V openSBI(Supervisor Binary Interface) booting with QEMU RISC-V virt machine.
@@ -63,9 +61,6 @@
 %package devel
 Summary: Development package for building kernel modules to match the %{KernelVer} kernel
 AutoReqProv: no
-Provides: %{name}-headers = %{version}
-Obsoletes: %{name}-headers < %{version}
-Provides: glibc-kernheaders
 Provides: kernel-devel-uname-r = %{KernelVer}
 
 %description devel
@@ -101,17 +96,6 @@
 This package contains the perf tool, which enables performance monitoring
 of the Linux kernel.
 
-%if 0%{?with_python2}
-%package -n python2-perf
-Provides: python-perf = %{version}-%{release}
-Obsoletes: python-perf
-Summary: Python bindings for apps which will manipulate perf events
-
-%description -n python2-perf
-A Python module that permits applications written in the Python programming
-language to use the interface to manipulate perf events.
-%endif
-
 %package -n python3-perf
 Summary: Python bindings for apps which will manipulate perf events
 %description -n python3-perf
@@ -164,7 +148,6 @@
 cp -a tools/perf tools/python3-perf
 %endif
 
-
 %build
 cd linux-%{KernelVer}
 
@@ -296,12 +279,6 @@
 fi
 cp -a include $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include
 
-%ifarch aarch64
-    # Needed for systemtap
-    cp -a --parents arch/arm64/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/
-    cp -a --parents arch/arm/include/asm $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/
-%endif
-
 # copy objtool for kernel-devel (needed for building external modules)
 if grep -q CONFIG_STACK_VALIDATION=y .config; then
     mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/tools/objtool