Attachment 144574 Details for Bug 220953 – Try to fix sparc handling

[patch] Try to fix sparc handling

yum-3.0.1-proper-sparc.patch (text/plain), 2.55 KB, created by Tom "spot" Callaway on 2006-12-30 06:39:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom "spot" Callaway

Created: 2006-12-30 06:39:14 UTC

Size: 2.55 KB

patch

obsolete

>--- yum-3.0.1/rpmUtils/arch.py.sparc	2005-10-23 12:03:42.000000000 -0400
>+++ yum-3.0.1/rpmUtils/arch.py	2006-12-30 01:04:00.000000000 -0500
>@@ -5,7 +5,8 @@
> 
> # dict mapping arch -> ( multicompat, best personality, biarch personality )
> multilibArches = { "x86_64":  ( "athlon", "x86_64", "athlon" ),
>-                   "sparc64": ( "sparc", "sparc", "sparc64" ),
>+		   "sparc64v": ( "sparc", "sparcv9v", "sparc64v" ),
>+                   "sparc64": ( "sparc", "sparcv9", "sparc64" ),
>                    "ppc64":   ( "ppc", "ppc", "ppc64" ),
>                    "s390x":   ( "s390", "s390x", "s390" ),
>                    "ia64":    ( "i686", "ia64", "i686" )
>@@ -38,7 +39,10 @@
>     "s390": "noarch",
>     
>     # sparc
>+    "sparc64v": "sparc64",
>+    "sparc64v": "sparcv9v",
>     "sparc64": "sparcv9",
>+    "sparcv9v": "sparcv9",
>     "sparcv9": "sparcv8",
>     "sparcv8": "sparc",
>     "sparc": "noarch",
>@@ -125,6 +129,11 @@
>     while arches.has_key(thisarch):
>         thisarch = arches[thisarch]
>         archlist.append(thisarch)
>+
>+    # hack hack hack
>+    # sparc64v is also sparc64 compat
>+    if archlist[0] == "sparc64v":
>+	archlist.insert(1,"sparc64")
>     
>     return archlist
>     
>@@ -170,6 +179,29 @@
>         return "ppc64iseries"
>     return arch
> 
>+def getCanonSPARCArch(arch):
>+    # Deal with sun4v, sun4u, sun4m cases
>+    f = open("/proc/cpuinfo", "r")
>+    lines = f.readlines()
>+    f.close()
>+    for line in lines:
>+	if line.startswith("type"):
>+	    SPARCtype = line.split(':')[1]
>+	    break
>+    if SPARCtype.find("sun4v") != -1:
>+	if arch.startswith("sparc64"):
>+	    return "sparc64v"
>+	else:
>+	    return "sparcv9v"
>+    if SPARCtype.find("sun4u") != -1:
>+	if arch.startswith("sparc64"):
>+	    return "sparc64"
>+	else:
>+	    return "sparcv9"
>+    if SPARCtype.find("sun4m") != -1:
>+	return "sparcv8"
>+    return arch
>+
> def getCanonX86_64Arch(arch):
>     if arch != "x86_64":
>         return arch
>@@ -209,6 +241,8 @@
> 
>     if arch.startswith("ppc"):
>         return getCanonPPCArch(arch)
>+    if arch.startswith("sparc"):
>+	return getCanonSPARCArch(arch)
>     if arch == "x86_64":
>         return getCanonX86_64Arch(arch)
> 
>@@ -228,7 +262,7 @@
> def getBestArch():
>     arch = canonArch
> 
>-    if arch == "sparc64":
>+    if arch.startswith("sparc64"):
>         arch = "sparc"
> 
>     if arch.startswith("ppc64"):
>@@ -247,7 +281,7 @@
>     if not arches.has_key(myarch): # this is dumb, but <shrug>
>         return myarch
> 
>-    if myarch == "sparc64":
>+    if myarch.startswith("sparc64"):
>         return "sparc"
>     elif myarch.startswith("ppc64"):
>         return "ppc"

Actions: View | Diff

Attachments on bug 220953: 144548 | 144574