X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=f8497d4afe95d0f1440962a1e3dc35c58b97ccc7;hb=1e98d6be01d41422df23557c7b3bef96027e25ec;hp=72fa8bc0e8ddfc68c6bc85d246562df5ef35a81a;hpb=81ae9e9d5c8d32a26a8b38bd607c7a0814655d67;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 72fa8bc0..0e0d027b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@
 %bcond_without	esfq		# esfq support
 %bcond_without	ipv6		# ipv6 support
 
-%bcond_with	vserver		# support for VServer
+%bcond_without	vserver		# support for VServer
 
 %bcond_with	rt		# real-time kernel (CONFIG_PREEMPT_RT) for low latencies
 
@@ -72,7 +72,7 @@
 
 %define		rel		1
 %define		basever		4.4
-%define		postver		.31
+%define		postver		.178
 
 # 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:	91b0fc0919b520a647e2d3ba60b77254
+# Patch0-md5:	aeddd93b8fcf8595acaf120966f3e962
 %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 3.18.5-vs2.3.7.3
-# http://vserver.13thfloor.at/Experimental/patch-3.18.5-vs2.3.7.3.diff
+%define	vserver_patch 4.4.161-vs2.3.9.8
+# http://vserver.13thfloor.at/Experimental/patch-4.4.161-vs2.3.9.8.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)
@@ -222,7 +222,7 @@ Patch250:	kernel-fix_256colors_menuconfig.patch
 Patch400:	kernel-virtio-gl-accel.patch
 
 # https://rt.wiki.kernel.org/
-# https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.27-rt37.patch.xz
+# https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.30-rt41.patch.xz
 Patch500:	kernel-rt.patch
 
 Patch2000:	kernel-small_fixes.patch
@@ -252,7 +252,7 @@ BuildRequires:	elftoaout
 BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	/sbin/depmod
-BuildRequires:	gcc >= 5:3.2
+BuildRequires:	gcc >= 6:7.2.0-6
 BuildRequires:	xz >= 1:4.999.7
 AutoReqProv:	no
 BuildRequires:	hostname
@@ -316,7 +316,7 @@ Conflicts:	reiserfsprogs < 3.6.3
 Conflicts:	rpm < 4.4.2-0.2
 Conflicts:	udev < 1:081
 Conflicts:	util-linux < 2.10o
-Conflicts:	util-vserver < 0.30.216
+Conflicts:	util-vserver < 0.30.216-1.pre3126.3
 Conflicts:	xfsprogs < 2.6.0
 %if %{without pae}
 ExclusiveArch:	i686 pentium3 pentium4 athlon
@@ -1040,8 +1040,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
@@ -1321,6 +1321,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