Author: shadzik Date: Sun Oct 25 18:52:29 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- Linux 2.6.32-rc5
- build --without tuxoince
---- Files affected:
packages/kernel-desktop:
kernel-desktop.spec (1.204.2.77 -> 1.204.2.77.2.1)
---- Diffs:
================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.77
packages/kernel-desktop/kernel-desktop.spec:1.204.2.77.2.1
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.77 Fri Oct 23
19:37:36 2009
+++ packages/kernel-desktop/kernel-desktop.spec Sun Oct 25 19:52:24 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,9 +45,9 @@
%define have_sound 1
%define have_isa 1
-%define _basever 2.6.31
-%define _postver .5
-%define _rel 1
+%define _basever 2.6.32
+%define _postver %{nil}
+%define _rel 0.rc5.1
%define _enable_debug_packages 0
@@ -73,8 +74,8 @@
Epoch: 3
License: GPL v2
Group: Base/Kernel
-Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
-# Source0-md5: 84c077a37684e4cbfa67b18154390d8a
+Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{_basever}-rc5.tar.bz2
+# Source0-md5: f5959aae6459e552a37f05bf79b2ee68
%if "%{_postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
# Source1-md5: 6cac5e59d5562b591cdda485941204d5
@@ -87,6 +88,7 @@
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
@@ -101,8 +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
#### End patches ##
URL: http://www.kernel.org/
@@ -424,7 +424,7 @@
/usr/src/linux/Documentation.
%prep
-%setup -q -n linux-%{_basever}
+%setup -q -n linux-%{_basever}-rc5
%if "%{_postver}" != "%{nil}"
%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
@@ -435,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
@@ -450,8 +452,6 @@
%if %{with bfs}
%patch5 -p1
%endif
-# keyboard patch
-%patch6 -p1
# Fix EXTRAVERSION in main Makefile
sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
@@ -522,6 +522,10 @@
%__sed -i "s:CONFIG_HZ=1000:CONFIG_HZ=100:" %{defconfig}
%endif
+%if %{with tuxonice}
+cat %{SOURCE13} >> %{defconfig}
+%endif
+
%if %{with grsec_minimal}
cat %{SOURCE12} >> %{defconfig}
%endif
@@ -970,6 +974,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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.77&r2=1.204.2.77.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
