View | Details | Raw Unified | Return to bug 259827
Collapse All | Expand All

(-)b/storage/libstorage/src/Storage.cc (-1 / +2 lines)
Lines 374-380 Storage::detectArch() Link Here
374 
	    line = extractNthWord( 2, line );
 374 
	    line = extractNthWord( 2, line );
375 
	    y2milestone( "line:%s", line.c_str() );
 375 
	    y2milestone( "line:%s", line.c_str() );
376 
	    is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0;
 376 
	    is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0;
377 
	    if( is_ppc_mac == 0)
 377 
	    is_ppc_pegasos = line.find( "EFIKA5K2" )==0;
378 
	    if( is_ppc_mac == 0 || is_ppc_pegasos == 0 )
378 
		{
 379 
		{
379 
		line = cpu[l];
 380 
		line = cpu[l];
380 
		line = extractNthWord( 3, line );
 381 
		line = extractNthWord( 3, line );
(-)b/yast2/library/modules/Arch.ycp (-1 / +7 lines)
Lines 225-230 global string board_compatible () { Link Here
225 
	// there is no standard for the board identification
 225 
	// there is no standard for the board identification
226 
	// Cell and Maple based boards have no CHRP in /proc/cpuinfo
 226 
	// Cell and Maple based boards have no CHRP in /proc/cpuinfo
227 
	// Pegasos and Cell do have CHRP in /proc/cpuinfo, but Pegasos2 should no be handled as CHRP
 227 
	// Pegasos and Cell do have CHRP in /proc/cpuinfo, but Pegasos2 should no be handled as CHRP
228 
	// Efika is handled like Pegasos for the time being
228 
	if (ppc () && (_board_compatible == nil || _board_compatible == "CHRP"))
 229 
	if (ppc () && (_board_compatible == nil || _board_compatible == "CHRP"))
229 
	{
 230 
	{
230 
	    map device_type = (map) SCR::Execute (.target.bash_output,
 231 
	    map device_type = (map) SCR::Execute (.target.bash_output,
Lines 250-255 global string board_compatible () { Link Here
250 
	    {
 251 
	    {
251 
		_board_compatible = "Pegasos";
 252 
		_board_compatible = "Pegasos";
252 
	    }
 253 
	    }
254 
	    // Efika has CHRP in /proc/cpuinfo and 'efika' in /proc/device-tree/device_type
255 
	    if (board == "efika")
256 
	    {
257 
		_board_compatible = "Pegasos";
258 
	    }
253 
	}
 259 
	}
254 
	// avoid future re-probing if probing failed
 260 
	// avoid future re-probing if probing failed
255 
	// also avoid passing nil outside the module
 261 
	// also avoid passing nil outside the module
Lines 308-314 global boolean board_prep () { Link Here
308 
}
 314 
}
309 

          315
          

        

        

          310
          
/**

          316
          
/**

        

          
            

              311
              
 * true for all "Pegasos" ppc boards


              317
              
 * true for all "Pegasos" and "Efika" ppc boards

            

        

          312
          
 */

          318
          
 */

        

        

          313
          
global boolean board_pegasos () {

          319
          
global boolean board_pegasos () {

        

        

          314
          
    return ppc () && board_compatible () == "Pegasos";

          320
          
    return ppc () && board_compatible () == "Pegasos";

        






  

  Return to bug 259827