From a0b2a63c7a581530c384d841c1e36b9274257261 Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Tue, 24 May 2022 11:47:52 +0200 Subject: [PATCH] clean up some old patches Signed-off-by: Toshaan Bharvani --- SPECS/kernel-5.15.spec | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/SPECS/kernel-5.15.spec b/SPECS/kernel-5.15.spec index 5cdf01a..654e8cf 100755 --- a/SPECS/kernel-5.15.spec +++ b/SPECS/kernel-5.15.spec @@ -190,15 +190,8 @@ Source1: config-%{cpuarch} Source4: cpupower.service Source5: cpupower.config ####################################### -Source600: kernel-4.14-hpsa.c -Source601: kernel-4.14-hpsa.h -Source602: kernel-4.14-hpsa_cmd.h -####################################### Source9999: logo_powerel_clut224.ppm -# Do not package the source tarball. -NoSource: 0 - %description This package provides the Linux kernel (vmlinuz), the core of any Linux-based operating system. The kernel handles the basic functions @@ -345,7 +338,7 @@ pushd linux-%{version}-%{release}.%{_target_cpu} > /dev/null # Run make listnewconfig over all the configuration files. %ifarch i686 || x86_64 || ppc64 || ppc64le -for C in config-*-%{_target_cpu}* +for C in config-%{cpuarch}* do %{__cp} $C .config %{__make} -s ARCH=%{buildarch} listnewconfig | grep -E '^CONFIG_' > .newoptions || true @@ -360,11 +353,6 @@ done # Remove unnecessary files. /usr/bin/find . -type f \( -name .gitignore -o -name .mailmap \) | xargs --no-run-if-empty %{__rm} -f -# Patch hpsa driver, to redhat version as newer version of vanilla lts don't work -#%{__cp} %{SOURCE600} drivers/scsi/hpsa.c -#%{__cp} %{SOURCE601} drivers/scsi/hpsa.h -#%{__cp} %{SOURCE602} drivers/scsi/hpsa_cmd.h - # PowerEL FB Logo Linux %{__cp} %{SOURCE9999} drivers/video/logo/logo_linux_clut224.ppm @@ -381,7 +369,6 @@ BuildKernel() { # Select the correct flavour configuration file. if [ -z "${Flavour}" ]; then - #%{__cp} config-%{version}-%{_target_cpu} .config %{__cp} config-%{cpuarch} .config else %{__cp} config-%{_target_cpu}-${Flavour} .config