SPECS (LINUX_2_6): kernel.spec - use common kernel-{powerpc, x86}.config files

[sparky]

Author: sparky                       Date: Sun Oct 19 22:56:06 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- use common kernel-{powerpc,x86}.config files

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1979 -> 1.441.2.1980) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1979 SPECS/kernel.spec:1.441.2.1980
--- SPECS/kernel.spec:1.441.2.1979	Sun Oct 19 22:25:52 2008
+++ SPECS/kernel.spec	Mon Oct 20 00:55:58 2008
@@ -161,15 +161,13 @@
 # not used by kernel.spec, but it's good to have it in SOURCES
 Source9:	kernel-config-sort.pl
 
-Source19:	kernel-multiarch.config
-Source20:	kernel-i386.config
-Source21:	kernel-x86_64.config
+Source20:	kernel-multiarch.config
+Source21:	kernel-x86.config
 Source22:	kernel-sparc.config
 Source23:	kernel-sparc64.config
 Source24:	kernel-alpha.config
-Source25:	kernel-ppc.config
+Source25:	kernel-powerpc.config
 Source26:	kernel-ia64.config
-Source27:	kernel-ppc64.config
 
 Source40:	kernel-netfilter.config
 Source41:	kernel-squashfs.config
@@ -1019,9 +1017,9 @@
 	set -e
 
 	# is this a special kernel we want to build?
-	Config="%{_target_base_arch}"
+	Config="%{target_arch_dir}"
 	KernelVer=%{kernel_release}
-	echo "Building config file using $Config.conf..."
+	echo "Building config file for %{_target_cpu} using kernel-$Config.config et al."
 
 	# prepare local and important options
 	cat <<-EOCONFIG > important.config
@@ -1138,7 +1136,7 @@
 %endif
 		%{SOURCE40} %{?0:netfilter} \
 		%{SOURCE41} %{?0:squashfs} \
-		%{SOURCE19} \
+		%{SOURCE20} \
 		$RPM_SOURCE_DIR/kernel-$Config.config \
 		> %{defconfig}
 }
@@ -1659,6 +1657,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1980  2008/10/19 22:55:58  sparky
+- use common kernel-{powerpc,x86}.config files
+
 Revision 1.441.2.1979  2008/10/19 20:25:52  sparky
 - kernel-config.awk: specify prefered archs as list
 
================================================================

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