~xubuntu-dev/ubuntu-cdimage/xubuntu-base

« back to all changes in this revision

Viewing changes to lib/cdimage/tree.py

  • Committer: Colin Watson
  • Date: 2015-12-08 13:39:13 UTC
  • mfrom: (1555.1.1 ubuntu-cdimage)
  • Revision ID: cjwatson@canonical.com-20151208133913-s35v5qns8s1tyewl
[r=cjwatson] Add s390x.

Show diffs side-by-side

added added

removed removed

Lines of Context:
819
819
        "powerpc": "Mac (PowerPC) and IBM-PPC (POWER5)",
820
820
        "powerpc+ps3": "PlayStation 3",
821
821
        "ppc64el": "PowerPC64 Little-Endian",
 
822
        "s390x": "IBM System z",
822
823
        "sparc": "SPARC",
823
824
    }
824
825
 
912
913
            sentences.append(
913
914
                "For POWER8 Little-Endian computers, such as Power Systems "
914
915
                "S8xxL/LC Linux-only servers.")
 
916
        elif arch == "s390x":
 
917
            sentences.append(
 
918
                "For IBM System z series mainframes, such as IBM LinuxONE.")
915
919
        elif arch == "sparc":
916
920
            sentences.append(
917
921
                "For Sun UltraSPARC computers, including those based on the "
1129
1133
            "hppa",
1130
1134
            "ia64",
1131
1135
            "lpia",
 
1136
            "s390x",
1132
1137
            "sparc",
1133
1138
        )
1134
1139
 
1811
1816
            if series < "dapper" or series > "gutsy":
1812
1817
                return True
1813
1818
        elif cpuarch in (
1814
 
                "arm64", "armel", "armhf", "hppa", "ia64", "lpia", "ppc64el"):
 
1819
                "arm64", "armel", "armhf", "hppa", "ia64", "lpia", "ppc64el",
 
1820
                "s390x"):
1815
1821
            return True
1816
1822
        return False
1817
1823