diff --git a/kernel.spec b/kernel.spec index 6634bbc8b63e8486ac4bc5ac0c6965edcf3ce786..3d30b81b57a16c7531b441fc974d4a3baca60ba4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -32,15 +32,12 @@ Name: kernel Version: 4.19.194 -Release: %{hulkrelease}.0086 +Release: %{hulkrelease}.0087 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ -%if 0%{?with_patch} -Source0: linux-%{TarballVer}.tar.gz -%else -Source0: linux-%{version}.tar.gz#/kernel.tar.gz -%endif + +Source0: kernel.tar.gz Source10: sign-modules Source11: x509.genkey Source12: extra_certificates @@ -220,20 +217,14 @@ package or when debugging this package.\ %endif %prep -%if 0%{?with_patch} -if [ ! -d kernel-%{version}/vanilla-%{TarballVer} ];then -%setup -q -n kernel-%{version} -a 9998 -c - mv linux-%{TarballVer} vanilla-%{TarballVer} -else - cd kernel-%{version} -fi -cp -rl vanilla-%{TarballVer} linux-%{KernelVer} -%else + %setup -q -n kernel-%{version} -c -mv kernel linux-%{version} -cp -rl linux-%{version} linux-%{KernelVer} + +%if 0%{?with_patch} +tar -xjf %{SOURCE9998} %endif +mv kernel linux-%{KernelVer} cd linux-%{KernelVer} %if 0%{?with_patch} @@ -817,6 +808,8 @@ fi %changelog +* Fri July 30 2021 Gou Hao -4.19.194-2106.1.0.0087 +- fix rpmbuild error with patches * Thu July 8 2021 Senlin Xia - 4.19.90-2106.3.0.0096 - add buildrequire: perl-devel for with_perf