From: Michael Schroeder <mls@suse.de>
Date: Tue, 29 May 2012 12:28:37 +0000 (+0200)
Subject: - add armv7hl workaround for Adrian
X-Git-Tag: 11.6.2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6960b588a74b1223e26e4fae5d4d231cf1d786eb;p=platform%2Fupstream%2Flibzypp.git

- add armv7hl workaround for Adrian
---

diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index a68973e..2a1e9e9 100644
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -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;
     }