X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=fd6d302f8389b4a2fc90e6a9d750ce9eb84daf53;hb=1fbc46eb72fce1270205d5be80e80462d1aeaba5;hp=f568a6348f6acaf959438730a0bf450db61f705a;hpb=e57ebf1718ac564397e289d74d4f43bf739f9487;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index f568a634..fd6d302f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -25,7 +25,6 @@
 %bcond_with	fbcondecor	# build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
 %bcond_without	pae		# build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
 %bcond_with	nfsroot		# build with root on NFS support
-%bcond_with	uksm		# build with UKSM patch, http://kerneldedup.org/projects/uksm/
 
 %bcond_without	imq		# imq support
 %bcond_without	esfq		# esfq support
@@ -33,6 +32,8 @@
 
 %bcond_with	vserver		# support for VServer
 
+%bcond_with	rt		# real-time kernel (CONFIG_PREEMPT_RT) for low latencies
+
 %bcond_with	vanilla		# don't include any patches
 %bcond_with	rescuecd	# build kernel for our rescue
 %bcond_with	myown		# build with your own config (kernel-myown.config)
@@ -70,11 +71,11 @@
 %endif
 
 %define		rel		1
-%define		basever		4.3
-%define		postver		.2
+%define		basever		4.4
+%define		postver		.103
 
 # define this to '-%{basever}' for longterm branch
-%define		versuffix	%{nil}
+%define		versuffix	-%{basever}
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -98,6 +99,9 @@
 %if %{without pae}
 %define		alt_kernel	nopae
 %endif
+%if %{with rt}
+%define		alt_kernel	rt
+%endif
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -117,10 +121,10 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	58b35794eee3b6d52ce7be39357801e7
+# Source0-md5:	9a78fa2eb6c68ca5a40ed5af08142599
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	3a465c7cf55ec9dbf2d72d9292aa5fde
+# Patch0-md5:	fc04db0209ad088b76157918474f6c39
 %endif
 Source1:	kernel.sysconfig
 
@@ -142,9 +146,9 @@ Source25:	kernel-ia64.config
 
 Source41:	kernel-patches.config
 Source43:	kernel-vserver.config
+Source44:	kernel-rt.config
 
 Source55:	kernel-imq.config
-Source56:	kernel-uksm.config
 
 Source58:	kernel-inittmpfs.config
 
@@ -200,9 +204,9 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs4-standalone.git
 # cd aufs4-standalone
-# git checkout -b aufs4.3 origin/aufs4.3
+# git checkout -b aufs4.4 origin/aufs4.4
 # cat aufs4-kbuild.patch aufs4-base.patch aufs4-mmap.patch aufs4-standalone.patch > ~/rpm/packages/kernel/kernel-aufs4.patch
-# mkdir linux
+# rm -rf linux && mkdir linux
 # cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs4.patch
 # drop hunk at the end of patch (hunk is patching include/linux/Kbuild with single line change)
@@ -211,17 +215,16 @@ Patch101:	kernel-vserver-fixes.patch
 Patch145:	kernel-aufs4.patch
 Patch146:	kernel-aufs4+vserver.patch
 
-%define uksm_major_version 0.1.2.3
-%define uksm_version %{uksm_major_version}-for-v3.18
-Patch150:	http://kerneldedup.org/download/uksm/%{uksm_major_version}/uksm-%{uksm_version}.patch
-# Patch150-md5:	b6a2b2aae9c2844d0c74690632d7019e
-
 # Show normal colors in menuconfig with ncurses ABI 6
 Patch250:	kernel-fix_256colors_menuconfig.patch
 
 # https://patchwork.kernel.org/patch/236261/
 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.30-rt41.patch.xz
+Patch500:	kernel-rt.patch
+
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
@@ -397,6 +400,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
 %{?with_nfsroot:Root on NFS - enabled}\
 %{?with_vserver:Linux-VServer - %{vserver_patch}}\
+%{?with_rt:CONFIG_PREEMPT_RT - enabled}\
 
 %define Features %(echo "%{__features}" | sed '/^$/d')
 
@@ -663,7 +667,10 @@ cd linux-%{basever}
 #
 
 # kernel-pom-ng-IPV4OPTSSTRIP.patch
+%if %{without rt}
+# fails on -Werror=incompatible-pointer-types
 %patch10 -p1
+%endif
 
 # kernel-owner-xid.patch
 %if %{with vserver}
@@ -688,8 +695,11 @@ cd linux-%{basever}
 %patch53 -p1
 %endif
 
+%if %{without rt}
+# fails on -Werror=incompatible-pointer-types
 %patch55 -p1
 %patch56 -p1
+%endif
 
 # kernel-rndis_host-wm5.patch
 %patch59 -p1
@@ -709,22 +719,25 @@ cd linux-%{basever}
 %patch146 -p1
 %endif
 
-# UKSM
-%if %{with uksm}
-%patch150 -p1
-%endif
-
 %if %{with rescuecd}
 %patch7000 -p1
 %endif
 
+%if %{with rt}
+%patch500 -p1
+rm -f localversion-rt
+%endif
+
 # apparmor
 %patch5000 -p1
 
 %patch250 -p1
 
 # virtio-gl
+%if %{without rt}
+# fails on -Werror=incompatible-pointer-types
 %patch400 -p1
+%endif
 
 %endif # vanilla
 
@@ -922,11 +935,11 @@ EOCONFIG
 %if %{with imq}
 		%{SOURCE55} \
 %endif
-%if %{with uksm}
-		%{SOURCE56} \
-%endif
 %if %{with vserver}
 		%{SOURCE43} \
+%endif
+%if %{with rt}
+		%{SOURCE44} \
 %endif
 		%{SOURCE41} %{?0:patches} \
 %endif
@@ -1306,6 +1319,7 @@ fi
 /lib/modules/%{kernel_release}/kernel/sound
 %endif
 /lib/modules/%{kernel_release}/kernel/security
+/lib/modules/%{kernel_release}/kernel/virt
 
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}