packages: yum/yum-amd64.patch - 32bit intel handling
glen
glen at pld-linux.org
Wed Nov 18 13:11:00 CET 2009
Author: glen Date: Wed Nov 18 12:11:00 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- 32bit intel handling
---- Files affected:
packages/yum:
yum-amd64.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/yum/yum-amd64.patch
diff -u packages/yum/yum-amd64.patch:1.3 packages/yum/yum-amd64.patch:1.4
--- packages/yum/yum-amd64.patch:1.3 Wed Nov 18 13:05:41 2009
+++ packages/yum/yum-amd64.patch Wed Nov 18 13:10:55 2009
@@ -1,6 +1,40 @@
---- yum-3.2.25/rpmUtils/arch.py~ 2009-09-15 23:58:51.000000000 +0300
-+++ yum-3.2.25/rpmUtils/arch.py 2009-11-18 14:02:08.718489471 +0200
-@@ -280,27 +280,6 @@
+--- yum-3.2.25/rpmUtils/arch.py 2009-11-18 14:02:08.718489471 +0200
++++ yum-3.2.25/rpmUtils/arch.py 2009-11-18 14:09:16.755112524 +0200
+@@ -205,30 +205,10 @@
+
+
+ def getCanonX86Arch(arch):
+- #
+ if arch == "i586":
+- f = open("/proc/cpuinfo", "r")
+- lines = f.readlines()
+- f.close()
+- for line in lines:
+- if line.startswith("model name") and line.find("Geode(TM)") != -1:
+- return "geode"
+- return arch
+- # only athlon vs i686 isn't handled with uname currently
+- if arch != "i686":
+- return arch
+-
+- # if we're i686 and AuthenticAMD, then we should be an athlon
+- f = open("/proc/cpuinfo", "r")
+- lines = f.readlines()
+- f.close()
+- for line in lines:
+- if line.startswith("vendor") and line.find("AuthenticAMD") != -1:
+- return "athlon"
+- # i686 doesn't guarantee cmov, but we depend on it
+- elif line.startswith("flags") and line.find("cmov") == -1:
+- return "i586"
+-
++ # nearest matching arch in Th is i486
++ return "i486"
++ # not sure what we have here
+ return arch
+
+ def getCanonPPCArch(arch):
+@@ -280,27 +260,6 @@
return "sparcv8"
return arch
@@ -28,7 +62,7 @@
def getCanonArch(skipRpmPlatform = 0):
if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
try:
-@@ -321,8 +300,6 @@
+@@ -321,8 +280,6 @@
return getCanonPPCArch(arch)
if arch.startswith("sparc"):
return getCanonSPARCArch(arch)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yum/yum-amd64.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list