rpms/kernel-xen-2.6/F-7 kernel.spec,1.1.2.9,1.1.2.10

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22916

Modified Files:
      Tag: private-ehabkost-debuginfo-branch
	kernel.spec 
Log Message:
Rebase over most recent non-xen kernel spec



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/Attic/kernel.spec,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- kernel.spec	18 Oct 2007 15:23:20 -0000	1.1.2.9
+++ kernel.spec	18 Oct 2007 17:39:25 -0000	1.1.2.10
@@ -59,7 +59,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 12
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -110,7 +110,7 @@
 %define usesparse 1
 %endif
 
-# defaults for the non-xen package
+# defaults for the non-xen package:
 
 # don't include xen patches
 %define includexen 0
@@ -118,6 +118,10 @@
 # don't build xen variant
 %define with_xen 0
 
+# Install vdso files
+%define do_vdso_install 1
+
+
 # Magic that will be enabled for the kernel-xen-2.6 Fedora package:
 %if 0%{?xen_package_magic}
 
@@ -127,6 +131,9 @@
 # Enable the xen variant
 %define with_xen 1
 
+# No vdso files
+%define do_vdso_install 0
+
 # Disable all other variants
 %define with_xenonly 1
 
@@ -141,6 +148,7 @@
 
 %endif   # (xen_package_magic)
 
+
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
@@ -175,7 +183,6 @@
 %define kversion 2.6.%{base_sublevel}
 
 %define make_target bzImage
-%define kernel_image x86
 
 %define xen_hv_version 3.1.0-rc7
 %define xen_hv_cset 7041b52471c3
@@ -256,7 +263,6 @@
 
 %define all_x86 i386 i586 i686
 
-%define do_vdso_install 0
 # These arches install vdso/ directories.
 %define vdso_arches %{all_x86} x86_64 ppc ppc64
 
@@ -319,11 +325,13 @@
 %define hdrarch i386
 # we build always xen i686 HV with pae
 %define xen_flags verbose=y crash_debug=y pae=y
+%define kernel_image arch/x86/boot/bzImage
 %endif
 
 %ifarch x86_64
 %define all_arch_configs kernel-%{version}-x86_64*.config
 %define image_install_path boot
+%define kernel_image arch/x86/boot/bzImage
 %endif
 
 %ifarch ppc64
@@ -1140,6 +1148,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if 0%{?preconfigured}
+  # The .config files were already generated
   cp $RPM_SOURCE_DIR/kernel-%{kversion}*.config .
 %else
   # Drop some necessary files from the source dir into the buildroot
@@ -1779,10 +1788,6 @@
     Arch=`head -1 .config | cut -b 3-`
     echo USING ARCH=$Arch
 
-    if [ "$KernelImage" == "x86" ]; then
-       KernelImage=arch/$Arch/boot/bzImage
-    fi
-
     make -s ARCH=$Arch %{oldconfig_target} > /dev/null
     make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget %{?sparse_mflags} \
     	 ${idhack+"$idhack"}
@@ -1946,7 +1951,7 @@
   make %{?_smp_mflags} %{xen_flags}
   install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
-  cd ../../
+  cd ../..
 %endif
 %endif
 
@@ -2245,6 +2250,9 @@
 
 
 %changelog
+* Wed Oct 17 2007 Dave Jones <davej at redhat.com>
+- 2.6.23-git12
+
 * Mon Oct 15 2007 Dave Jones <davej at redhat.com>
 - Work around E1000 corrupt EEPROM problem.