Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26373
Modified Files:
kernel-2.6.spec
Log Message:
Use version for config files instead of kversion
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3254
retrieving revision 1.3255
diff -u -r1.3254 -r1.3255
--- kernel-2.6.spec 3 Jul 2007 15:23:38 -0000 1.3254
+++ kernel-2.6.spec 3 Jul 2007 15:42:59 -0000 1.3255
@@ -238,7 +238,7 @@
%ifarch noarch
%define with_up 0
%define with_headers 0
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-*.config
%endif
# don't sign modules on these platforms
@@ -254,7 +254,7 @@
# Per-arch tweaks
%ifarch %{all_x86}
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-i?86*.config
%define image_install_path boot
%define hdrarch i386
# we build always xen i686 HV with pae
@@ -262,12 +262,12 @@
%endif
%ifarch x86_64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-x86_64*.config
%define image_install_path boot
%endif
%ifarch ppc64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-ppc64*.config
%define image_install_path boot
%define make_target vmlinux
%define kernel_image vmlinux
@@ -276,7 +276,7 @@
%endif
%ifarch s390x
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-s390x.config
%define image_install_path boot
%define make_target image
%define kernel_image arch/s390/boot/image
@@ -284,19 +284,19 @@
%endif
%ifarch sparc
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-sparc.config
%define make_target image
%define kernel_image image
%endif
%ifarch sparc64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-sparc64*.config
%define make_target image
%define kernel_image image
%endif
%ifarch ppc
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc{-,.}*config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-ppc{-,.}*config
%define image_install_path boot
%define make_target vmlinux
%define kernel_image vmlinux
@@ -305,7 +305,7 @@
%endif
%ifarch ia64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-ia64*.config
%define image_install_path boot/efi/EFI/redhat
%define make_target compressed
%define kernel_image vmlinux.gz
@@ -316,7 +316,7 @@
%endif
%ifarch alpha alphaev56
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-alpha*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{version}-alpha*.config
%define image_install_path boot
%define make_target vmlinux
%define kernel_image vmlinux
@@ -430,35 +430,35 @@
Source14: find-provides
Source15: merge.pl
-Source20: kernel-%{kversion}-i586.config
-Source21: kernel-%{kversion}-i686.config
-Source22: kernel-%{kversion}-i686-debug.config
-Source23: kernel-%{kversion}-i686-PAE.config
-Source24: kernel-%{kversion}-i686-PAE-debug.config
-
-Source25: kernel-%{kversion}-x86_64.config
-Source26: kernel-%{kversion}-x86_64-debug.config
-
-Source28: kernel-%{kversion}-ppc.config
-Source29: kernel-%{kversion}-ppc-smp.config
-Source30: kernel-%{kversion}-ppc64.config
-Source31: kernel-%{kversion}-ppc64-kdump.config
-
-Source35: kernel-%{kversion}-s390x.config
-
-Source36: kernel-%{kversion}-ia64.config
-
-Source37: kernel-%{kversion}-i686-xen.config
-Source38: kernel-%{kversion}-x86_64-xen.config
-Source39: kernel-%{kversion}-ia64-xen.config
-
-#Source50: kernel-%{kversion}-sparc.config
-#Source51: kernel-%{kversion}-sparc64.config
-#Source52: kernel-%{kversion}-sparc64-smp.config
-
-#Source60: kernel-%{kversion}-alpha.config
-#Source61: kernel-%{kversion}-alphaev56.config
-#Source62: kernel-%{kversion}-alphaev56-smp.config
+Source20: kernel-%{version}-i586.config
+Source21: kernel-%{version}-i686.config
+Source22: kernel-%{version}-i686-debug.config
+Source23: kernel-%{version}-i686-PAE.config
+Source24: kernel-%{version}-i686-PAE-debug.config
+
+Source25: kernel-%{version}-x86_64.config
+Source26: kernel-%{version}-x86_64-debug.config
+
+Source28: kernel-%{version}-ppc.config
+Source29: kernel-%{version}-ppc-smp.config
+Source30: kernel-%{version}-ppc64.config
+Source31: kernel-%{version}-ppc64-kdump.config
+
+Source35: kernel-%{version}-s390x.config
+
+Source36: kernel-%{version}-ia64.config
+
+Source37: kernel-%{version}-i686-xen.config
+Source38: kernel-%{version}-x86_64-xen.config
+Source39: kernel-%{version}-ia64-xen.config
+
+#Source50: kernel-%{version}-sparc.config
+#Source51: kernel-%{version}-sparc64.config
+#Source52: kernel-%{version}-sparc64-smp.config
+
+#Source60: kernel-%{version}-alpha.config
+#Source61: kernel-%{version}-alphaev56.config
+#Source62: kernel-%{version}-alphaev56-smp.config
Source80: config-rhel-generic
Source81: config-rhel-x86-generic
@@ -895,7 +895,7 @@
$RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
rm $i.tmp
done
- for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i686,i686-PAE,x86_64}*.config
+ for i in $RPM_SOURCE_DIR/kernel-%{version}-{i686,i686-PAE,x86_64}*.config
do
echo i is this file $i
mv $i $i.tmp
@@ -1170,7 +1170,7 @@
cp -f %{all_arch_configs} .
%if !%{with_debug}
-rm -f kernel-%{kversion}-*-debug.config
+rm -f kernel-%{version}-*-debug.config
%endif
# now run oldconfig over all the config files
@@ -1227,11 +1227,11 @@
# Pick the right config file for the kernel we're building
if [ -n "$Flavour" ] ; then
- Config=kernel-%{kversion}-%{_target_cpu}-$Flavour.config
+ Config=kernel-%{version}-%{_target_cpu}-$Flavour.config
DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour-%{_target_cpu}
DevelLink=/usr/src/kernels/%{KVERREL}$Flavour-%{_target_cpu}
else
- Config=kernel-%{kversion}-%{_target_cpu}.config
+ Config=kernel-%{version}-%{_target_cpu}.config
DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu}
DevelLink=
fi