SPECS (LINUX_2_6): kernel.spec - added Software suspend by Cezary ...

cieciwa cieciwa at pld-linux.org
Mon Dec 19 09:28:38 CET 2005


Author: cieciwa                      Date: Mon Dec 19 08:28:38 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- added Software suspend by Cezary Krzyzanowski.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1350 -> 1.441.2.1351) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1350 SPECS/kernel.spec:1.441.2.1351
--- SPECS/kernel.spec:1.441.2.1350	Fri Dec 16 20:45:20 2005
+++ SPECS/kernel.spec	Mon Dec 19 09:28:31 2005
@@ -26,6 +26,7 @@
 %bcond_with	xendev		# build Xen-devel kernel
 %bcond_with	abi		# build with unix abi support
 %bcond_with	bootsplash	# build with bootsplash instead of fbsplash
+%bcond_with	suspend		# build with software suspend
 
 %if %{with xen0} || %{with xenU}
 %define with_xen 1
@@ -71,6 +72,10 @@
 xen0 conflicts with xenU
 %endif
 
+%ifnarch %{ix86}
+software suspend works only on ix86 platforms
+%endif
+
 %{?debug:%define with_verbose 1}
 
 %ifarch sparc
@@ -211,6 +216,7 @@
 Source94:	kernel-em8300.config
 Source95:	kernel-linuxabi.config
 Source96:	kernel-rt.config
+Source97:	kernel-suspend.config
 
 Patch1:		linux-2.6-version.patch
 Patch2:		linux-2.6-biarch-build.patch
@@ -1056,6 +1062,11 @@
 	sed -i 's,CONFIG_FB_SPLASH,CONFIG_BOOTSPLASH,' arch/%{_target_base_arch}/defconfig
 	sed -i 's,CONFIG_LOGO=y,# CONFIG_LOGO is not set,' arch/%{_target_base_arch}/defconfig
 %endif
+%if %{with_suspend}
+	if [ "$smp" != "yes" ]; then
+		cat %{SOURCE97} >> arch/%{_target_base_arch}/defconfig
+	fi
+%endif
 
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" arch/%{_target_base_arch}/defconfig}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{_target_base_arch}/defconfig}
@@ -1760,6 +1771,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1351  2005/12/19 08:28:31  cieciwa
+- added Software suspend by Cezary Krzyzanowski.
+
 Revision 1.441.2.1350  2005/12/16 19:45:20  charles
 - added bootsplash support (with bcond)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1350&r2=1.441.2.1351&f=u




More information about the pld-cvs-commit mailing list