packages (Titanium): kernel-desktop/kernel-desktop.spec - fix BFS on x86_64...

[cactus]

Author: cactus                       Date: Mon Oct 17 21:10:59 2011 GMT
Module: packages                      Tag: Titanium
---- Log message:
- fix BFS on x86_64
- use macro for sed patch

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.165 -> 1.204.2.166) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.165 packages/kernel-desktop/kernel-desktop.spec:1.204.2.166
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.165	Fri Oct 14 20:58:39 2011
+++ packages/kernel-desktop/kernel-desktop.spec	Mon Oct 17 23:10:54 2011
@@ -455,7 +455,7 @@
 %endif
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:-%{alt_kernel}}#g' Makefile
+%__sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:-%{alt_kernel}}#g' Makefile
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -470,35 +470,34 @@
 	pae=yes
 	%endif
 	%ifnarch i386
-	sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1
+	%__sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1
 	%endif
 	%ifarch i486
-	sed -i 's:# CONFIG_M486 is not set:CONFIG_M486=y:' $1
+	%__sed -i 's:# CONFIG_M486 is not set:CONFIG_M486=y:' $1
 	%endif
 	%ifarch i586
-	sed -i 's:# CONFIG_M586 is not set:CONFIG_M586=y:' $1
+	%__sed -i 's:# CONFIG_M586 is not set:CONFIG_M586=y:' $1
 	%endif
 	%ifarch i686
-	sed -i 's:# CONFIG_M686 is not set:CONFIG_M686=y:' $1
+	%__sed -i 's:# CONFIG_M686 is not set:CONFIG_M686=y:' $1
 	%endif
 	%ifarch pentium3
-	sed -i 's:# CONFIG_MPENTIUMIII is not set:CONFIG_MPENTIUMIII=y:' $1
+	%__sed -i 's:# CONFIG_MPENTIUMIII is not set:CONFIG_MPENTIUMIII=y:' $1
 	%endif
 	%ifarch pentium4
-	sed -i 's:# CONFIG_MPENTIUM4 is not set:CONFIG_MPENTIUM4=y:' $1
+	%__sed -i 's:# CONFIG_MPENTIUM4 is not set:CONFIG_MPENTIUM4=y:' $1
 	%endif
 	%ifarch athlon
-	sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
+	%__sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
 	%endif
 	%ifarch i686 athlon pentium3 pentium4
 	if [ "$pae" = "yes" ]; then
-		sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
-		sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
+		%__sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
+		%__sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
 		echo "CONFIG_I2O_EXT_ADAPTEC_DMA64=y" >> $1
 	fi
-	sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:' $1
+	%__sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:' $1
 	%endif
-	sed -i 's:# CONFIG_SCHED_BFS is not set:CONFIG_SCHED_BFS=y:' $1
 	return 0
 %endif
 }
@@ -512,9 +511,11 @@
 	cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config > %{defconfig}
 	TuneUpConfigForIX86 %{defconfig}
 
-%{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" %{defconfig}}
-%{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" %{defconfig}}
-%{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" %{defconfig}}
+%{?debug:%__sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" %{defconfig}}
+%{?debug:%__sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" %{defconfig}}
+%{?debug:%__sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" %{defconfig}}
+
+%__sed -i 's:# CONFIG_SCHED_BFS is not set:CONFIG_SCHED_BFS=y:' %{defconfig}
 	
 %ifarch i586
 %__sed -i 's:CONFIG_X86_CMOV=y:# CONFIG_X86_CMOV is not set:' %{defconfig}
@@ -981,6 +982,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.166  2011/10/17 21:10:54  cactus
+- fix BFS on x86_64
+- use macro for sed patch
+
 Revision 1.204.2.165  2011/10/14 18:58:39  cactus
 - up to 3.0.6
 
================================================================

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