Attachment 128127 Details for Bug 259827

[patch] prep-efika.patch

prep-efika.patch (text/plain), 1.95 KB, created by Olaf Hering on 2007-04-02 11:38:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Hering

Created: 2007-04-02 11:38:41 UTC

Size: 1.95 KB

patch

obsolete

>---
> storage/libstorage/src/Storage.cc |    3 ++-
> yast2/library/modules/Arch.ycp    |    8 +++++++-
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
>Index: b/storage/libstorage/src/Storage.cc
>===================================================================
>--- a/storage/libstorage/src/Storage.cc
>+++ b/storage/libstorage/src/Storage.cc
>@@ -374,7 +374,8 @@ Storage::detectArch()
> 	    line = extractNthWord( 2, line );
> 	    y2milestone( "line:%s", line.c_str() );
> 	    is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0;
>-	    if( is_ppc_mac == 0)
>+	    is_ppc_pegasos = line.find( "EFIKA5K2" )==0;
>+	    if( is_ppc_mac == 0 || is_ppc_pegasos == 0 )
> 		{
> 		line = cpu[l];
> 		line = extractNthWord( 3, line );
>Index: b/yast2/library/modules/Arch.ycp
>===================================================================
>--- a/yast2/library/modules/Arch.ycp
>+++ b/yast2/library/modules/Arch.ycp
>@@ -225,6 +225,7 @@ global string board_compatible () {
> 	// there is no standard for the board identification
> 	// Cell and Maple based boards have no CHRP in /proc/cpuinfo
> 	// Pegasos and Cell do have CHRP in /proc/cpuinfo, but Pegasos2 should no be handled as CHRP
>+	// Efika is handled like Pegasos for the time being
> 	if (ppc () && (_board_compatible == nil || _board_compatible == "CHRP"))
> 	{
> 	    map device_type = (map) SCR::Execute (.target.bash_output,
>@@ -250,6 +251,11 @@ global string board_compatible () {
> 	    {
> 		_board_compatible = "Pegasos";
> 	    }
>+	    // Efika has CHRP in /proc/cpuinfo and 'efika' in /proc/device-tree/device_type
>+	    if (board == "efika")
>+	    {
>+		_board_compatible = "Pegasos";
>+	    }
> 	}
> 	// avoid future re-probing if probing failed
> 	// also avoid passing nil outside the module
>@@ -308,7 +314,7 @@ global boolean board_prep () {
> }
> 
> /**
>- * true for all "Pegasos" ppc boards
>+ * true for all "Pegasos" and "Efika" ppc boards
>  */
> global boolean board_pegasos () {
>     return ppc () && board_compatible () == "Pegasos";

Actions: View | Diff

Attachments on bug 259827: 128127