Author: glen Date: Wed Aug 29 10:31:21 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add HZ back to ix86 but i386
- no obvious reasons for doing mrproper and other partial rules, so do just
silentoldconfig
---- Files affected:
SPECS:
kernel-desktop.spec (1.118 -> 1.119)
---- Diffs:
================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.118 SPECS/kernel-desktop.spec:1.119
--- SPECS/kernel-desktop.spec:1.118 Tue Aug 28 19:46:50 2007
+++ SPECS/kernel-desktop.spec Wed Aug 29 12:31:16 2007
@@ -20,6 +20,7 @@
# - check for all patches update
# - links and descriptions above al PatchesXXX and %patchXXX
# - update common config for unionfs and PF_RING
+# - disable vserver
#
# Conditional build:
%bcond_without source # don't build kernel-source package
@@ -86,7 +87,7 @@
%define _basever 2.6.22
%define _postver .5
-%define _rel 0.1
+%define _rel 0.6
%define _rc %{nil}
Summary: The Linux kernel (the core of the Linux operating system)
Summary(de.UTF-8): Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -770,6 +771,15 @@
# wrr
cat %{SOURCE47} >> .config
+%ifarch %{ix86}
+%ifnarch i386
+ sed -e "s:CONFIG_NO_HZ=y:# CONFIG_NO_HZ is not set:" \
+ -e "s:# CONFIG_HZ_1000 is not set:CONFIG_HZ_1000=y:" \
+ -e "s:# CONFIG_HZ is not set:CONFIG_HZ=1000:"
\
+ -i .config
+%endif
+%endif
+
%if %{with laptop}
sed -e "s:CONFIG_HZ_1000=y:# CONFIG_HZ_1000 is not set:" \
-e "s:# CONFIG_HZ_100 is not set:CONFIG_HZ_100=y:" \
@@ -796,24 +806,13 @@
%endif
rm -f include/linux/autoconf.h
-%{__make} %{MakeOpts} include/linux/autoconf.h
+%{__make} %{MakeOpts} silentoldconfig
install .config arch/%{_target_base_arch}/defconfig
-
# Build kernel
-
-%{__make} %{MakeOpts} mrproper
-install arch/%{_target_base_arch}/defconfig .config
-
-%{__make} %{MakeOpts} clean
-
-%{__make} %{MakeOpts} include/linux/version.h \
- %{?with_verbose:V=1}
-
%{__make} %{MakeOpts} \
%{?with_verbose:V=1}
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/boot,%{_kernelsrcdir}}
@@ -830,7 +829,7 @@
install -d $RPM_BUILD_ROOT%{_kernelsrcdir}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
-KERNEL_BUILD_DIR=`pwd`
+KERNEL_BUILD_DIR=$(pwd)
# Install modules
@@ -1120,6 +1119,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.119 2007/08/29 10:31:16 glen
+- add HZ back to ix86 but i386
+- no obvious reasons for doing mrproper and other partial rules, so do just
silentoldconfig
+
Revision 1.118 2007/08/28 17:46:50 czarny
- pcc ICE patch
- comments for almost all patches (source link)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.118&r2=1.119&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
