Ubuntu CD Images

Merge lp:~alexghiti/ubuntu-cdimage/ubuntu-cdimage into lp:ubuntu-cdimage

  1. ubuntu-cdimage
  2. Merge into mainline
Proposed by Alexandre Ghiti
Status: Merged
Merged at revision: 2092
Proposed branch: lp:~alexghiti/ubuntu-cdimage/ubuntu-cdimage
Merge into: lp:ubuntu-cdimage
Diff against target: 58 lines (+12/-0)
3 files modified
etc/default-arches (+1/-0)
etc/qa-products (+2/-0)
lib/cdimage/tree.py (+9/-0)
To merge this branch: bzr merge lp:~alexghiti/ubuntu-cdimage/ubuntu-cdimage
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+430449@code.launchpad.net

Commit message

This is an adapted version of rev 2071 and 2074 to fit the new RISC-V images for kinetic.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

One fix needed, which I'll attend to while merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/default-arches'
2--- etc/default-arches 2022-07-26 08:07:02 +0000
3+++ etc/default-arches 2022-09-26 08:38:15 +0000
4@@ -49,6 +49,7 @@
5 ubuntu-server daily-preinstalled focal armhf+raspi arm64+raspi riscv64+unleashed riscv64+unmatched
6 ubuntu-server daily-preinstalled impish armhf+raspi arm64+raspi riscv64+unmatched amd64 arm64
7 ubuntu-server daily-preinstalled jammy- armhf+raspi arm64+raspi riscv64+unmatched riscv64+visionfive riscv64+nezha amd64 arm64
8+ubuntu-server daily-preinstalled kinetic- armhf+raspi arm64+raspi riscv64+unmatched riscv64+visionfive riscv64+nezha riscv64+licheerv riscv64+icicle amd64 arm64
9 ubuntu-server * trusty amd64 amd64+mac i386 powerpc ppc64el
10 ubuntu-server * xenial amd64 arm64 i386 powerpc ppc64el s390x
11 ubuntu-server * bionic-focal amd64 arm64 ppc64el s390x
12
13=== modified file 'etc/qa-products'
14--- etc/qa-products 2022-08-31 21:31:57 +0000
15+++ etc/qa-products 2022-09-26 08:38:15 +0000
16@@ -79,6 +79,8 @@
17 Ubuntu Server riscv64+unmatched ubuntu-server daily-preinstalled preinstalled-server riscv64+unmatched iso
18 Ubuntu Server riscv64+visionfive ubuntu-server daily-preinstalled preinstalled-server riscv64+visionfive iso
19 Ubuntu Server riscv64+nezha ubuntu-server daily-preinstalled preinstalled-server riscv64+nezha iso
20+Ubuntu Server riscv64+licheerv ubuntu-server daily-preinstalled preinstalled-server riscv64+licheerv iso
21+Ubuntu Server riscv64+icicle ubuntu-server daily-preinstalled preinstalled-server riscv64+icicle iso
22 Ubuntu Server amd64 ubuntu-server daily-preinstalled preinstalled-server amd64 iso
23 Ubuntu Server arm64 ubuntu-server daily-preinstalled preinstalled-server arm64 iso
24 Ubuntu Server i386 ubuntu-server daily server i386 iso
25
26=== modified file 'lib/cdimage/tree.py'
27--- lib/cdimage/tree.py 2022-09-22 12:00:56 +0000
28+++ lib/cdimage/tree.py 2022-09-26 08:38:15 +0000
29@@ -836,6 +836,8 @@
30 "riscv64+unmatched": "RISC-V for SiFive HiFive Unmatched",
31 "riscv64+visionfive": "RISC-V for StarFive VisionFive",
32 "riscv64+nezha": "RISC-V for Allwinner Nezha",
33+ "riscv64+licheerv": "RISC-V for Sipeed LicheeRV Dock",
34+ "riscv64+icicle": "RISC-V for Microchip Polarfire Icicle Kit",
35 "s390x": "IBM System z",
36 "sparc": "SPARC",
37 }
38@@ -953,6 +955,12 @@
39 elif arch == "riscv64+nezha":
40 sentences.append(
41 "For RISC-V computers, with support for Allwinner Nezha")
42+ elif arch == "riscv64+licheerv":
43+ sentences.append(
44+ "For RISC-V computers, with support for Sipeed LicheeRV Dock")
45+ elif arch == "riscv64+icicle":
46+ sentences.append(
47+ "For RISC-V computers, with support for Microchip Polarfire Icicle Kit")
48 elif arch == "riscv64" and publish_type == "live-server":
49 sentences.append(
50 "For RISC-V computers. Requires copying your own first "
51@@ -1205,6 +1213,7 @@
52 "ia64",
53 "riscv64", "riscv64+unleashed", "riscv64+unmatched",
54 "riscv64+visionfive", "riscv64+nezha",
55+ "riscv64+licheerv", "riscv64+icicle",
56 "s390x",
57 "sparc",
58 )

Subscribers

People subscribed via source and target branches