[yum/f15] add arm hardware floating point support to yum

[Dennis Gilmore]

commit 320eb08f02607c338a2b9b1dbbf501b5d446fc3a
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Nov 30 19:40:10 2011 -0600

    add arm hardware floating point support to yum

 yum-arm-hfp-support.patch |   54 +++++++++++++++++++++++++++++++++++++++++++++
 yum.spec                  |    7 +++++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/yum-arm-hfp-support.patch b/yum-arm-hfp-support.patch
new file mode 100644
index 0000000..c3ae963
--- /dev/null
+++ b/yum-arm-hfp-support.patch
@@ -0,0 +1,54 @@
+diff -uNr yum-3.2.29-orig/rpmUtils/arch.py yum-3.2.29/rpmUtils/arch.py
+--- yum-3.2.29-orig/rpmUtils/arch.py	2011-11-30 19:34:43.000000000 -0600
++++ yum-3.2.29/rpmUtils/arch.py	2011-11-30 19:36:10.000000000 -0600
+@@ -2,6 +2,7 @@
+ #
+ 
+ import os
++import rpm
+ 
+ # dict mapping arch -> ( multicompat, best personality, biarch personality )
+ multilibArches = { "x86_64":  ( "athlon", "x86_64", "athlon" ),
+@@ -61,6 +62,10 @@
+     "armv5tejl": "armv5tel",
+     "armv5tel": "noarch",
+ 
++    #arm hardware floating point
++    "armv7hnl": "armv7hl",
++    "armv7hl": "noarch",
++
+     # super-h 
+     "sh4a": "sh4",
+     "sh4": "noarch",
+@@ -231,6 +236,13 @@
+ 
+     return 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('armv7h'):
++        return target
++    return arch
++
+ def getCanonPPCArch(arch):
+     # FIXME: should I do better handling for mac, etc?
+     if arch != "ppc64":
+@@ -308,6 +320,8 @@
+     if (len(arch) == 4 and arch[0] == "i" and arch[2:4] == "86"):
+         return getCanonX86Arch(arch)
+ 
++    if arch.startswith("arm"):
++        return getCanonARMArch(arch)
+     if arch.startswith("ppc"):
+         return getCanonPPCArch(arch)
+     if arch.startswith("sparc"):
+@@ -359,6 +373,8 @@
+         return "sparc"
+     elif myarch.startswith("ppc64"):
+         return "ppc"
++    elif myarch.startswith("armv7h"):
++        return "armhfp"
+     elif myarch.startswith("arm"):
+         return "arm"
+         
diff --git a/yum.spec b/yum.spec
index 6a56869..ec9f83f 100644
--- a/yum.spec
+++ b/yum.spec
@@ -7,7 +7,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.2.29
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@ Patch9: BZ-701744-collapse-libc.patch
 Patch10: yum-createrepo-sqlite-update-fixes.patch
 Patch11: pulp-repostorage-fix.patch
 Patch12: BZ-720088-progress-ctrl-m-fix.patch
+Patch13: yum-arm-hfp-support.patch
 
 Patch20: yum-manpage-files.patch
 
@@ -138,6 +139,7 @@ Install this package if you want auto yum updates nightly via cron.
 %patch11 -p1
 %patch12 -p1
 %patch20 -p1
+%patch13 -p1
 
 %build
 make
@@ -260,6 +262,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Wed Nov 30 2011 Dennis Gilmore <dennis at ausil.us> - 3.2.29-10
+- add arm hardware floating point support to yum
+
 * Wed Aug 17 2011 James Antill <james at fedoraproject.org> - 3.2.29-9
 - Fix for pulp using the repostorage API.
 - Fix for progress ctrl-m on yum update.