[PATCH 4/4] ubuntu: Add 20.04 entry
Christian Ehrhardt
christian.ehrhardt at canonical.com
Tue Feb 11 15:55:50 UTC 2020
Changes since 19.10
- updated Dates
- Updated URLs - since we are pre-release using daily builds
- drop i386 that is no more supported
- use LTS IDs as in the 18.04 data
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
data/os/ubuntu.com/ubuntu-20.04.xml.in | 160 ++++++++++++++++++
.../ubuntu-20.04-desktop-amd64.iso.txt | 29 ++++
.../ubuntu-20.04-live-server-amd64.iso.txt | 29 ++++
.../ubuntu-20.04-live-server-arm64.iso.txt | 29 ++++
.../ubuntu-20.04-live-server-ppc64el.iso.txt | 17 ++
.../ubuntu-20.04-live-server-s390x.iso.txt | 29 ++++
.../ubuntu-20.04-server-amd64.iso.txt | 29 ++++
.../ubuntu-20.04-server-arm64.iso.txt | 29 ++++
.../ubuntu-20.04-server-ppc64el.iso.txt | 17 ++
.../ubuntu-20.04-server-s390x.iso.txt | 29 ++++
10 files changed, 397 insertions(+)
create mode 100644 data/os/ubuntu.com/ubuntu-20.04.xml.in
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt
create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt
diff --git a/data/os/ubuntu.com/ubuntu-20.04.xml.in b/data/os/ubuntu.com/ubuntu-20.04.xml.in
new file mode 100644
index 00000000..2684dcad
--- /dev/null
+++ b/data/os/ubuntu.com/ubuntu-20.04.xml.in
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://ubuntu.com/ubuntu/20.04">
+ <short-id>ubuntu20.04</short-id>
+ <short-id>ubuntufocal</short-id>
+ <_name>Ubuntu 20.04</_name>
+ <version>20.04</version>
+ <_vendor>Canonical Ltd</_vendor>
+ <family>linux</family>
+ <distro>ubuntu</distro>
+ <codename>Focal Fossa</codename>
+ <upgrades id="http://ubuntu.com/ubuntu/19.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/19.10"/>
+
+ <release-date>2020-04-23</release-date>
+ <eol-date>2030-04-23</eol-date>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>2147483648</ram>
+ <storage>5368709120</storage>
+ </minimum>
+ <recommended>
+ <cpu>2000000000</cpu>
+ <ram>4294967296</ram>
+ <storage>26843545600</storage>
+ </recommended>
+ </resources>
+
+ <media arch="x86_64">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS amd64</volume-id>
+ </iso>
+ <kernel>install/vmlinuz</kernel>
+ <initrd>install/initrd.gz</initrd>
+ <installer>
+ <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+ </installer>
+ </media>
+ <media arch="x86_64" live="true" installer-script="false">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-amd64.iso</url>
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS amd64</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd</initrd>
+ </media>
+ <!-- Although desktop media should support unattended installation,
+ it seems to be broken using the very same preseed file used
+ with the server media (for a "desktop" installation).
+ People from Canonical were already contacted about this and
+ once it's solved, we can remove the installer-script="false"
+ attribute and add support for the "desktop" installer script
+ for this media. -->
+ <media arch="x86_64" live="true" installer-script="false">
+ <url>http://cdimage.ubuntu.com/daily-live/current/focal-desktop-amd64.iso</url>
+ <!-- after release date the release-build will be at <url>http://releases.ubuntu.com/20.04/ubuntu-20.04-desktop-amd64.iso</url> -->
+ <iso>
+ <volume-id>Ubuntu 20.04(.\d\+?)? LTS amd64</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd</initrd>
+ </media>
+ <media arch="aarch64">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-arm64.iso</url>
+ <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-server-arm64.iso</url> -->
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS arm64</volume-id>
+ </iso>
+ <kernel>install/vmlinuz</kernel>
+ <initrd>install/initrd.gz</initrd>
+ </media>
+ <media arch="aarch64" live="true" installer-script="false">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-arm64.iso</url>
+ <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-live-server-arm64.iso</url> -->
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS arm64</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd</initrd>
+ </media>
+ <media arch="ppc64le">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-ppc64el.iso</url>
+ <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-server-ppc64el.iso</url> -->
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS ppc64</volume-id>
+ </iso>
+ <kernel>install/vmlinux</kernel>
+ <initrd>install/initrd.gz</initrd>
+ </media>
+ <media arch="ppc64le" live="true" installer-script="false">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-ppc64el.iso</url>
+ <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-live-server-ppc64el.iso</url> -->
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS ppc64</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd</initrd>
+ </media>
+ <media arch="s390x">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-s390x.iso</url>
+ <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-server-s390x.iso</url> -->
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS s390x</volume-id>
+ </iso>
+ <kernel>boot/kernel.ubuntu</kernel>
+ <initrd>boot/initrd.ubuntu</initrd>
+ </media>
+ <media arch="s390x" live="true" installer-script="false">
+ <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-s390x.iso</url>
+ <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-live-server-s390x.iso</url> -->
+ <iso>
+ <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS s390x</volume-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd</initrd>
+ </media>
+
+ <tree arch="x86_64">
+ <url>http://archive.ubuntu.com/ubuntu/dists/focal/main/installer-amd64</url>
+ <kernel>current/images/netboot/ubuntu-installer/amd64/linux</kernel>
+ <initrd>current/images/netboot/ubuntu-installer/amd64/initrd.gz</initrd>
+ </tree>
+
+ <image arch="x86_64" format="qcow2" cloud-init="true">
+ <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img</url>
+ </image>
+
+ <image arch="x86_64" format="vmdk" cloud-init="true">
+ <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.vmdk</url>
+ </image>
+
+ <image arch="aarch64" format="qcow2" cloud-init="true">
+ <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-arm64.img</url>
+ </image>
+
+ <image arch="armv7l" format="qcow2" cloud-init="true">
+ <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-armhf.img</url>
+ </image>
+
+ <image arch="ppc64le" format="qcow2" cloud-init="true">
+ <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-ppc64el.img</url>
+ </image>
+
+ <image arch="s390x" format="qcow2" cloud-init="true">
+ <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-s390x.img</url>
+ </image>
+
+ <installer>
+ <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+ <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+ </installer>
+ </os>
+</libosinfo>
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt
new file mode 100644
index 00000000..bd04ea2f
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu 20.04 LTS amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1240320
+El Torito VD version 1 found, boot catalog is in sector 269
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff F7E76 1015414
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt
new file mode 100644
index 00000000..5784e278
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 445952
+El Torito VD version 1 found, boot catalog is in sector 217
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 53C64 343140
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt
new file mode 100644
index 00000000..89f51378
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS arm64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 414702
+El Torito VD version 1 found, boot catalog is in sector 362
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 239 (Unknown Arch)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 400
+ Bootoff 505B7 329143
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt
new file mode 100644
index 00000000..cc4433b9
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS ppc64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 450558
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt
new file mode 100644
index 00000000..5c3226de
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS s390x
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 365721
+El Torito VD version 1 found, boot catalog is in sector 126
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 3628
+ Bootoff 7F 127
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt
new file mode 100644
index 00000000..062db03b
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS amd64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 406016
+El Torito VD version 1 found, boot catalog is in sector 4274
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 239 (Unknown Arch)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 400
+ Bootoff 1B3F7 111607
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt
new file mode 100644
index 00000000..28941258
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS arm64
+Volume set id:
+Publisher id:
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id:
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 429247
+El Torito VD version 1 found, boot catalog is in sector 4274
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 239 (Unknown Arch)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 400
+ Bootoff 1B3F7 111607
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt
new file mode 100644
index 00000000..f940f89b
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS ppc64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 432834
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt
new file mode 100644
index 00000000..e0aff20a
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: Ubuntu-Server 20.04 LTS s390x
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id:
+Abstract File id:
+Bibliographic File id:
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 325677
+El Torito VD version 1 found, boot catalog is in sector 1952
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID ''
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect FFFFE4E8
+ Bootoff 7A1 1953
--
2.25.0
More information about the Libosinfo
mailing list