rpms/kernel/devel linux-2.6-efika-not-chrp.patch, NONE, 1.1 kernel.spec, 1.611, 1.612

[David Woodhouse (dwmw2)]

Author: dwmw2

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-efika-not-chrp.patch 
Log Message:
Efika is not CHRP

linux-2.6-efika-not-chrp.patch:

--- NEW FILE linux-2.6-efika-not-chrp.patch ---
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 5ab4c84..723422e 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2240,6 +2240,14 @@ static void __init fixup_device_tree_efika(void)
 	if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
 		prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
 
+	/* CODEGEN,description is exposed in /proc/cpuinfo so
+	   change that too */
+	rv = prom_getprop(node, "CODEGEN,description", prop, sizeof(prop));
+	if (rv != PROM_ERROR && (strstr(prop, "CHRP")))
+		prom_setprop(node, "/", "CODEGEN,description",
+			     "Efika 5200B PowerPC System",
+			     sizeof("Efika 5200B PowerPC System"));
+
 	/* Fixup bestcomm interrupts property */
 	node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
 	if (PHANDLE_VALID(node)) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- kernel.spec	13 Apr 2008 03:00:15 -0000	1.611
+++ kernel.spec	13 Apr 2008 14:08:10 -0000	1.612
@@ -584,6 +584,7 @@
 Patch146: linux-2.6-windfarm-pm121-fix.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
 Patch148: linux-2.6-powerpc-zImage-32MiB.patch
+Patch149: linux-2.6-efika-not-chrp.patch
 
 Patch160: linux-2.6-execshield.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
@@ -1034,6 +1035,8 @@
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
 # Link zImage at 32MiB (for POWER machines, Efika)
 ApplyPatch linux-2.6-powerpc-zImage-32MiB.patch
+# Don't show 'CHRP' in /proc/cpuinfo on Efika
+ApplyPatch linux-2.6-efika-not-chrp.patch
 
 #
 # Exec shield
@@ -1755,6 +1758,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sun Apr 13 2008 David Woodhouse <dwmw2 at redhat.com>
+- Remove 'CHRP' from /proc/cpuinfo on Efika, to fix platform detection 
+  in anaconda
+
 * Sat Apr 12 2008 Jarod Wilson <jwilson at redhat.com>
 - Resync with latest FireWire git tree
 - Add work-around patch for wrong generation in bus reset packets