restore lost tabs

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index a9e6cbaebbaceed493aca793588da5b2c0b8c428..5e56c245fc4afdb843d2c2e92b73c6ee7d3dcd9b 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -20,7 +20,6 @@
 %bcond_without pcmcia          # don't build pcmcia
 
 %bcond_with    verbose         # verbose build (V=1)
-%bcond_with    reiser4         # support for reiser4 fs (experimental)
 
 %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
@@ -31,7 +30,7 @@
 %bcond_without ipv6            # ipv6 support
 %bcond_without padmcrypt       # parallel dm-crypt
 
-%bcond_with    vserver         # support for VServer
+%bcond_without vserver         # support for VServer
 
 %bcond_with    vanilla         # don't include any patches
 %bcond_with    rescuecd        # build kernel for our rescue
@@ -67,9 +66,12 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             0.1
+%define                rel             1
 %define                basever         3.13
-%define                postver         .1
+%define                postver         .4
+
+# define this to '-%{basever}' for longterm branch
+%define                versuffix       %{nil}
 
 # __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)
@@ -102,7 +104,7 @@ Summary(de.UTF-8):  Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(et.UTF-8):     Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):     Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):     Jądro Linuksa
-Name:          kernel%{_alt_kernel}
+Name:          kernel%{versuffix}%{_alt_kernel}
 Version:       %{basever}%{postver}
 Release:       %{rel}
 Epoch:         3
@@ -112,7 +114,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 0ecbaf65c00374eb4a826c2f9f37606f
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  675692f24410f375055d422e7886f3d8
+# Patch0-md5:  77ca721ea0e8373f58f596fe0d9b1b47
 %endif
 Source1:       kernel.sysconfig
 
@@ -136,7 +138,6 @@ Source41:   kernel-patches.config
 Source43:      kernel-vserver.config
 
 Source55:      kernel-imq.config
-Source56:      kernel-reiser4.config
 
 Source58:      kernel-inittmpfs.config
 
@@ -167,9 +168,6 @@ Patch49:    kernel-zph.patch
 # http://www.linuximq.net
 Patch50:       kernel-imq.patch
 
-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
 
@@ -188,7 +186,7 @@ Patch85:    kernel-hostap.patch
 # http://www.linuxtv.org/wiki/index.php/TechniSat_CableStar_Combo_HD_CI#Patch
 Patch90:       kernel-technisat-combo-hd-ci.patch
 
-# http://vserver.13thfloor.at/Experimental/patch-3.10.9-vs2.3.6.6.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.13.1-vs2.3.6.10.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)
@@ -316,7 +314,6 @@ Conflicts:  oprofile < 0.9
 Conflicts:     ppp < 1:2.4.0
 Conflicts:     procps < 3.2.0
 Conflicts:     quota-tools < 3.09
-%{?with_reiserfs4:Conflicts:   reiser4progs < 1.0.0}
 Conflicts:     reiserfsprogs < 3.6.3
 Conflicts:     rpm < 4.4.2-0.2
 Conflicts:     udev < 1:081
@@ -358,7 +355,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                objdir          %{topdir}/%{targetobj}
 %define                targetobj       %{_target_base_arch}-gcc-%(%{__cc} -dumpversion)
 
-%define                _kernelsrcdir   /usr/src/linux%{_alt_kernel}-%{version}
+%define                _kernelsrcdir   /usr/src/linux%{versuffix}%{_alt_kernel}-%{version}
 
 %if "%{_target_base_arch}" != "%{_host_base_arch}"
        %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -667,11 +664,6 @@ cd linux-%{basever}
 %patch50 -p1
 %endif
 
-# reiser4
-%if %{with reiser4}
-%patch51 -p1
-%endif
-
 # esfq
 %if %{with esfq}
 %patch53 -p1
@@ -760,7 +752,7 @@ SRCARCH             := %{target_arch_dir}
 ARCH           := %{_target_base_arch}
 Q                      := %{!?with_verbose:@}
 MAKE_OPTS      := %{MakeOpts}
-DEFCONFIG   := %{defconfig}
+DEFCONFIG      := %{defconfig}
 EOF
 
 RescueConfig() {
@@ -884,12 +876,12 @@ BuildConfig() {
 %endif
 
 %ifarch i686 athlon pentium3 pentium4
-  %if %{with pae}
+       %if %{with pae}
                CONFIG_HIGHMEM4G=n
                CONFIG_HIGHMEM64G=y
                CONFIG_X86_PAE=y
                CONFIG_NUMA=n
-  %endif
+       %endif
 %endif
 
 %if %{without pcmcia}
@@ -925,9 +917,6 @@ EOCONFIG
                rescue.config \
 %endif
                \
-%if %{with reiser4}
-               %{SOURCE56} \
-%endif
 %if %{with imq}
                %{SOURCE55} \
 %endif
@@ -1128,6 +1117,14 @@ fi
 
 %depmod %{kernel_release}
 
+%if %{without vserver}
+%banner -e -a kernel <<EOF
+
+WARNING: Vserver support is DISABLED in this kernel build!
+
+EOF
+%endif
+
 %posttrans
 # use posttrans to generate initrd after all dependant module packages (-drm, etc) are installed
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1140,19 +1137,19 @@ fi
 # if dracut is present then generate full-featured initramfs
 if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
        /sbin/dracut --force --quiet /boot/initramfs-%{kernel_release}.img %{kernel_release}
-        [ -n "$initrd_file" ] || initrd_file="initramfs-%{kernel_release}.img"
+       [ -n "$initrd_file" ] || initrd_file="initramfs-%{kernel_release}.img"
 fi
 
 if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
        mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
-        if [ -n "$initrd_file" ] ; then
-           ln -sf "$initrd_file" %{initrd_dir}/initrd
-        fi
+       if [ -n "$initrd_file" ] ; then
+               ln -sf "$initrd_file" %{initrd_dir}/initrd
+       fi
 %if 0%{?alt_kernel:1}
        mv -f %{initrd_dir}/initrd%{_alt_kernel}{,.old} 2> /dev/null
-        if [ -n "$initrd_file" ] ; then
-           ln -sf "$initrd_file" %{initrd_dir}/initrd%{_alt_kernel}
-        fi
+       if [ -n "$initrd_file" ] ; then
+               ln -sf "$initrd_file" %{initrd_dir}/initrd%{_alt_kernel}
+       fi
 %endif
 fi
 
@@ -1208,13 +1205,13 @@ fi
 %depmod %{kernel_release}
 
 %post headers
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{versuffix}%{_alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
-       if [ -L %{_prefix}/src/linux%{_alt_kernel} ]; then
-               if [ "$(readlink %{_prefix}/src/linux%{_alt_kernel})" = "linux%{_alt_kernel}-%{version}" ]; then
-                       rm -f %{_prefix}/src/linux%{_alt_kernel}
+       if [ -L %{_prefix}/src/linux%{versuffix}%{_alt_kernel} ]; then
+               if [ "$(readlink %{_prefix}/src/linux%{versuffix}%{_alt_kernel})" = "linux%{versuffix}%{_alt_kernel}-%{version}" ]; then
+                       rm -f %{_prefix}/src/linux%{versuffix}%{_alt_kernel}
                fi
        fi
 fi