Author: glen Date: Sun Apr 23 14:33:44 2006 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- tabs
---- Files affected:
SPECS:
kernel.spec (1.441.2.1508 -> 1.441.2.1509)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1508 SPECS/kernel.spec:1.441.2.1509
--- SPECS/kernel.spec:1.441.2.1508 Sun Apr 23 16:30:32 2006
+++ SPECS/kernel.spec Sun Apr 23 16:33:38 2006
@@ -9,7 +9,7 @@
%bcond_without source # don't build kernel-source package
%bcond_without pcmcia # don't build pcmcia
-%bcond_with preemptive # build preemptive kernel
+%bcond_with preemptive # build preemptive kernel
%bcond_with suspend2 # build software suspend support
%bcond_with verbose # verbose build (V=1)
%bcond_with vserver # added vserver.
@@ -774,51 +774,51 @@
%build
TuneUpConfigForIX86 () {
%ifarch %{ix86}
- %ifnarch i386
+ %ifnarch i386
sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1
- %endif
- %ifarch i486
+ %endif
+ %ifarch i486
sed -i 's:# CONFIG_M486 is not set:CONFIG_M486=y:' $1
- %endif
- %ifarch i586
+ %endif
+ %ifarch i586
sed -i 's:# CONFIG_M586 is not set:CONFIG_M586=y:' $1
- %endif
- %ifarch i686
+ %endif
+ %ifarch i686
sed -i 's:# CONFIG_M686 is not set:CONFIG_M686=y:' $1
- %endif
- %ifarch pentium3
+ %endif
+ %ifarch pentium3
sed -i 's:# CONFIG_MPENTIUMIII is not set:CONFIG_MPENTIUMIII=y:' $1
- %endif
- %ifarch pentium4
+ %endif
+ %ifarch pentium4
sed -i 's:# CONFIG_MPENTIUM4 is not set:CONFIG_MPENTIUM4=y:' $1
- %endif
- %ifarch athlon
+ %endif
+ %ifarch athlon
sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
- %endif
- %ifarch i686 athlon pentium3 pentium4
+ %endif
+ %ifarch i686 athlon pentium3 pentium4
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_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:'
$1
- %endif
- %if %{with regparm}
+ %endif
+ %if %{with regparm}
sed -i 's:# CONFIG_REGPARM is not set:CONFIG_REGPARM=y:' $1
- %endif
+ %endif
%endif
}
%if "%{_target_base_arch}" != "%{_arch}"
- CrossOpts="ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-"
- DepMod=/bin/true
- %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
+ CrossOpts="ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-"
+ DepMod=/bin/true
+ %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
DepMod=/sbin/depmod
- %endif
- %if "%{_arch}" == "x86_64" && "%_target_base_arch}" == "i386"
+ %endif
+ %if "%{_arch}" == "x86_64" && "%_target_base_arch}" == "i386"
CrossOpts="ARCH=%{_target_base_arch}"
DepMod=/sbin/depmod
- %endif
+ %endif
%else
- CrossOpts=""
- DepMod=/sbin/depmod
+ CrossOpts=""
+ DepMod=/sbin/depmod
%endif
@@ -986,7 +986,7 @@
%{__make} $CrossOpts modules_install \
%{?with_verbose:V=1} \
DEPMOD=$DepMod \
- INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
+ INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
KERNELRELEASE=$KernelVer
if [ "$smp" = "yes" ]; then
@@ -1029,17 +1029,17 @@
umask 022
%if "%{_target_base_arch}" != "%{_arch}"
- CrossOpts="ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-"
- export DEPMOD=/bin/true
- %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
+ CrossOpts="ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-"
+ export DEPMOD=/bin/true
+ %if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
unset DEPMOD
- %endif
- %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
+ %endif
+ %if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
CrossOpts="ARCH=%{_target_base_arch}"
unset DEPMOD
- %endif
+ %endif
%else
- CrossOpts=""
+ CrossOpts=""
%endif
@@ -1108,7 +1108,7 @@
%preun
rm -f /lib/modules/%{version}-%{release}/modules.*
if [ -x /sbin/new-kernel-pkg ]; then
- /sbin/new-kernel-pkg --remove %{version}-%{release}
+ /sbin/new-kernel-pkg --remove %{version}-%{release}
fi
%post
@@ -1180,7 +1180,7 @@
%preun smp
rm -f /lib/modules/%{version}-%{release}smp/modules.*
if [ -x /sbin/new-kernel-pkg ]; then
- /sbin/new-kernel-pkg --remove %{version}-%{release}smp
+ /sbin/new-kernel-pkg --remove %{version}-%{release}smp
fi
%post smp
@@ -1592,6 +1592,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1509 2006/04/23 14:33:38 glen
+- tabs
+
Revision 1.441.2.1508 2006/04/23 14:30:32 glen
- fix unbalanced conditional
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1508&r2=1.441.2.1509&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
