- up to 3.12 final (builds --without vserver)

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 2d4605446e4986d078a5f3b34575b02709e9dcc3..a265efb897018a75c43c9a8bf029ca77e8197642 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
-%define                basever         3.10
-%define                postver         .15
+%define                rel             0.1
+%define                basever         3.12
+%define                postver         .0
 
 # __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)
@@ -109,10 +109,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
+# Source0-md5: cc6ee608854e0da4b64f6c1ff8b6398c
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  70cc9bd12b04382c3783da96edda4562
+# Patch0-md5:  8431ee4e2467fdfde47e31701813a265
 %endif
 Source1:       kernel.sysconfig
 
@@ -164,11 +164,10 @@ Patch40:  kernel-layer7.patch
 Patch49:       kernel-zph.patch
 
 # http://www.linuximq.net
-# http://tech.groups.yahoo.com/group/linuximq/message/3096
 Patch50:       kernel-imq.patch
 
-Patch51:       http://downloads.sourceforge.net/project/reiser4/reiser4-for-linux-3.x/reiser4-for-3.10.patch.gz
-# Patch51-md5: 5af1bdc286a88ef79268337c7ff17508
+Patch51:       http://downloads.sourceforge.net/project/reiser4/reiser4-for-linux-3.x/reiser4-for-3.11.1.patch.gz
+# Patch51-md5: 24a7d3711aadd26000d16eaac943a4ce
 
 # http://fatooh.org/esfq-2.6/sfq-2.6.24.1.tar.bz2
 Patch53:       kernel-esfq.patch
@@ -239,7 +238,8 @@ Patch2000:  kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
 Patch2003:     kernel-regressions.patch
 
-# http://git.kernel.org/?p=linux/kernel/git/jj/linux-apparmor.git;a=shortlog;h=refs/heads/v3.5-aa2.8
+# bzr co lp:apparmor
+# ls apparmor/kernel-patches/3.12
 Patch5000:     kernel-apparmor.patch
 
 # for rescuecd
@@ -353,7 +353,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                topdir          %{_builddir}/%{name}-%{version}
 %define                srcdir          %{topdir}/linux-%{basever}
 %define                objdir          %{topdir}/%{targetobj}
-%define                targetobj       %{_target_base_arch}-gcc-%(%{kgcc} -dumpversion)
+%define                targetobj       %{_target_base_arch}-gcc-%(%{__cc} -dumpversion)
 
 %define                _kernelsrcdir   /usr/src/linux%{_alt_kernel}-%{version}
 
@@ -767,7 +767,6 @@ RescueConfig() {
                # CONFIG_DVB_CORE is not set
                # CONFIG_HAMRADIO is not set
                # CONFIG_ARCNET is not set
-               # CONFIG_FB is not set
                # CONFIG_DRM is not set
                # CONFIG_WATCHDOG is not set
                # CONFIG_INPUT_JOYSTICK is not set
@@ -785,6 +784,60 @@ RescueConfig() {
                # CONFIG_MEDIA_SUPPORT is not set
                # CONFIG_UWB is not set
                # CONFIG_PWM is not set
+               # CONFIG_COMEDI_NI_LABPC_ISA is not set
+               # CONFIG_FB_SYS_FILLRECT is not set
+               # CONFIG_FB_SYS_COPYAREA is not set
+               # CONFIG_FB_SYS_IMAGEBLIT is not set
+               # CONFIG_FB_SYS_FOPS is not set
+               # CONFIG_FB_HECUBA is not set
+               # CONFIG_FB_SVGALIB is not set
+               # CONFIG_FB_CIRRUS is not set
+               # CONFIG_FB_PM2 is not set
+               # CONFIG_FB_CYBER2000 is not set
+               # CONFIG_FB_ARC is not set
+               # CONFIG_FB_ASILIANT is not set
+               # CONFIG_FB_IMSTT is not set
+               # CONFIG_FB_VGA16 is not set
+               # CONFIG_FB_UVESA is not set
+               # CONFIG_FB_N411 is not set
+               # CONFIG_FB_HGA is not set
+               # CONFIG_FB_S1D13XXX is not set
+               # CONFIG_FB_NVIDIA is not set
+               # CONFIG_FB_RIVA is not set
+               # CONFIG_FB_I740 is not set
+               # CONFIG_FB_LE80578 is not set
+               # CONFIG_FB_CARILLO_RANCH is not set
+               # CONFIG_FB_MATROX is not set
+               # CONFIG_FB_RADEON is not set
+               # CONFIG_FB_ATY128 is not set
+               # CONFIG_FB_ATY is not set
+               # CONFIG_FB_S3 is not set
+               # CONFIG_FB_SAVAGE is not set
+               # CONFIG_FB_SIS is not set
+               # CONFIG_FB_VIA is not set
+               # CONFIG_FB_NEOMAGIC is not set
+               # CONFIG_FB_KYRO is not set
+               # CONFIG_FB_3DFX is not set
+               # CONFIG_FB_VOODOO1 is not set
+               # CONFIG_FB_VT8623 is not set
+               # CONFIG_FB_TRIDENT is not set
+               # CONFIG_FB_ARK is not set
+               # CONFIG_FB_PM3 is not set
+               # CONFIG_FB_CARMINE is not set
+               # CONFIG_FB_GEODE is not set
+               # CONFIG_FB_TMIO is not set
+               # CONFIG_FB_SM501 is not set
+               # CONFIG_FB_SMSCUFX is not set
+               # CONFIG_FB_UDL is not set
+               # CONFIG_FB_GOLDFISH is not set
+               # CONFIG_XEN_FBDEV_FRONTEND is not set
+               # CONFIG_FB_METRONOME is not set
+               # CONFIG_FB_MB862XX is not set
+               # CONFIG_FB_BROADSHEET is not set
+               # CONFIG_FB_AUO_K190X is not set
+               # CONFIG_FB_AUO_K1900 is not set
+               # CONFIG_FB_AUO_K1901 is not set
+               # CONFIG_FB_HYPERV is not set
                CONFIG_AUFS=y
                CONFIG_AUFS_FS=y
                CONFIG_AUFS_BR_RAMFS=y
@@ -793,6 +846,9 @@ RescueConfig() {
                CONFIG_ISO9660_FS=y
                CONFIG_NLS_UTF8=y
                CONFIG_SQUASHFS=y
+               CONFIG_FB=y
+               CONFIG_FB_EFI=y
+               CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 EOCONFIG
 
        return 0
@@ -1105,6 +1161,9 @@ fi
 if [ -x /sbin/rc-boot ]; then
        /sbin/rc-boot 1>&2 || :
 fi
+if [ -x /sbin/efi-boot-update ]; then
+       /sbin/efi-boot-update --auto || :
+fi
 
 %post vmlinux
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1389,6 +1448,7 @@ fi
 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
 %endif
 %{_kernelsrcdir}/arch/arm/kvm
+%{_kernelsrcdir}/arch/arm64/kvm
 %{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm