packages: kernel/kernel.spec - die tuxonice, die - http://lists.tuxonice.ne...

[arekm]

Author: arekm                        Date: Thu Nov 10 16:01:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- die tuxonice, die - http://lists.tuxonice.net/pipermail/tuxonice-devel/2011-November/007043.html

---- Files affected:
packages/kernel:
   kernel.spec (1.996 -> 1.997) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.996 packages/kernel/kernel.spec:1.997
--- packages/kernel/kernel.spec:1.996	Sun Oct 30 07:33:38 2011
+++ packages/kernel/kernel.spec	Thu Nov 10 17:01:31 2011
@@ -41,7 +41,6 @@
 %bcond_without	ipv6		# ipv6 support
 
 %bcond_without	vserver		# support for VServer (enabled by default)
-%bcond_with	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
 
 %bcond_with	vanilla		# don't include any patches
 %bcond_with	rescuecd	# build kernel for our rescue
@@ -68,7 +67,6 @@
 %define		have_pcmcia	1
 
 %if %{with rescuecd}
-%unglobal	with_tuxonice
 %unglobal	with_grsecurity
 %unglobal	with_pax
 %unglobal	with_vserver
@@ -97,7 +95,6 @@
 %define		basever		3.1
 %define		postver		.0
 
-%define		tuxonice_version	3.2
 %define		module_init_tools_ver	3.16
 
 # __alt_kernel is list of features, empty string if none set
@@ -161,7 +158,6 @@
 Source25:	kernel-ia64.config
 
 Source41:	kernel-patches.config
-Source42:	kernel-tuxonice.config
 Source43:	kernel-vserver.config
 Source45:	kernel-grsec.config
 
@@ -226,15 +222,6 @@
 # http://synce.svn.sourceforge.net/svnroot/synce/trunk/patches/linux-2.6.22-rndis_host-wm5.patch
 Patch59:	kernel-rndis_host-wm5.patch
 
-# Project suspend2 renamed to tuxonice
-# http://tuxonice.net/files/current-tuxonice-for-2.6.37.patch_0.bz2
-# NOTE: currently using own diff from tuxonice git tree until official patch is released
-# git://git.kernel.org/pub/scm/linux/kernel/git/nigelc/tuxonice-head.git
-# git://git.kernel.org/pub/scm/linux/kernel/git/nigelc/tuxonice-<basever>.git
-# To produce patch: git diff upstream/master...tuxonice/combined
-Patch69:	kernel-tuxonice.patch
-Patch70:	kernel-tuxonice-headers.patch
-
 # adds some ids for hostap suported cards and monitor_enable from/for aircrack-ng
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	kernel-hostap.patch
@@ -666,12 +653,6 @@
 
 %if %{without vanilla}
 
-# tuxonice:
-%if %{with tuxonice}
-%patch69 -p1
-%patch70 -p1
-%endif
-
 %if %{with fbcondecor}
 %patch3 -p1
 %endif
@@ -995,11 +976,6 @@
 %if %{with vserver}
 		%{SOURCE43} \
 %endif
-%if %{with tuxonice}
-%ifarch %{ix86} %{x8664} ia64 ppc ppc64
-		%{SOURCE42} \
-%endif
-%endif
 		%{SOURCE41} %{?0:patches} \
 %endif
 		%{SOURCE20} \
@@ -1526,6 +1502,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.997  2011/11/10 16:01:31  arekm
+- die tuxonice, die - http://lists.tuxonice.net/pipermail/tuxonice-devel/2011-November/007043.html
+
 Revision 1.996  2011/10/30 06:33:38  arekm
 - update imq, vserver patches; drop forcedeth ugly HACK (if it's not fixed upstream contact me)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.996&r2=1.997&f=u