%define have_pcmcia 0
%endif
-%define rel 0.1
+%define rel 1
%define basever 3.14
-%define postver .1
+%define postver .63
-# 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)
# Source0-md5: b621207b3f6ecbb67db18b13258f8ea8
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: 2526eb95793ecc1c22d7e1428ef23cdc
+# Patch0-md5: 0a339395e7c1c42a050f799c1946ba35
%endif
Source1: kernel.sysconfig
# http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
Patch3: kernel-fbcondecor.patch
-Patch4: kernel-fbcon-margins.patch
Patch5: linux-wistron-amilo8210.patch
Patch6: linux-wistron-nx.patch
# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
Patch85: kernel-hostap.patch
+%define vserver_patch 3.10.9-vs2.3.6.6
# http://vserver.13thfloor.at/Experimental/patch-3.13.6-vs2.3.6.11.diff
# note there are additional patches from above url:
# - *fix* are real fixes (we want these)
# git clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git
# cd aufs3-standalone
# git checkout -b aufs3.14 origin/aufs3.14
-# cat aufs3-kbuild.patch aufs3-base.patch aufs3-loopback.patch aufs3-mmap.patch aufs3-standalone.patch > ~/rpm/packages/kernel/kernel-aufs3.patch
+# cat aufs3-kbuild.patch aufs3-base.patch aufs3-mmap.patch aufs3-standalone.patch > ~/rpm/packages/kernel/kernel-aufs3.patch
# mkdir linux
# cp -a Documentation fs include linux
# diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs3.patch
# drop hunk at the end of patch (hunk is patching include/linux/Kbuild with single line change)
+# cat aufs3-loopback.patch >> ~/rpm/packages/kernel/kernel-aufs3.patch
#
Patch145: kernel-aufs3.patch
Patch146: kernel-aufs3+vserver.patch
# http://people.redhat.com/mpatocka/patches/kernel/dm-crypt-paralelizace/current/series.html
Patch500: dm-crypt-remove-percpu.patch
-Patch501: dm-crypt-unbound-workqueue.patch
-Patch502: dm-crypt-dont-allocate-partial-pages.patch
-Patch503: dm-crypt-fix-allocation-deadlock.patch
-Patch504: dm-crypt-offload-writes-to-thread.patch
-Patch505: dm-crypt-sort-requests.patch
+Patch501: bio-kmalloc-align.patch
+Patch502: dm-crypt-per_bio_data.patch
+Patch503: dm-crypt-unbound-workqueue.patch
+Patch504: dm-crypt-dont-allocate-partial-pages.patch
+Patch505: dm-crypt-fix-allocation-deadlock.patch
+Patch506: dm-crypt-remove-io-pool.patch
+Patch507: dm-crypt-offload-writes-to-thread.patch
+Patch508: dm-crypt-sort-requests.patch
Patch2000: kernel-small_fixes.patch
Patch2001: kernel-pwc-uncompress.patch
Suggests: crda
Suggests: dracut
Suggests: keyutils
-Suggests: kernel-ide = %{epoch}:%{version}-%{release}
+Suggests: kernel%{versuffix}-ide = %{epoch}:%{version}-%{release}
Suggests: linux-firmware
Provides: %{name}(netfilter) = 20070806
Provides: %{name}(vermagic) = %{kernel_release}
Conflicts: util-linux < 2.10o
Conflicts: util-vserver < 0.30.216
Conflicts: xfsprogs < 2.6.0
-ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} alpha arm ia64 ppc ppc64 sparc sparc64
+ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha arm ia64 ppc ppc64 sparc sparc64
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
%define target_arch_dir x86
%endif
%ifarch ppc ppc64
%ifarch sparc sparc64
%define target_arch_dir sparc
%endif
-%ifnarch %{ix86} %{x8664} ppc ppc64 sparc sparc64
+%ifnarch %{ix86} %{x8664} x32 ppc ppc64 sparc sparc64
%define target_arch_dir %{_target_base_arch}
%endif
%{!?with_vserver:WARNING: VSERVER IS DISABLED IN THIS KERNEL BUILD!}\
%{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
%{?with_nfsroot:Root on NFS - enabled}\
+%{?with_vserver:Linux-VServer - %{vserver_patch}}\
%define Features %(echo "%{__features}" | sed '/^$/d')
%if %{with fbcondecor}
%patch3 -p1
%endif
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch503 -p1
%patch504 -p1
%patch505 -p1
+%patch506 -p1
+%patch507 -p1
+%patch508 -p1
%endif
%endif # vanilla
install -d $RPM_BUILD_ROOT/boot
cp -a %{objdir}/System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
cp -aL %{objdir}/.config $RPM_BUILD_ROOT/boot/config-%{kernel_release}
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
cp -a %{objdir}/arch/%{target_arch_dir}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
%endif
fi
fi
if [ -x /sbin/new-kernel-pkg ]; then
- /sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install %{kernel_release} --banner "PLD Linux (%{pld_release})%{?alt_kernel: / %{alt_kernel}}"
+ /sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/$initrd_file --install %{kernel_release} --banner "PLD Linux (%{pld_release})%{?alt_kernel: / %{alt_kernel}}"
fi
if [ -x /sbin/rc-boot ]; then
/sbin/rc-boot 1>&2 || :
%ghost /lib/modules/%{kernel_release}/build
%ghost /lib/modules/%{kernel_release}/source
-%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
+%ifarch alpha %{ix86} %{x8664} x32 ppc ppc64 sparc sparc64
%files vmlinux
%defattr(644,root,root,755)
/boot/vmlinux-%{kernel_release}
%{_kernelsrcdir}/scripts/module-common.lds
%attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
%{_kernelsrcdir}/scripts/*.c
+%{_kernelsrcdir}/scripts/*.h
%attr(755,root,root) %{_kernelsrcdir}/scripts/*.sh
%{_kernelsrcdir}/scripts/selinux/genheaders/*.c
%{_kernelsrcdir}/scripts/selinux/mdp/*.c
%exclude %{_kernelsrcdir}/scripts/module-common.lds
%exclude %{_kernelsrcdir}/scripts/setlocalversion
%exclude %{_kernelsrcdir}/scripts/*.c
+%exclude %{_kernelsrcdir}/scripts/*.h
%exclude %{_kernelsrcdir}/scripts/*.sh
%exclude %dir %{_kernelsrcdir}/scripts/selinux
%exclude %{_kernelsrcdir}/scripts/selinux/Makefile
projects / packages / kernel.git / blobdiff