Author: glen Date: Tue Jan 22 10:13:41 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use source names everywhere for .config
---- Files affected:
SPECS:
kernel-desktop.spec (1.153 -> 1.154)
---- Diffs:
================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.153 SPECS/kernel-desktop.spec:1.154
--- SPECS/kernel-desktop.spec:1.153 Mon Jan 21 22:02:02 2008
+++ SPECS/kernel-desktop.spec Tue Jan 22 11:13:36 2008
@@ -63,7 +63,7 @@
%define _basever 2.6.22
%define _postver .16
-%define _rel 2
+%define _rel 3
%define _rc %{nil}
%define pname kernel-desktop
Summary: The Linux kernel (the core of the Linux operating system)
@@ -672,12 +672,12 @@
sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
%build
-KERNEL_BUILD_DIR=`pwd`
+KERNEL_BUILD_DIR=$(pwd)
Config="%{_target_base_arch}"
-cat %{SOURCE20} > .config
-cat $RPM_SOURCE_DIR/%{name}-$Config.config >> .config
+cat %{_sourcedir}/%{pname}-common.config > .config
+cat %{_sourcedir}/%{pname}-$Config.config >> .config
echo "CONFIG_LOCALVERSION=\"-%{_localversion}\"" >> .config
%ifarch %{ix86}
@@ -713,47 +713,47 @@
# preempt
%if %{with preemptrt}
- cat %{SOURCE41} >> .config
+cat %{_sourcedir}/%{pname}-preempt-rt.config >> .config
%else
- cat %{SOURCE42} >> .config
+cat %{_sourcedir}/%{pname}-preempt-nort.config >> .config
%endif
# suspend 2
-cat %{SOURCE43} >> .config
+cat %{_sourcedir}/%{pname}-suspend2.config >> .config
# fbsplash, vesafb-tng, squashfs, imq, tahoe, atm, reiser4
-cat %{SOURCE44} >> .config
+cat %{_sourcedir}/%{pname}-patches.config >> .config
# netfilter
-cat %{SOURCE45} >> .config
+cat %{_sourcedir}/%{pname}-netfilter.config >> .config
%if %{with grsec_minimal}
- cat %{SOURCE46} >> .config
+cat %{_sourcedir}/%{pname}-grsec.config >> .config
%endif
# wrr
-cat %{SOURCE47} >> .config
+cat %{_sourcedir}/%{pname}-wrr.config >> .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
+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:" \
- -e "s:CONFIG_HZ=1000:CONFIG_HZ=100:" \
- -i .config
+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:" \
+ -e "s:CONFIG_HZ=1000:CONFIG_HZ=100:" \
+ -i .config
%endif
%if %{with bootsplash}
- cat %{SOURCE49} >> .config
+ cat %{_sourcedir}/%{pname}-bootsplash.config >> .config
%else
- cat %{SOURCE48} >> .config
+ cat %{_sourcedir}/%{pname}-fbsplash.config >> .config
%endif
%{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:"
.config}
@@ -762,10 +762,10 @@
# disable e1000 on ppc (ICEs)
%ifarch ppc ppc64
- sed -e "s:CONFIG_E1000=m:# CONFIG_E1000 is not set:" \
- -e "s:CONFIG_E1000_NAPI=y:# CONFIG_E1000_NAPI is not set:" \
- -e "s:CONFIG_E1000_DISABLE_PACKET_SPLIT=y:#
CONFIG_E1000_DISABLE_PACKET_SPLIT is not set:" \
- -i .config
+sed -e "s:CONFIG_E1000=m:# CONFIG_E1000 is not set:" \
+ -e "s:CONFIG_E1000_NAPI=y:# CONFIG_E1000_NAPI is not set:" \
+ -e "s:CONFIG_E1000_DISABLE_PACKET_SPLIT=y:#
CONFIG_E1000_DISABLE_PACKET_SPLIT is not set:" \
+ -i .config
%endif
rm -f include/linux/autoconf.h
@@ -788,7 +788,6 @@
rm -f $RPM_BUILD_ROOT/COPYING
fi
-
install -d $RPM_BUILD_ROOT%{_kernelsrcdir}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
@@ -1077,6 +1076,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.154 2008-01-22 10:13:36 glen
+- use source names everywhere for .config
+
Revision 1.153 2008-01-21 21:02:02 glen
- use %{pname} as our %{name} changes when building for laptop, noticed by
@PaSzCzUs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.153&r2=1.154&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
