[yum-commits] rpmUtils/arch.py

[James Antill]

 rpmUtils/arch.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c1c7a65da0edc2dc381748f9531af38bc567f0e9
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Thu Jul 3 10:09:49 2014 +0200

    Add armv6hl
    
    It has been recently added to RPM. This is functionally equivalent to what
    Pidora, the Fedora Remix for Raspberry Pi computer uses apart from that it does
    not break all other ARM flavours by forcing them to be armv6hl and switches
    the base architecture to armhfp instead of arm which seems more appropriate
    for an architecture with vfp extensions.

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index 54fa189..a3bade5 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -74,7 +74,8 @@ arches = {
 
     #arm hardware floating point
     "armv7hnl": "armv7hl",
-    "armv7hl": "noarch",
+    "armv7hl": "armv6hl",
+    "armv6hl": "noarch",
 
     # arm64
     "arm64": "noarch",
@@ -288,6 +289,8 @@ def getCanonX86Arch(arch):
 def getCanonARMArch(arch):
     # the %{_target_arch} macro in rpm will let us know the abi we are using 
     target = rpm.expandMacro('%{_target_cpu}')
+    if target.startswith('armv6h'):
+        return target
     if target.startswith('armv7h'):
         return target
     return arch
@@ -439,6 +442,8 @@ def getBaseArch(myarch=None):
         return "ppc"
     elif myarch.startswith("arm64"):
         return "arm64"
+    elif myarch.startswith("armv6h"):
+        return "armhfp"
     elif myarch.startswith("armv7h"):
         return "armhfp"
     elif myarch.startswith("arm"):