rpms/kernel/devel kernel-2.6.spec, 1.2154, 1.2155 linux-2.6-bzimage.patch, 1.4, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 25 19:01:52 UTC 2006


Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14050

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-bzimage.patch 
Log Message:
no more bzImage


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2154
retrieving revision 1.2155
diff -u -r1.2154 -r1.2155
--- kernel-2.6.spec	24 Apr 2006 19:04:04 -0000	1.2154
+++ kernel-2.6.spec	25 Apr 2006 19:01:38 -0000	1.2155
@@ -92,20 +92,28 @@
 %ifarch s390
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch s390x
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
 %define image_install_path boot
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch sparc
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch sparc64
 %define buildsmp 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
+%define make_target image
+%define kernel_image image
 %endif
 
 %ifarch ppc
@@ -120,6 +128,8 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
 %define image_install_path boot/efi/EFI/redhat
 %define signmodules 1
+%define make_target compressed
+%define kernel_image vmlinux.gz
 %endif
 
 #
@@ -216,7 +226,6 @@
 Patch2: patch-2.6.17-rc2-git5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
-Patch100: linux-2.6-bzimage.patch
 
 # 200 - 299   x86(-64)
 
@@ -725,7 +734,6 @@
 #
 # Architecture patches
 #
-%patch100 -p1
 
 #
 # x86(-64)
@@ -1657,6 +1665,9 @@
 %endif
 
 %changelog
+* Tue Apr 25 2005 David Woodhouse <dwmw2 at redhat.com>
+- Drop the last remnants of the 'make bzImage on all arches' silliness
+
 * Sun Apr 23 2006 Dave Jones <davej at redhat.com>
 - 2.6.17rc2-git5
 


--- linux-2.6-bzimage.patch DELETED ---




More information about the fedora-cvs-commits mailing list