X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=27e14b35bc6c60bce0098d6fe9cb30fc76034532;hb=26eb093cb03e05d4b84b3338e0d8f0f18c62217b;hp=86913779caedfc50fb40c12e6e7caeb5163b95f8;hpb=0a97d3b263734b6d3b8f5f78265127bf73f27a84;p=packages%2Fkernel.git diff --git a/kernel.spec b/kernel.spec index 86913779..27e14b35 100644 --- a/kernel.spec +++ b/kernel.spec @@ -66,8 +66,8 @@ %endif %define rel 1 -%define basever 5.16 -%define postver .14 +%define basever 5.18 +%define postver .0 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -118,10 +118,10 @@ Epoch: 3 License: GPL v2 Group: Base/Kernel Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz -# Source0-md5: e6680ce7c989a3efe58b51e3f3f0bf93 +# Source0-md5: 58e80452e2d8e1993cd7ec95e697ab5a %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz -# Patch0-md5: 69c109b23427678fcf28dc4f8ae83129 +# Patch0-md5: c942f79b0f310ca6e8d5828fad539a7f %endif Source1: kernel.sysconfig @@ -205,7 +205,6 @@ Patch500: kernel-rt.patch Patch2000: kernel-small_fixes.patch Patch2001: kernel-pwc-uncompress.patch Patch2003: kernel-regressions.patch -Patch2004: Revert-ath-add-support-for-special-0x0-regulatory-domain.patch # for rescuecd # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz @@ -215,7 +214,6 @@ Patch7000: kernel-inittmpfs.patch Patch8000: rpi-sound.patch Patch8001: kernel-pinebook-pro.patch Patch8002: atheros-disallow-retrain-nongen1-pcie.patch -Patch8003: mvebu-pcie.patch # Do not remove this line, please. It is easier for me to uncomment two lines, then patch # kernel.spec every time. @@ -224,23 +222,24 @@ Patch8003: mvebu-pcie.patch URL: https://www.kernel.org/ AutoReqProv: no BuildRequires: /sbin/depmod -BuildRequires: bc -BuildRequires: binutils >= 3:2.18 -BuildRequires: bison +BuildRequires: bc >= 1.06.95 +BuildRequires: binutils >= 3:2.23 +BuildRequires: bison >= 2.0 %ifarch sparc sparc64 BuildRequires: elftoaout %endif BuildRequires: elfutils-devel -BuildRequires: flex +BuildRequires: flex >= 2.5.35 BuildRequires: gcc >= 6:7.2.0-6 BuildRequires: gcc-c++ BuildRequires: gcc-plugin-devel BuildRequires: hostname BuildRequires: kmod >= %{kmod_ver} BuildRequires: libstdc++-devel -BuildRequires: openssl-devel -BuildRequires: openssl-tools -BuildRequires: perl-base +BuildRequires: make >= 1:3.81 +BuildRequires: openssl-devel >= 1.0.0 +BuildRequires: openssl-tools >= 1.0.0 +BuildRequires: perl-base >= 5 BuildRequires: rpm-build >= 4.5-24 BuildRequires: rpmbuild(macros) >= 1.752 BuildRequires: tar >= 1:1.22 @@ -667,7 +666,6 @@ cd linux-%{basever} %patch8000 -p1 %patch8001 -p1 %patch8002 -p1 -%patch8003 -p1 %endif %if %{with rt} @@ -683,7 +681,6 @@ rm -f localversion-rt %patch2000 -p1 %patch2001 -p1 #%patch2003 -p1 -%patch2004 -p1 # Do not remove this, please! #%%patch50000 -p1 @@ -711,7 +708,7 @@ find -name '*.py' -print0 | \ scripts/show_delta \ tools/hv/vmbus_testing \ tools/kvm/kvm_stat/kvm_stat \ - tools/testing/selftests/exec/binfmt_script + tools/testing/selftests/exec/binfmt_script.py find -name '*.pl' -print0 | \ xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \