SPECS: kernel-desktop.spec - prep for 2.6.25, merge build from vanilla head...

[glen]

Author: glen                         Date: Thu May 15 14:45:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- prep for 2.6.25, merge build from vanilla head, cosmetics

---- Files affected:
SPECS:
   kernel-desktop.spec (1.199 -> 1.200) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.199 SPECS/kernel-desktop.spec:1.200
--- SPECS/kernel-desktop.spec:1.199	Fri May  2 13:26:52 2008
+++ SPECS/kernel-desktop.spec	Thu May 15 16:45:04 2008
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 #
 # TODO:
+# - waiting for ck patch for 2.6.25
 # - http://dev.gentoo.org/~spock/projects/fbcondecor/ -
 #   fbsplash patch was renamed to fbcondecor and the gensplash project took the name of fbsplash.
 # - pcmcia moved to main pkg (pcmcia.ko only or subpkg killed?):
@@ -74,13 +75,9 @@
 %define		kernel_release %{version}_%{alt_kernel}-%{_localversion}
 %define		_kernelsrcdir	/usr/src/linux-%{version}_%{alt_kernel}
 
-%define		_basever	2.6.24
-%define		_postver	.5
-%define		_rel		0.1
-%define		_rc	%{nil}
-
-%define		_enable_debug_packages			0
-%define		netfilter_snap		20061213
+%define		basever	2.6.25
+%define		postver	.3
+%define		rel		0.1
 
 %define		pname	kernel-desktop
 Summary:	The Linux kernel (the core of the Linux operating system)
@@ -89,15 +86,15 @@
 Summary(fr.UTF-8):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):	Jądro Linuksa
 Name:		kernel-%{alt_kernel}
-Version:	%{_basever}%{_postver}
-Release:	%{_rel}
+Version:	%{basever}%{postver}
+Release:	%{rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
-# Source0-md5:	3f23ad4b69d0a552042d1ed0f4399857
+Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
+# Source0-md5:	db95a49a656a3247d4995a797d333153
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	e937c732891561f0a34a2e0853df825e
+# Source1-md5:	49c56cf1394b2286033bb10c7cef7260
 Source2:	kernel-vanilla-module-build.pl
 Source3:	kernel-config.py
 Source4:	kernel-config-update.py
@@ -301,8 +298,9 @@
 %define		initrd_dir	/boot
 
 %define		topdir	%{_builddir}/%{name}-%{version}
-%define		srcdir	%{topdir}/linux-%{_basever}
-%define		objdir	%{topdir}/o
+%define		srcdir	%{topdir}/linux-%{basever}
+%define		objdir		%{topdir}/%{targetobj}
+%define		targetobj	%{_target_base_arch}-gcc-%(%{kgcc} -dumpversion)
 
 %define		CommonOpts	HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall -Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
 %if "%{_target_base_arch}" != "%{_arch}"
@@ -552,14 +550,13 @@
 
 %prep
 %setup -qc
-install -d o/scripts
-ln -s %{SOURCE2} o/scripts/kernel-module-build.pl
-ln -s %{SOURCE3} o/scripts/kernel-config.py
-ln -s %{SOURCE4} o/scripts/kernel-config-update.py
+ln -s %{SOURCE2} kernel-module-build.pl
+ln -s %{SOURCE3} kernel-config.py
+ln -s %{SOURCE4} kernel-config-update.py
 ln -s %{SOURCE5} Makefile
 
-cd linux-%{_basever}
-%if "%{_postver}" != "%{nil}"
+cd linux-%{basever}
+%if "%{postver}" != "%{nil}"
 %{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
 %endif
 
@@ -711,16 +708,17 @@
 #%patch106 -p1 # FIND UPDATE
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}_%{alt_kernel}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}_%{alt_kernel}#g' Makefile
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %if %{without noarch}
 %build
-cat > multiarch.make <<'EOF'
+install -d %{objdir}
+cat > %{targetobj}.mk <<'EOF'
 # generated by %{name}.spec
-KERNELSRC		:= %{_builddir}/%{name}-%{version}/linux-%{_basever}
+KERNELSRC		:= %{_builddir}/%{name}-%{version}/linux-%{basever}
 KERNELOUTPUT	:= %{objdir}
 
 SRCARCH		:= %{target_arch_dir}
@@ -843,10 +841,10 @@
 
 # generate .config and kernel.conf
 pykconfig > %{objdir}/.kernel-autogen.conf
-%{__make} pykconfig
+%{__make} TARGETOBJ=%{targetobj} pykconfig
 
 # build kernel
-%{__make} all
+%{__make} TARGETOBJ=%{targetobj} all
 %endif # arch build
 
 %install
@@ -924,7 +922,7 @@
 # Usage: kernel-module-build.pl $rpmdir $fileoutdir
 fileoutdir=$(pwd)
 cd $RPM_BUILD_ROOT%{_kernelsrcdir}
-%{objdir}/scripts/kernel-module-build.pl %{_kernelsrcdir} $fileoutdir
+%{topdir}/kernel-module-build.pl %{_kernelsrcdir} $fileoutdir
 cd -
 
 %clean
@@ -1015,7 +1013,7 @@
 ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}/source
 
 %triggerun module-build -- %{name} = %{epoch}:%{version}-%{release}
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
 	rm -f /lib/modules/%{kernel_release}/{build,source}
 fi
 
@@ -1184,6 +1182,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200  2008-05-15 14:45:04  glen
+- prep for 2.6.25, merge build from vanilla head, cosmetics
+
 Revision 1.199  2008-05-02 11:26:52  glen
 - merge --with-fbcondecor arg from LINUX-2_6_24
 
================================================================

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