- 4.19.134

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 5c6ccc0e4210457814aa677f7cd4edd3c1d0bdbe..2ee124b497b6b23ad0ec1049939386d451247bce 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define                rel             1
 %define                basever         4.19
-%define                postver         .28
+%define                postver         .134
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -107,6 +107,8 @@
 %define                localversion    %{rel}
 %define                kernel_release  %{version}%{?alt_kernel:.%{alt_kernel}}-%{localversion}
 
+%define                kmod_ver        26-2
+
 Summary:       The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):     Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(et.UTF-8):     Linuxi kernel (ehk operatsioonisüsteemi tuum)
@@ -122,7 +124,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: 740a90cf810c2105df8ee12e5d0bb900
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  dd46bc8ca5c28f767428f25921f92b7b
+# Patch0-md5:  a56d551c270273b9ab77d8eda46e033f
 %endif
 Source1:       kernel.sysconfig
 
@@ -230,14 +232,18 @@ AutoReqProv:      no
 BuildRequires: /sbin/depmod
 BuildRequires: bc
 BuildRequires: binutils >= 3:2.18
+BuildRequires: bison
 %ifarch sparc sparc64
 BuildRequires: elftoaout
 %endif
 BuildRequires: elfutils-devel
+BuildRequires: flex
 BuildRequires: gcc >= 6:7.2.0-6
+BuildRequires: gcc-c++
 BuildRequires: gcc-plugin-devel
 BuildRequires: hostname
-BuildRequires: kmod >= 12-2
+BuildRequires: kmod >= %{kmod_ver}
+BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel
 BuildRequires: perl-base
 BuildRequires: rpm-build >= 4.5-24
@@ -247,12 +253,12 @@ BuildRequires:    uboot-mkimage
 %endif
 BuildRequires: xz >= 1:4.999.7
 Requires(post):        coreutils
-Requires(post):        geninitrd >= 12757-8
-Requires(post):        kmod >= 12-2
+Requires(post):        geninitrd >= 12787-6
+Requires(post):        kmod >= %{kmod_ver}
 Requires:      /sbin/depmod
 Requires:      coreutils
-Requires:      geninitrd >= 12757-8
-Requires:      kmod >= 12-2
+Requires:      geninitrd >= 12787-6
+Requires:      kmod >= %{kmod_ver}
 %if %{with pae}
 %ifarch i686 athlon pentium3 pentium4
 Requires:      cpuinfo(pae)
@@ -700,6 +706,32 @@ sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:.%{alt_kernel}}#g' Makef
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
+find -name '*.py' -print0 | \
+       xargs -0 %{__sed} -i -e '1s,/usr/bin/python,%{__python},' \
+                            -e '1s,/usr/bin/env python,%{__python},' \
+                            -e '1s,/usr/bin/env python3,%{__python3},'
+
+%{__sed} -i -e '1s,/usr/bin/python,%{__python},' \
+           -e '1s,/usr/bin/env python,%{__python},' \
+           -e '1s,/usr/bin/env python3,%{__python3},' \
+       drivers/staging/greybus/tools/lbtest \
+       scripts/bloat-o-meter \
+       scripts/diffconfig \
+       scripts/show_delta \
+       tools/kvm/kvm_stat/kvm_stat
+
+find -name '*.pl' -print0 | \
+       xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
+
+%{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
+       scripts/dtc/dt_to_config \
+       scripts/cleanfile \
+       scripts/cleanpatch \
+       scripts/documentation-file-ref-check \
+       scripts/get_dvb_firmware \
+       scripts/kernel-doc \
+       scripts/stackdelta
+
 %build
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'
@@ -983,8 +1015,8 @@ touch $RPM_BUILD_ROOT%{initrd_dir}/initramfs-%{kernel_release}.img
 touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.dep
 %endif
 
-# /etc/modrobe.d
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
+# /etc/depmod.d /etc/modrobe.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{depmod.d,modprobe.d}/%{kernel_release}
 
 install -d $RPM_BUILD_ROOT/etc/sysconfig
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/kernel
@@ -1276,6 +1308,7 @@ fi
 /lib/modules/%{kernel_release}/kernel/security
 /lib/modules/%{kernel_release}/kernel/virt
 
+%dir %{_sysconfdir}/depmod.d/%{kernel_release}
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
 # provided by build