- updated to 3.2.16

[packages/kernel.git] / kernel-vanilla.spec

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index fb976df552567fb40793f28e5ba93abc622c1a24..d2a0b55468d4e8b06075d92cf01f42039f7ea220 100644 (file)
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -5,7 +5,7 @@
 %{?debug:%define with_verbose 1}
 
 %define                _basever                3.2
-%define                _postver                .4
+%define                _postver                .16
 %define                _rel                    1
 
 %define                _enable_debug_packages                  0
@@ -33,7 +33,7 @@ Source0:      http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{_basever}.tar.bz2
 # Source0-md5: 7ceb61f87c097fc17509844b71268935
 %if "%{_postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5: 02adf3e0450969dec6219ca52ff2a68a
+# Source1-md5: 1179d169e0ec15ada29cfa9066777a7f
 %endif
 
 Source2:       kernel-vanilla-autoconf.h
@@ -76,6 +76,7 @@ Obsoletes:    kernel-smp
 Conflicts:     e2fsprogs < 1.29
 Conflicts:     isdn4k-utils < 3.1pre1
 Conflicts:     jfsutils < 1.1.3
+Conflicts:     module-init-tools < 3.16
 Conflicts:     nfs-utils < 1.0.5
 Conflicts:     oprofile < 0.9
 Conflicts:     ppp < 1:2.4.0
@@ -343,7 +344,7 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
 %patch0 -p1
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = -%{alt_kernel}#g' Makefile
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -356,6 +357,9 @@ TuneUpConfigForIX86 () {
        sed -i "s:# CONFIG_HIGHMEM4G is not set:CONFIG_HIGHMEM4G=y:" $1
        sed -i "s:CONFIG_HIGHMEM64G=y:# CONFIG_HIGHMEM64G is not set:" $1
        sed -i ":CONFIG_X86_PAE=y:d" $1
+       echo "# CONFIG_OLPC is not set" >> $1
+       echo "CONFIG_CRYPTO_DEV_HIFN_795X=m" >> $1
+       echo "# CONFIG_CRYPTO_DEV_HIFN_795X_RNG is not set" >> $1
        %else
        sed -i 's:CONFIG_M586=y# CONFIG_M586 is not set::' $1
        sed -i 's:# CONFIG_M686 is not set:CONFIG_M686=y:' $1