--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec	2011/12/09 22:25:06	179823
+++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec	2011/12/22 05:54:01	185705
@@ -4,7 +4,7 @@
 %define kernelversion	3
 %define patchlevel	1
 # sublevel is now used for -stable patches
-%define sublevel	5
+%define sublevel	6
 
 # Package release
 %define mgarel		1
@@ -302,6 +302,7 @@
 %endif							\
 							\
 %post -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-post \
+%posttrans -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-posttrans \
 %preun -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-preun \
 %postun -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-postun \
 							\
@@ -324,10 +325,11 @@
 #
 %ifarch %{ix86}
 %if %build_desktop586
-%define summary_desktop586 Linux kernel for desktop use with i586 & 4GB RAM
+%define summary_desktop586 Linux kernel for desktop use with i586 and up to 4GB RAM
 %define info_desktop586 This kernel is compiled for desktop use, single or \
-multiple i586 processor(s)/core(s) and less than 4GB RAM, using full \
-preempt, BFS cpu scheduler and cfq i/o scheduler. \
+multiple i586 processor(s)/core(s) and less than 4GB RAM (usually 3-3.5GB \
+detected, if you need/want to use all 4GB or more, install %{kname}-server),\
+ using full preempt, BFS cpu scheduler and cfq i/o scheduler. \
 This kernel relies on in-kernel smp alternatives to switch between up & smp \
 mode depending on detected hardware. To force the kernel to boot in single \
 processor mode, use the "nosmp" boot parameter.
@@ -340,10 +342,11 @@
 #
 %if %build_desktop
 %ifarch %{ix86}
-%define summary_desktop Linux Kernel for desktop use with i686 & 4GB RAM
+%define summary_desktop Linux Kernel for desktop use with i686 and up to 4GB RAM
 %define info_desktop This kernel is compiled for desktop use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using full \
-preempt, BFS cpu scheduler and cfq i/o scheduler. \
+multiple i686 processor(s)/core(s) and less than 4GB RAM (usually 3-3.5GB \
+detected, if you need/want to use all 4GB or more, install %{kname}-server), \
+using full preempt, BFS cpu scheduler and cfq i/o scheduler. \
 This kernel relies on in-kernel smp alternatives to switch between up & smp \
 mode depending on detected hardware. To force the kernel to boot in single \
 processor mode, use the "nosmp" boot parameter.
@@ -364,12 +367,14 @@
 #
 %if %build_laptop
 %ifarch %{ix86}
-%define summary_laptop Linux kernel for laptop use with i686-up/smp-4GB
+%define summary_laptop Linux kernel for laptop use with i686 and up to 4GB
 %define info_laptop This kernel is compiled for laptop use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_250 \
-to save battery, voluntary preempt, BFS cpu scheduler, cfq i/o scheduler \
-and some other laptop-specific optimizations. If you want to sacrifice \
-battery life for performance, you better use the %{kname}-desktop. \
+multiple i686 processor(s)/core(s) and less than 4GB RAM (usually 3-3.5GB \
+detected, if you need/want to use all 4GB or more, install %{kname}-server), \
+using HZ_250 to save battery, voluntary preempt, BFS cpu scheduler, \
+cfq i/o scheduler and some other laptop-specific optimizations. \
+If you want to sacrifice battery life for performance, you better use the \
+%{kname}-desktop. \
 This kernel relies on in-kernel smp alternatives to switch between up & smp \
 mode depending on detected hardware. To force the kernel to boot in single \
 processor mode, use the "nosmp" boot parameter. \
@@ -830,6 +835,12 @@
 %endif
 EOF
 
+### Create kernel Posttran script
+cat > $kernel_files-posttrans <<EOF
+if [ -x /usr/sbin/dkms_autoinstaller ]; then
+    /usr/sbin/dkms_autoinstaller start %{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
+fi
+EOF
 
 ### Create kernel Preun script on the fly
 cat > $kernel_files-preun <<EOF
@@ -1062,6 +1073,18 @@
 %endif
 
 %changelog
+* Thu Dec 22 2011 Thomas Backlund <tmb@mandriva.org> 3.1.6-1.mga2
+- update to 3.1.6
+- drop patch DS01 (merged)
+- trigger dkms build in posttrans so modules get built at kernel install
+  instead of at boot (speeds up boot time with new kernel)
+- update desktop(586) & laptop summaries and descriptions to point out that
+  only 3-3.5GB RAM is detected on 32bit, and that server kernel is needed to
+  fully support 4GB or more
+- switch transparent hugepages from on by default to madvise (only enabled
+  for apps that requests it), as it fixes desktop freeze when accessing
+  slow media such as usb (thanks to fbui/mdv mail on @cooker ml).
+
 * Fri Dec  9 2011 Thomas Backlund <tmb@mandriva.org> 3.1.5-1.mga2
 - update to 3.1.5
 - drop merged patches: