← Back to branch summary

~jibel/ubuntu-cdimage/support_for_multilayer

« back to all changes in this revision

Viewing changes to lib/cdimage/tree.py

  • Committer: Steve Langasek
  • Date: 2019-02-27 22:57:25 UTC
  • Revision ID: steve.langasek@canonical.com-20190227225725-8fhx6mqui9fe4za7
Further pruning.  Includes dropping the lpia arch, and the ubuntu-mid product
which was lpia-only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cdimage/tree.py
393
393
        elif self.image_type.endswith("-live"):
394
394
            if self.project == "edubuntu":
395
395
                return "desktop"
396
 
            elif self.project == "ubuntu-mid":
397
 
                return "mid"
398
396
            elif self.project == "ubuntu-moblin-remix":
399
397
                return "moblin-remix"
400
398
            elif self.project in ("ubuntu-netbook", "kubuntu-netbook"):
425
423
        if publish_type.startswith("preinstalled-"):
426
424
            return "daily-preinstalled"
427
425
        elif publish_type in (
428
 
                "desktop", "live", "mid", "moblin-remix", "netbook",
 
426
                "desktop", "live", "moblin-remix", "netbook",
429
427
                "live-core", "live-server"):
430
428
            return "daily-live"
431
429
        elif publish_type == "dvd":
505
503
            return "source %s" % cd
506
504
        elif publish_type == "netbook":
507
505
            return "netbook live %s" % cd
508
 
        elif publish_type == "mid":
509
 
            return "MID USB image"
510
506
        elif publish_type == "moblin-remix":
511
507
            return "Moblin live CD"
512
508
        elif publish_type == "active":
538
534
        capproject = self.config.capproject
539
535
        series = self.config["DIST"]
540
536
 
541
 
        if self.project == "mid":
542
 
            # MID has lower memory requirements than others
543
 
            desktop_ram = 128
544
537
        if self.project == "xubuntu":
545
 
            if series <= "intrepid":
546
 
                desktop_ram = 128
547
 
            else:
548
 
                desktop_ram = 192
 
538
            desktop_ram = 192
549
539
        else:
550
540
            if series <= "xenial":
551
541
                desktop_ram = 384
624
614
                "installer, please file a bug on the %s package." % bug_link,
625
615
            ])
626
616
            return
627
 
        elif publish_type == "mid":
628
 
            sentences.append(
629
 
                "The MID USB image allows you to try %s without changing your "
630
 
                "computer at all, and at your option to install it "
631
 
                "permanently later." % capproject)
632
 
            sentences.append(
633
 
                "This USB image is optimized for handheld devices with 4-7\" "
634
 
                "touchscreens and limited processing power.")
635
 
            sentences.append(desktop_req)
636
617
        elif publish_type == "moblin-remix":
637
618
            sentences.append(
638
619
                "The live %s allows you to try Ubuntu Moblin Remix without "
805
786
        "hppa": "HP PA-RISC",
806
787
        "i386": "32-bit PC (i386)",
807
788
        "ia64": "IA-64",
808
 
        "lpia": "Low-Power Intel Architecture",
809
789
        "powerpc": "Mac (PowerPC) and IBM-PPC (POWER5)",
810
790
        "powerpc+ps3": "PlayStation 3",
811
791
        "ppc64el": "PowerPC64 Little-Endian",
884
864
                "Intel processors.")
885
865
        elif arch == "ia64":
886
866
            sentences.append("For Intel Itanium and Itanium 2 computers.")
887
 
        elif arch == "lpia":
888
 
            sentences.append(
889
 
                "For devices using the Low-Power Intel Architecture, "
890
 
                "including the A1xx and Atom processors.")
891
867
        elif arch == "powerpc":
892
868
            sentences.append(
893
869
                "For Apple Macintosh G3, G4, and G5 computers, including "
925
901
            return
926
902
 
927
903
        usb_projects = (
928
 
            "ubuntu-mid", "ubuntu-moblin-remix",
 
904
            "ubuntu-moblin-remix",
929
905
            "kubuntu", "kubuntu-active", "kubuntu-plasma5",
930
906
            "ubuntu-mate",
931
907
            )
1129
1105
            "serveraddon", "addon",
1130
1106
            "dvd",
1131
1107
            "src",
1132
 
            "netbook", "mid", "moblin-remix", "mobile", "active",
 
1108
            "netbook", "moblin-remix", "mobile", "active",
1133
1109
            "uec", "server-uec",
1134
1110
            "preinstalled-desktop", "preinstalled-netbook",
1135
1111
            "preinstalled-mobile", "preinstalled-active",
1151
1127
            "ppc64el",
1152
1128
            "hppa",
1153
1129
            "ia64",
1154
 
            "lpia",
1155
1130
            "s390x",
1156
1131
            "sparc",
1157
1132
        )
1400
1375
 
1401
1376
                        for path, arch, base in paths:
1402
1377
                            if arch is None:
1403
 
                                if publish_type == "mid":
1404
 
                                    imgarch = "lpia"
1405
 
                                else:
1406
 
                                    raise WebIndicesException(
1407
 
                                        "Unknown image type %s!" %
1408
 
                                        publish_type)
1409
 
                                archstr = self.arch_strings[imgarch]
1410
 
                                imagestr = "%s %s" % (archstr, cdtypestr)
1411
 
                                htaccessimagestr = "%s for %s computers" % (
1412
 
                                    self.titlecase(cdtypestr), archstr)
1413
 
                                archdesc = self.archdesc(imgarch, publish_type)
 
1378
                                raise WebIndicesException(
 
1379
                                    "Unknown image type %s!" %
 
1380
                                    publish_type)
1414
1381
                            elif publish_type == "src":
1415
1382
                                imagestr = "%s %s" % (
1416
1383
                                    self.titlecase(cdtypestr), arch)
1818
1785
            # All Edubuntu images are DVD sized (including arm).
1819
1786
            # Ubuntu Studio is always DVD-sized for now.
1820
1787
            return 4700372992
1821
 
        elif self.project in (
1822
 
                "ubuntu-mid", "ubuntu-moblin-remix",
1823
 
                ):
 
1788
        elif self.project == "ubuntu-moblin-remix":
1824
1789
            # Mobile images are designed for USB drives; arbitrarily pick
1825
1790
            # 1GB as a limit.
1826
1791
            return 1024 * 1024 * 1024
1985
1950
            #   2008-March/000400.html
1986
1951
            return True
1987
1952
        elif cpuarch in (
1988
 
                "arm64", "armel", "armhf", "hppa", "ia64", "lpia", "ppc64el",
 
1953
                "arm64", "armel", "armhf", "hppa", "ia64", "ppc64el",
1989
1954
                "s390x"):
1990
1955
            return True
1991
1956
        return False
2813
2778
    def tree_suffix(self, source):
2814
2779
        # Publish ports/daily to ports/releases/..., etc.
2815
2780
        ubuntu_projects = (
2816
 
            "ubuntu-server", "ubuntu-netbook", "ubuntu-mid", "ubuntu-headless")
 
2781
            "ubuntu-server", "ubuntu-netbook", "ubuntu-headless")
2817
2782
        if "/" in source:
2818
2783
            project, tail = source.split("/", 1)
2819
2784
            if project in ubuntu_projects:
2950
2915
    def daily_base(self, source, date, publish_type, arch):
2951
2916
        series = self.config["DIST"]
2952
2917
        daily_dir = self.daily_dir(source, date, publish_type)
2953
 
        if publish_type in ("netbook", "mid") and series <= "intrepid":
2954
 
            return os.path.join(
2955
 
                daily_dir, "%s-%s" % (self.project, publish_type))
2956
 
        elif publish_type == "wubi":
 
2918
        if publish_type == "wubi":
2957
2919
            return os.path.join(daily_dir, arch)
2958
2920
        else:
2959
2921
            return os.path.join(
3117
3079
 
3118
3080
    def want_manifest(self, publish_type, path):
3119
3081
        if publish_type in (
3120
 
            "live", "desktop", "netbook", "mid", "moblin-remix",
 
3082
            "live", "desktop", "netbook", "moblin-remix",
3121
3083
            "uec", "server-uec", "core", "wubi", "server", "live-server",
3122
3084
        ):
3123
3085
            return True
3136
3098
    def want_metalink(self, publish_type):
3137
3099
        # TODO: maybe others?  metalink is only supported for Wubi
3138
3100
        if publish_type in (
3139
 
            "netbook", "mid", "moblin-remix", "uec", "server-uec",
 
3101
            "netbook", "moblin-remix", "uec", "server-uec",
3140
3102
        ):
3141
3103
            return False
3142
3104
        elif publish_type.startswith("preinstalled-"):
3337
3299
        if (publish_type in ("netbook", "moblin-remix") and
3338
3300
                not [arch for arch in arches if arch.startswith("armel")]):
3339
3301
            arches = ["i386"]
3340
 
        elif publish_type == "mid":
3341
 
            arches = ["lpia"]
3342
3302
 
3343
3303
        # Sanity-check.
3344
 
        if publish_type not in ("netbook", "mid", "src"):
 
3304
        if publish_type not in ("netbook", "src"):
3345
3305
            for arch in arches:
3346
3306
                paths = []
3347
3307
                for ext in ("iso", "img", "img.gz", "img.xz", "img.tar.gz",