X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkernel.git;a=blobdiff_plain;f=kernel.spec;h=d0322eaae50d8b745c23717b1c6949034a113864;hp=bb3edffb02bad9f9ffda345c4810a4369bbb58f3;hb=26ac4cb4274a7a58f22f8b2416a482fa43264171;hpb=2f3877227b3544898aab3268ad15fdbfe72bb023

diff --git a/kernel.spec b/kernel.spec
index bb3edffb..d0322eaa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define		rel		1
 %define		basever		4.14
-%define		postver		.90
+%define		postver		.243
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -122,7 +122,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	bacdb9ffdcd922aa069a5e1520160e24
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	021abc8d53596a22e2f59288044efbbb
+# Patch0-md5:	2987e20e460f7d39f8248382d18b88f1
 %endif
 Source1:	kernel.sysconfig
 
@@ -241,8 +241,10 @@ BuildRequires:	elftoaout
 %endif
 BuildRequires:	elfutils-devel
 BuildRequires:	gcc >= 6:7.2.0-6
+BuildRequires:	gcc-c++
 BuildRequires:	gcc-plugin-devel
 BuildRequires:	hostname
+BuildRequires:	libstdc++-devel
 BuildRequires:	kmod >= 12-2
 BuildRequires:	openssl-devel
 BuildRequires:	perl-base
@@ -270,23 +272,23 @@ Suggests:	keyutils
 Requires:	linux-firmware
 Provides:	%{name}(netfilter) = 20070806
 Provides:	%{name}(vermagic) = %{kernel_release}
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-ene0100
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-it87
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-ite8709
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-mceusb
-Obsoletes:	kernel%{_alt_kernel}-char-lirc-streamzap
-Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
-Obsoletes:	kernel-firmware
-Obsoletes:	kernel-misc-acer_acpi
-Obsoletes:	kernel-misc-fuse
-Obsoletes:	kernel-misc-uvc
-Obsoletes:	kernel-modules
-Obsoletes:	kernel-net-ar81
-Obsoletes:	kernel-net-hostap
-Obsoletes:	kernel-net-ieee80211
-Obsoletes:	kernel-net-ipp2p
-Obsoletes:	kernel-net-rt61
-Obsoletes:	kernel-smp
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-ene0100 < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-it87 < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-ite8709 < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-mceusb < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-char-lirc-streamzap < 0.9.0
+Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN < 2.0.35
+Obsoletes:	kernel-firmware < 3:2.6.33
+Obsoletes:	kernel-misc-acer_acpi < 0.3-2
+Obsoletes:	kernel-misc-fuse < 2.8.5-2
+Obsoletes:	kernel-misc-uvc < 0.215.1-10
+Obsoletes:	kernel-modules < 2.2.2-2
+Obsoletes:	kernel-net-ar81 < 1.0.1.0-3
+Obsoletes:	kernel-net-hostap < 0.4.7-2
+Obsoletes:	kernel-net-ieee80211 < 1.2.18-7
+Obsoletes:	kernel-net-ipp2p < 0.8.2.-17
+Obsoletes:	kernel-net-rt61 < 1.1.0-2.2007122707.13
+Obsoletes:	kernel-smp < 3:2.6.21
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -426,7 +428,7 @@ Summary:	vmlinux - uncompressed kernel image
 Summary(de.UTF-8):	vmlinux - dekompressiertes Kernel Bild
 Summary(pl.UTF-8):	vmlinux - rozpakowany obraz jądra
 Group:		Base/Kernel
-Obsoletes:	kernel-smp-vmlinux
+Obsoletes:	kernel-smp-vmlinux < 3:2.6.21
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -444,7 +446,7 @@ Summary(pl.UTF-8):	Sterowniki DRM
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-drm
+Obsoletes:	kernel-smp-drm < 3:2.6.21
 AutoReqProv:	no
 
 %description drm
@@ -481,7 +483,7 @@ Summary(pl.UTF-8):	Moduły PCMCIA
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-pcmcia
+Obsoletes:	kernel-smp-pcmcia < 3:2.6.21
 Conflicts:	pcmcia-cs < 3.1.21
 Conflicts:	pcmciautils < 004
 AutoReqProv:	no
@@ -502,7 +504,7 @@ Summary(pl.UTF-8):	Sterowniki dźwięku ALSA
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-sound-alsa
+Obsoletes:	kernel-smp-sound-alsa < 3:2.6.21
 AutoReqProv:	no
 
 %description sound-alsa
@@ -566,9 +568,7 @@ Summary(pl.UTF-8):	Kod źródłowy jądra Linuksa
 Group:		Development/Building
 Requires:	%{name}-module-build = %{epoch}:%{version}-%{release}
 AutoReqProv:	no
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description source
 This is the source code for the Linux kernel. You can build a custom
@@ -599,9 +599,7 @@ Summary(de.UTF-8):	Kernel Dokumentation
 Summary(pl.UTF-8):	Dokumentacja do jądra Linuksa
 Group:		Documentation
 AutoReqProv:	no
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description doc
 This is the documentation for the Linux kernel, as found in
@@ -700,7 +698,7 @@ rm -f localversion-rt
 # Small fixes:
 %patch2000 -p1
 %patch2001 -p1
-#%patch2003 -p1
+%patch2003 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -713,6 +711,35 @@ 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/get_dvb_firmware \
+	scripts/kernel-doc \
+	scripts/sphinx-pre-install \
+	scripts/stackdelta
+
+%{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' \
+	scripts/config
+
 %build
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'
@@ -995,8 +1022,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
@@ -1287,6 +1314,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