Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[libzypp] Add workaround for tnhl
Zypper relies on /etc/rpm/platform for deciding to upgrade from plain
armv7l to higher archs. So far only armv7hl was known, this patch adds
armv7tnhl as well.

Original patch by: Islam Amer <islam.amer@jollamobile.com>
Signed-off-by: Juha Kallioinen <juha.kallioinen@jolla.com>
  • Loading branch information
kaltsi committed Nov 6, 2013
1 parent 6630721 commit b956303
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions libzypp/zypp/ZConfig.cc
Expand Up @@ -140,6 +140,13 @@ namespace zypp
WAR << "/etc/rpm/platform contains armv7hl-: architecture upgraded to '" << architecture << "'" << endl;
break;
}
if ( str::hasPrefix( *in, "armv7tnhl-" ) )
{
architecture = Arch_armv7tnhl;
WAR << "/etc/rpm/platform contains armv7tnhl-: architecture upgraded to '" << architecture << "'" << endl;
break;
}

}
}
}
Expand Down

0 comments on commit b956303

Please sign in to comment.