rpms/kernel/devel linux-2.6-ppc64-no-apm.patch, NONE, 1.1 kernel-2.6.spec, 1.3199, 1.3200 linux-2.6-powerpc-slabalign.patch, 1.1, NONE

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32064

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ppc64-no-apm.patch 
Removed Files:
	linux-2.6-powerpc-slabalign.patch 
Log Message:
Fix PPC64 build


linux-2.6-ppc64-no-apm.patch:

--- NEW FILE linux-2.6-ppc64-no-apm.patch ---
--- linux-2.6.21.ppc64/drivers/macintosh/Kconfig~	2007-06-02 09:46:08.000000000 +0100
+++ linux-2.6.21.ppc64/drivers/macintosh/Kconfig	2007-06-02 10:00:44.000000000 +0100
@@ -114,7 +114,7 @@ config PMAC_SMU
 config PMAC_APM_EMU
 	tristate "APM emulation"
 	select APM_EMULATION
-	depends on ADB_PMU && PM
+	depends on ADB_PMU && PM && PPC32
 
 config PMAC_MEDIABAY
 	bool "Support PowerBook hotswap media bay"


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3199
retrieving revision 1.3200
diff -u -r1.3199 -r1.3200
--- kernel-2.6.spec	1 Jun 2007 23:42:42 -0000	1.3199
+++ kernel-2.6.spec	2 Jun 2007 09:14:42 -0000	1.3200
@@ -254,9 +254,9 @@
 # us use the previous build of that package -- it'll just be completely AWOL.
 # Which is a BadThing(tm).
 
-# We don't build a kernel on i386, we only do kernel-headers there,
+# We don't build a kernel on i386; we only do kernel-headers there,
 # and we no longer build for 31bit S390.
-%define nobuildarches i386 s390 ppc64
+%define nobuildarches i386 s390
 
 %ifarch %nobuildarches
 %define with_up 0
@@ -390,7 +390,7 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch90: linux-2.6-x86-dell-hpet.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
-Patch110: linux-2.6-powerpc-slabalign.patch
+Patch110: linux-2.6-ppc64-no-apm.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
 Patch140: linux-2.6-pmac-zilog.patch
@@ -895,8 +895,8 @@
 #
 # Alleviate G5 thermal shutdown problems
 ApplyPatch linux-2.6-g5-therm-shutdown.patch
-# Ensure slab objects are aligned enough for a uint64_t (#235392)
-#ApplyPatch linux-2.6-powerpc-slabalign.patch
+# Don't build APM emulation on PPC64.
+ApplyPatch linux-2.6-ppc64-no-apm.patch
 # Temporary hack to work around GCC PR #25724 / #21237
 ApplyPatch linux-2.6-ppc32-ucmpdi2.patch
 # Fix up ibmvscsi for combined pSeries/iSeries build
@@ -904,7 +904,6 @@
 # Move pmac_zilog to its newly-registered device number
 ApplyPatch linux-2.6-pmac-zilog.patch
 
-
 #
 # Bugfixes to the core system and patches related to how RPMs are build
 #
@@ -2051,6 +2050,9 @@
 %endif
 
 %changelog
+* Sat Jun 02 2007 David Woodhouse <dwmw2 at infradead.org>
+- Re-enable ppc64 builds.
+
 * Fri Jun 01 2007 Dave Jones <davej at redhat.com>
 - Disable ppc64 builds.
   http://koji.fedoraproject.org/koji/getfile?taskID=21950&name=build.log


--- linux-2.6-powerpc-slabalign.patch DELETED ---