almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix libdir to match basearch (not buildarch), use getBaseArch

Browse Source 
Let's let yum handle the magic of figuring out what basearch is. And
since basearch will match userspace, libdir should match basearch.

This fixes stuff on pre-F16 ppc64 (where basearch is ppc and thus has a
different libdir).
This commit is contained in:
Will Woods 2011-07-05 13:32:48 -04:00
parent 1fc0e1c3da
commit fc6030edaa
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pylorax/__init__.py
View File

@ -42,6 +42,7 @@ import ltmpl
import imgutils import imgutils
from sysutils import * from sysutils import *
from rpmUtils.arch import getBaseArch
from treebuilder import RuntimeBuilder, TreeBuilder from treebuilder import RuntimeBuilder, TreeBuilder
from buildstamp import BuildStamp from buildstamp import BuildStamp
@ -50,15 +51,10 @@ from discinfo import DiscInfo
class ArchData(DataHolder): class ArchData(DataHolder):
lib64_arches = ("x86_64", "ppc64", "sparc64", "s390x", "ia64") lib64_arches = ("x86_64", "ppc64", "sparc64", "s390x", "ia64")
archmap = {"i386": "i386", "i586":"i386", "i686":"i386", "x86_64":"x86_64",
"ppc":"ppc", "ppc64": "ppc",
"sparc":"sparc", "sparcv9":"sparc", "sparc64":"sparc",
"s390":"s390", "s390x":"s390x",
}
def __init__(self, buildarch): def __init__(self, buildarch):
self.buildarch = buildarch self.buildarch = buildarch
self.basearch = self.archmap.get(buildarch) or buildarch self.basearch = getBaseArch(buildarch)
self.libdir = "lib64" if buildarch in self.lib64_arches else "lib" self.libdir = "lib64" if basearch in self.lib64_arches else "lib"
class Lorax(BaseLoraxClass): class Lorax(BaseLoraxClass):