X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=a2ea8ca6999f78afbdd56cb9c665792df49440a5;hb=1f39f5805eaa6b6861b4207ff523ecc871295554;hp=cc2b3f04bba9b192da6e9f8ab2d41aaa80874c89;hpb=6784f66e54ecbffce48bf61fbd32ddf1b0b0c070;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index cc2b3f04..a2ea8ca6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -25,14 +25,16 @@
 %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
 %bcond_without	ipv6		# ipv6 support
 
+%bcond_without	aufs		# aufs4 support
+
 %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,8 +72,8 @@
 %endif
 
 %define		rel		1
-%define		basever		4.3
-%define		postver		.0
+%define		basever		4.9
+%define		postver		.7
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -98,6 +100,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}
@@ -116,11 +121,11 @@ Release:	%{rel}
 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:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
+# Source0-md5:	0a68ef3615c64bd5ee54a3320e46667d
 %if "%{postver}" != ".0"
-Patch0:		http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	408f9975969da326b5804a04dbf0d4de
+Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
+# Patch0-md5:	e1f02eaa546e2f2c46b4c89b2b3c282f
 %endif
 Source1:	kernel.sysconfig
 
@@ -142,9 +147,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
 
@@ -167,15 +172,9 @@ Patch40:	kernel-layer7.patch
 
 ### End netfilter
 
-# http://zph.bratcheda.org/linux-2.6.26.3-zph.patch
-Patch49:	kernel-zph.patch
-
 # http://www.linuximq.net
 Patch50:	kernel-imq.patch
 
-# http://fatooh.org/esfq-2.6/sfq-2.6.24.1.tar.bz2
-Patch53:	kernel-esfq.patch
-
 # by Baggins request:
 # derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
 Patch55:	kernel-atm-vbr.patch
@@ -200,27 +199,22 @@ 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.9 origin/aufs4.9
 # 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)
+# diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs4.patch
 # cat aufs4-loopback.patch >> ~/rpm/packages/kernel/kernel-aufs4.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.9/patch-4.9.6-rt4.patch.xz
+Patch500:	kernel-rt.patch
 
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
@@ -228,7 +222,7 @@ Patch2003:	kernel-regressions.patch
 Patch2004:	kernel-libata-ahci-pm.patch
 
 # git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
-# branch v4.2-aa2.8-out-of-tree
+# branch v4.7-aa2.8-out-of-tree
 Patch5000:	kernel-apparmor.patch
 
 # for rescuecd
@@ -239,24 +233,26 @@ Patch7000:	kernel-inittmpfs.patch
 # kernel.spec every time.
 #Patch50000:	kernel-usb_reset.patch
 
-URL:		http://www.kernel.org/
+URL:		https://www.kernel.org/
+AutoReqProv:	no
+BuildRequires:	/sbin/depmod
 BuildRequires:	bc
 BuildRequires:	binutils >= 3:2.18
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
 %endif
-%ifarch ppc
-BuildRequires:	uboot-mkimage
-%endif
-BuildRequires:	/sbin/depmod
+BuildRequires:	elfutils-devel
 BuildRequires:	gcc >= 5:3.2
-BuildRequires:	xz >= 1:4.999.7
-AutoReqProv:	no
 BuildRequires:	hostname
 BuildRequires:	kmod >= 12-2
+BuildRequires:	openssl-devel
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
 BuildRequires:	rpmbuild(macros) >= 1.707
+%ifarch ppc
+BuildRequires:	uboot-mkimage
+%endif
+BuildRequires:	xz >= 1:4.999.7
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 12749
 Requires(post):	kmod >= 12-2
@@ -397,6 +393,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')
 
@@ -570,6 +567,7 @@ Summary(de.UTF-8):	Development Dateien die beim Kernel Modul kompilationen gebra
 Summary(pl.UTF-8):	Pliki służące do budowania modułów jądra
 Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
+Requires:	elfutils-devel
 Requires:	make
 Conflicts:	rpmbuild(macros) < 1.704
 AutoReqProv:	no
@@ -676,18 +674,10 @@ cd linux-%{basever}
 ##
 # end of netfilter
 
-# zph
-%patch49 -p1
-
 %if %{with imq}
 %patch50 -p1
 %endif
 
-# esfq
-%if %{with esfq}
-%patch53 -p1
-%endif
-
 %patch55 -p1
 %patch56 -p1
 
@@ -703,29 +693,28 @@ cd linux-%{basever}
 %patch101 -p1
 %endif
 
-# aufs3
+%if %{with aufs}
+# aufs4
 %patch145 -p1
 %if %{with vserver}
 %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
-%patch400 -p1
-
 %endif # vanilla
 
 # Small fixes:
@@ -759,7 +748,6 @@ EOF
 
 RescueConfig() {
 	set -x
-	cat <<-EOCONFIG > $1
 		# CONFIG_SOUND is not set
 		# CONFIG_AUDIT is not set
 		# CONFIG_TR is not set
@@ -922,11 +910,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
@@ -1294,10 +1282,22 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 %endif
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c589_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/8390/axnet_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/8390/pcnet_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/amd/nmclan_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/fujitsu/fmvj18x_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/smsc/smc91c92_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/xircom/xirc2ps_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/b43
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/libertas/*_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/atmel/*_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/cisco/*_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/intersil/hostap/hostap_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/intersil/orinoco/*_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/marvell/libertas/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/tty/serial/8250/serial_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
@@ -1306,6 +1306,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}
 
@@ -1361,10 +1362,22 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %endif
 /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c589_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/8390/axnet_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/8390/pcnet_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/amd/nmclan_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/fujitsu/fmvj18x_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/smsc/smc91c92_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/xircom/xirc2ps_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/b43
-/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/hostap/hostap_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/libertas/*_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/atmel/*_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/cisco/*_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/intersil/hostap/hostap_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/intersil/orinoco/*_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/wireless/marvell/libertas/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/tty/serial/8250/serial_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*