- add armv7hl workaround for Adrian
authorMichael Schroeder <mls@suse.de>
Tue, 29 May 2012 12:28:37 +0000 (14:28 +0200)
committerMichael Schroeder <mls@suse.de>
Tue, 29 May 2012 12:28:37 +0000 (14:28 +0200)
zypp/ZConfig.cc

index a68973e..2a1e9e9 100644 (file)
@@ -127,6 +127,22 @@ namespace zypp
           ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
         }
       }
+      else if ( architecture == Arch_armv7l)
+      {
+       std::ifstream platform( "/etc/rpm/platform" );
+       if (platform)
+       {
+         for( iostr::EachLine in( platform ); in; in.next() )
+         {
+           if ( str::hasPrefix( *in, "armv7hl-" ) )
+           {
+             architecture = Arch_armv7hl;
+             WAR << "/etc/rpm/platform contains armv7hl-: architecture upgraded to '" << architecture << "'" << endl;
+             break;
+           }
+         }
+       }
+      }
       return architecture;
     }