On Thu, Jun 2, 2016 at 6:59 PM, Christophe Fergeau <cfergeau@xxxxxxxxxx> wrote: > --- > Changes since v1: > - fixed initrd/kernel paths > > > data/os/ubuntu.com/ubuntu-16.04.xml.in | 86 ++++++++++++++++++++++ > po/POTFILES.in | 1 + > .../ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt | 29 ++++++++ > .../ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt | 29 ++++++++ > .../ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt | 29 ++++++++ > .../ubuntu16.04/ubuntu-16.04-server-i386.iso.txt | 29 ++++++++ > .../ubuntu-16.04-server-powerpc.iso.txt | 17 +++++ > .../ubuntu-16.04-server-ppc64el.iso.txt | 17 +++++ > .../ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt | 29 ++++++++ > 9 files changed, 266 insertions(+) > create mode 100644 data/os/ubuntu.com/ubuntu-16.04.xml.in > create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt > create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt > create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt > create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt > create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt > create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt > create mode 100644 test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt > > diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in > new file mode 100644 > index 0000000..43e8071 > --- /dev/null > +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in > @@ -0,0 +1,86 @@ > +<libosinfo version="0.0.1"> > + <os id="http://ubuntu.com/ubuntu/16.04";> > + <short-id>ubuntu16.04</short-id> > + <short-id>ubuntutxenial</short-id> > + <_name>Ubuntu 16.04</_name> > + <version>16.04</version> > + <_vendor>Canonical Ltd</_vendor> > + <family>linux</family> > + <distro>ubuntu</distro> > + <codename>Xenial Xerus</codename> > + <upgrades id="http://ubuntu.com/ubuntu/15.10"/> > + <derives-from id="http://ubuntu.com/ubuntu/15.10"/> > + > + <release-date>2016-04-21</release-date> > + <eol-date>2021-04-22</eol-date> > + > + <resources arch="all"> > + <minimum> > + <cpu>1000000000</cpu> > + <n-cpus>1</n-cpus> > + <ram>1073741824</ram> > + <storage>5368709120</storage> > + </minimum> > + <recommended> > + <cpu>1000000000</cpu> > + <ram>1073741824</ram> > + <storage>16106127360</storage> > + </recommended> > + </resources> > + > + <media arch="i686"> > + <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-i386.iso</url> > + <iso> > + <volume-id>Ubuntu-Server 16.04(.\d)? LTS i386</volume-id> > + </iso> > + <kernel>install/vmlinuz</kernel> > + <initrd>install/initrd.gz</initrd> > + </media> > + <media arch="x86_64"> > + <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-server-amd64.iso</url> > + <iso> > + <volume-id>Ubuntu-Server 16.04(.\d)? LTS amd64</volume-id> > + </iso> > + <kernel>install/vmlinuz</kernel> > + <initrd>install/initrd.gz</initrd> > + </media> > + <media arch="i686" live="true"> > + <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-i386.iso</url> > + <iso> > + <volume-id>Ubuntu 16.04(.\d)? LTS i386</volume-id> > + </iso> > + <kernel>casper/vmlinuz</kernel> > + <initrd>casper/initrd.lz</initrd> > + </media> > + <media arch="x86_64" live="true"> > + <url>http://releases.ubuntu.com/releases/xenial/ubuntu-16.04-desktop-amd64.iso</url> > + <iso> > + <volume-id>Ubuntu 16.04(.\d)? LTS amd64</volume-id> > + </iso> > + <kernel>casper/vmlinuz</kernel> > + <initrd>casper/initrd.lz</initrd> > + </media> > + <media arch="ppc"> > + <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-powerpc.iso</url> > + <iso> > + <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc</volume-id> > + </iso> > + </media> > + <media arch="ppc64le"> > + <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-ppc64el.iso</url> > + <iso> > + <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc64</volume-id> > + </iso> > + </media> > + <media arch="s390x"> > + <url>http://cdimage.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-s390x.iso</url> > + <iso> > + <volume-id>Ubuntu-Server 16.04(.\d)? LTS s390x</volume-id> > + </iso> > + </media> > + > + <installer> > + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> > + </installer> > + </os> > +</libosinfo> > diff --git a/po/POTFILES.in b/po/POTFILES.in > index c0e3746..446432a 100644 > --- a/po/POTFILES.in > +++ b/po/POTFILES.in > @@ -344,6 +344,7 @@ data/os/ubuntu.com/ubuntu-14.04.xml.in > data/os/ubuntu.com/ubuntu-14.10.xml.in > data/os/ubuntu.com/ubuntu-15.04.xml.in > data/os/ubuntu.com/ubuntu-15.10.xml.in > +data/os/ubuntu.com/ubuntu-16.04.xml.in > data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in > data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in > data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in > diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt > new file mode 100644 > index 0000000..aa2b24a > --- /dev/null > +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-amd64.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: Ubuntu 16.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: 725528 > +El Torito VD version 1 found, boot catalog is in sector 166 > +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 AF6CA 718538 > diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt > new file mode 100644 > index 0000000..cd34bb8 > --- /dev/null > +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-desktop-i386.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: Ubuntu 16.04 LTS i386 > +Volume set id: > +Publisher id: > +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8 > +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: 734400 > +El Torito VD version 1 found, boot catalog is in sector 252 > +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 B26BE 730814 > diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt > new file mode 100644 > index 0000000..102d6f1 > --- /dev/null > +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-amd64.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: Ubuntu-Server 16.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: 335360 > +El Torito VD version 1 found, boot catalog is in sector 1938 > +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 343C0 213952 > diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt > new file mode 100644 > index 0000000..2fdef8e > --- /dev/null > +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-i386.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: Ubuntu-Server 16.04 LTS i386 > +Volume set id: > +Publisher id: > +Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8 > +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: 331264 > +El Torito VD version 1 found, boot catalog is in sector 3788 > +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 34DF5 216565 > diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt > new file mode 100644 > index 0000000..4a0f992 > --- /dev/null > +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-powerpc.iso.txt > @@ -0,0 +1,17 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: Ubuntu-Server 16.04 LTS ppc > +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: 364644 > +CD-ROM uses ISO 9660:1999 relaxed format > +NO Joliet present > +Rock Ridge signatures version 1 found > diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt > new file mode 100644 > index 0000000..c430fa9 > --- /dev/null > +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-ppc64el.iso.txt > @@ -0,0 +1,17 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: Ubuntu-Server 16.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: 319480 > +CD-ROM uses ISO 9660:1999 relaxed format > +NO Joliet present > +Rock Ridge signatures version 1 found > diff --git a/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt > new file mode 100644 > index 0000000..6ab2887 > --- /dev/null > +++ b/test/isodata/ubuntu/ubuntu16.04/ubuntu-16.04-server-s390x.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: Ubuntu-Server 16.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: 281237 > +El Torito VD version 1 found, boot catalog is in sector 1845 > +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 FFFFD8D0 > + Bootoff 736 1846 > -- > 2.7.4 > > _______________________________________________ > Libosinfo mailing list > Libosinfo@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libosinfo Acked-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx> _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
