X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=e08cd61b223dd698a714ae95a2b2d00d1db5b877;hb=6aa450e62543e60feb5f7cc6ebefa94b2b2d3358;hp=abfa327185dbdda4938181def066fd2fedeb7ceb;hpb=1fb498559e5c09d2bc576a2ffcc7f36bc12f8bf0;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index abfa3271..e08cd61b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -72,7 +72,7 @@
 
 %define		rel		1
 %define		basever		4.4
-%define		postver		.189
+%define		postver		.274
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -124,7 +124,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	958aff44cb63e7f555402ebd560a5370
+# Patch0-md5:	5968f7763f7ee16e97c70d238f715ed4
 %endif
 Source1:	kernel.sysconfig
 
@@ -192,8 +192,8 @@ Patch59:	kernel-rndis_host-wm5.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	kernel-hostap.patch
 
-%define	vserver_patch 4.4.161-vs2.3.9.8
-# http://vserver.13thfloor.at/Experimental/patch-4.4.161-vs2.3.9.8.diff
+%define	vserver_patch 4.4.197-vs2.3.9.8
+# http://vserver.13thfloor.at/Experimental/patch-4.4.217-vs2.3.9.9.diff
 # note there are additional patches from above url:
 # - *fix* are real fixes (we want these)
 # - *feat* are new features/tests (we don't want these)
@@ -283,23 +283,23 @@ Requires:	linux-firmware
 %endif
 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
@@ -439,7 +439,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.
@@ -457,7 +457,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
@@ -494,7 +494,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
@@ -515,7 +515,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
@@ -597,9 +597,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
@@ -630,9 +628,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
@@ -756,6 +752,27 @@ 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},' \
+	scripts/bloat-o-meter \
+	scripts/diffconfig \
+	scripts/show_delta
+
+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/cleanfile \
+	scripts/cleanpatch \
+	scripts/kernel-doc \
+	scripts/stackdelta
+
 %build
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'