More arch fixes.

[Bill Nottingham]

iutil.py                  |   16 +++++++++++++---
 storage/devicelibs/lvm.py |    2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

[PATCH 1/2] Support a 'ppc64' arch in iutil.getArch.

[Bill Nottingham]

Signed-off-by: Bill Nottingham 
---
 iutil.py |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/iutil.py b/iutil.py
index 49509e9..1e652ec 100644
--- a/iutil.py
+++ b/iutil.py
@@ -635,8 +635,16 @@ def isX86(bits=None):

return False

-def isPPC():
-    return os.uname()[4].startswith('ppc')
+def isPPC(bits=None):
+    if bits is None:
+        return os.uname()[4].startswith('ppc')
+    elif bits == 32:
+        if arch == 'ppc':
+            return True
+    elif bits == 64:
+        if arch == 'ppc64':
+            return True
+    return False

def isS390():
     return os.uname()[4].startswith('s390')
@@ -655,8 +663,10 @@ def getArch():
         return 'i386'
     elif isX86(bits=64):
         return 'x86_64'
-    elif isPPC():
+    elif isPPC(bits=32):
         return 'ppc'
+    elif isPPC(bits=64):
+        return 'ppc64'
     elif isAlpha():
         return 'alpha'
     elif isSparc():

[PATCH 2/2] Fix list of 64-bit arches.

[Bill Nottingham]

'sparc' and 's390' are what are returned by iutil.getArch; however, we don't
actually support 31/32-bit installs on those machines.

Signed-off-by: Bill Nottingham 
---
 storage/devicelibs/lvm.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/storage/devicelibs/lvm.py b/storage/devicelibs/lvm.py
index 2196170..a5eb59d 100644
--- a/storage/devicelibs/lvm.py
+++ b/storage/devicelibs/lvm.py
@@ -129,7 +129,7 @@ def getPossiblePhysicalExtents(floor=0):

def getMaxLVSize():
     """ Return the maximum size (in MB) of a logical volume. """
-    if iutil.getArch() in ("x86_64", "ppc64"): #64bit architectures
+    if iutil.getArch() in ("x86_64", "ppc64", "alpha", "ia64", "s390", "sparc"): #64bit architectures
         return (8*1024*1024*1024*1024) #Max is 8EiB (very large number..)
     else:
         return (16*1024*1024) #Max is 16TiB

[PATCH 2/2] Fix list of 64-bit arches.

[Hans de Goede]

Looks good,

Regards,

Hans

On 07/08/2009 04:38 AM, Bill Nottingham wrote:
> 'sparc' and 's390' are what are returned by iutil.getArch; however, we don't
> actually support 31/32-bit installs on those machines.
> Signed-off-by: Bill Nottingham
>
> storage/devicelibs/lvm.py |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/storage/devicelibs/lvm.py b/storage/devicelibs/lvm.py
> index 2196170..a5eb59d 100644
> --- a/storage/devicelibs/lvm.py
> +++ b/storage/devicelibs/lvm.py
> @@ -129,7 +129,7 @@ def getPossiblePhysicalExtents(floor=0):
>
> def getMaxLVSize():
>       """ Return the maximum size (in MB) of a logical volume. """
> if iutil.getArch() in ("x86_64", "ppc64"): #64bit architectures
> if iutil.getArch() in ("x86_64", "ppc64", "alpha", "ia64", "s390", "sparc"): #64bit architectures
>      return (8*1024*1024*1024*1024) #Max is 8EiB (very large number..)
>  else:
>      return (16*1024*1024) #Max is 16TiB

[PATCH 1/2] Support a 'ppc64' arch in iutil.getArch.

[Bill Nottingham]

Bill Nottingham ([e-mail]) said:
> Signed-off-by: Bill Nottingham
>
> iutil.py |   16 +++++++++++++---
>  1 files changed, 13 insertions(+), 3 deletions(-)

Strike that, this will likely break installs on ppc64.

Bill