Skip to content

Commit

Permalink
Add armv6hl
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
lkundrak authored and james-antill committed Jul 3, 2014
1 parent 9ecf1d3 commit c1c7a65
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion rpmUtils/arch.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@

#arm hardware floating point
"armv7hnl": "armv7hl",
"armv7hl": "noarch",
"armv7hl": "armv6hl",
"armv6hl": "noarch",

# arm64
"arm64": "noarch",
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"):
Expand Down

0 comments on commit c1c7a65

Please sign in to comment.