Author: shadzik Date: Fri Dec 4 00:47:43 2009 GMT
Module: packages Tag: Titanium
---- Log message:
- merged from DEVEL
- Linux 2.6.32
---- Files affected:
packages/kernel-desktop:
kernel-desktop.spec (1.204.2.78 -> 1.204.2.79)
---- Diffs:
================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.78
packages/kernel-desktop/kernel-desktop.spec:1.204.2.79
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.78 Sat Nov 28
00:02:47 2009
+++ packages/kernel-desktop/kernel-desktop.spec Fri Dec 4 01:47:38 2009
@@ -36,6 +36,7 @@
%bcond_with grsec_minimal # build wihout grsec_minimal
%bcond_with sreadahead # uuooaaa, be frickin' fast at boot
%bcond_with bfs # Brain Fuck Scheduler - could be good only for
desktops/laptops/eeePC
+%bcond_without tuxonice # build without tuxonice support
%{?debug:%define with_verbose 1}
@@ -44,8 +45,8 @@
%define have_sound 1
%define have_isa 1
-%define _basever 2.6.31
-%define _postver .5
+%define _basever 2.6.32
+%define _postver %{nil}
%define _rel 1
%define _enable_debug_packages 0
@@ -74,7 +75,7 @@
License: GPL v2
Group: Base/Kernel
Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
-# Source0-md5: 84c077a37684e4cbfa67b18154390d8a
+# Source0-md5: 260551284ac224c3a43c4adac7df4879
%if "%{_postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
# Source1-md5: 6cac5e59d5562b591cdda485941204d5
@@ -87,11 +88,12 @@
Source10: kernel-desktop-x86.config
Source11: kernel-desktop-x86_64.config
Source12: kernel-desktop-grsec_minimal.config
+Source13: kernel-desktop-tuxonice.config
#### Patches ######
#Source100:
http://www.tuxonice.net/downloads/all/tuxonice-3.0.1-for-2.6.29.patch.bz2
-Source100:
http://www.tuxonice.net/downloads/all/current-tuxonice-for-2.6.31.patch-20091009-v1.bz2
-# Source100-md5: 8066cf922d24d227bf8e849dcba2e0b3
+Source100:
http://www.tuxonice.net/downloads/all/current-tuxonice-for-head.patch-20091009-v1.bz2
+# Source100-md5: 653957b7b2f7492a255fa17f7530c36f
Patch0: kernel-desktop-bootsplash.patch
#
http://download.filesystems.org/unionfs/stable/unionfs-2.5.2_for_2.6.30.diff.gz
Patch1: kernel-desktop-unionfs.patch
@@ -101,12 +103,6 @@
Patch4: kernel-desktop-trace-open.patch
# replace for cfs : http://ck.kolivas.org/patches/bfs/ see bfs-faq.txt
Patch5: kernel-desktop-sched-bfs.patch
-# keyboard hang patch - 2.6.31 regression
-Patch6: kernel-desktop-bug-14388-keyboard-hang-on-x.patch
-# DRM driver for old ATI Mach64 cards
-Patch7: kernel-gpu-drm-mach64.patch
-Patch8: kernel-gpu-drm-mach64-fixes.patch
-Patch9: kernel-gpu-drm-mach64-2.6.31.patch
#### End patches ##
URL: http://www.kernel.org/
@@ -439,7 +435,9 @@
# unionfs
%patch1 -p1
# TuxOnIce
+%if %{with tuxonice}
%{__bzip2} -dc %{SOURCE100} | patch -p1 -s
+%endif
# small_fixes.patch - this breaks compilation on mm/swapfile.c - to remove?
#%patch2 -p1
# grsec-minimal
@@ -454,12 +452,6 @@
%if %{with bfs}
%patch5 -p1
%endif
-# keyboard patch
-%patch6 -p1
-# mach64 drm
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
# Fix EXTRAVERSION in main Makefile
sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
@@ -528,6 +520,11 @@
%__sed -i "s:# CONFIG_HZ_100 is not set:CONFIG_HZ_100=y:" %{defconfig}
%__sed -i "s:CONFIG_HZ_1000=y:# CONFIG_HZ_1000 is not set:" %{defconfig}
%__sed -i "s:CONFIG_HZ=1000:CONFIG_HZ=100:" %{defconfig}
+%__sed -i "s:# CONFIG_NO_HZ is not set:CONFIG_NO_HZ=y:" %{defconfig}
+%endif
+
+%if %{with tuxonice}
+cat %{SOURCE13} >> %{defconfig}
%endif
%if %{with grsec_minimal}
@@ -909,6 +906,7 @@
%{_kernelsrcdir}/scripts/basic
%{_kernelsrcdir}/scripts/mkmakefile
%{_kernelsrcdir}/scripts/mod
+%{_kernelsrcdir}/scripts/module-common.lds
%{_kernelsrcdir}/scripts/setlocalversion
%{_kernelsrcdir}/scripts/*.c
%{_kernelsrcdir}/scripts/*.sh
@@ -978,9 +976,51 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.204.2.78 2009/11/27 23:02:47 hawk
-- added support for ATI Mach64 DRM, taken from Mandriva but originates
- from freedesktop.org
+Revision 1.204.2.79 2009/12/04 00:47:38 shadzik
+- merged from DEVEL
+- Linux 2.6.32
+
+Revision 1.204.2.77.2.13 2009/12/04 00:43:23 shadzik
+- Linux 2.6.32 stable
+
+Revision 1.204.2.77.2.12 2009/11/30 11:33:15 shadzik
+- new tuxonice
+- rel .2
+
+Revision 1.204.2.77.2.11 2009/11/29 17:00:18 evil
+- set CONFIG_NO_HZ=y when building laptop kernel
+
+Revision 1.204.2.77.2.10 2009/11/21 02:28:29 shadzik
+- rc8
+
+Revision 1.204.2.77.2.9 2009/11/16 03:40:56 shadzik
+- rel .4
+
+Revision 1.204.2.77.2.8 2009/11/16 02:54:44 shadzik
+- rel .3
+
+Revision 1.204.2.77.2.7 2009/11/16 01:02:14 shadzik
+- rel .2
+
+Revision 1.204.2.77.2.6 2009/11/15 22:32:01 shadzik
+- rc7
+
+Revision 1.204.2.77.2.5 2009/11/15 11:57:44 shadzik
+- add %{_kernelsrcdir}/scripts/module-common.lds
+
+Revision 1.204.2.77.2.4 2009/11/04 00:00:30 shadzik
+- rc6
+- remove intelfbc hack
+
+Revision 1.204.2.77.2.3 2009/10/25 20:48:21 shadzik
+- patch -p0
+
+Revision 1.204.2.77.2.2 2009/10/25 20:43:45 shadzik
+- add patch6
+
+Revision 1.204.2.77.2.1 2009/10/25 18:52:24 shadzik
+- Linux 2.6.32-rc5
+- build --without tuxoince
Revision 1.204.2.77 2009/10/23 17:37:36 shadzik
- Linux 2.6.31.5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.78&r2=1.204.2.79&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
