Sure, thanks for the review! Feel free to amend the proposed changes. Acked-by: Felipe Borges <feborges@xxxxxxxxxx> On Thu, May 2, 2019 at 9:46 AM Fabiano Fidêncio <fidencio@xxxxxxxxxx> wrote: > > Felipe, > > On Tue, 2019-04-30 at 17:51 +0200, Felipe Borges wrote: > > Signed-off-by: Felipe Borges <feborges@xxxxxxxxxx> > > --- > > data/os/fedoraproject.org/fedora-30.xml.in | 162 > > ++++++++++++++++++ > > .../Fedora-Server-dvd-x86_64-30-1.2.iso.txt | 29 ++++ > > ...edora-Server-netinst-x86_64-30-1.2.iso.txt | 29 ++++ > > ...ora-Workstation-Live-x86_64-30-1.2.iso.txt | 29 ++++ > > ...-Workstation-netinst-x86_64-30-1.2.iso.txt | 29 ++++ > > We're missing the ISO data for Fedora Everything. > > > 5 files changed, 278 insertions(+) > > create mode 100644 data/os/fedoraproject.org/fedora-30.xml.in > > create mode 100644 tests/isodata/fedora/fedora30/Fedora-Server-dvd- > > x86_64-30-1.2.iso.txt > > create mode 100644 tests/isodata/fedora/fedora30/Fedora-Server- > > netinst-x86_64-30-1.2.iso.txt > > create mode 100644 tests/isodata/fedora/fedora30/Fedora-Workstation- > > Live-x86_64-30-1.2.iso.txt > > create mode 100644 tests/isodata/fedora/fedora30/Fedora-Workstation- > > netinst-x86_64-30-1.2.iso.txt > > > > diff --git a/data/os/fedoraproject.org/fedora-30.xml.in > > b/data/os/fedoraproject.org/fedora-30.xml.in > > new file mode 100644 > > index 0000000..9899b53 > > --- /dev/null > > +++ b/data/os/fedoraproject.org/fedora-30.xml.in > > @@ -0,0 +1,162 @@ > > +<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://fedoraproject.org/fedora/30";> > > + <short-id>fedora30</short-id> > > + <_name>Fedora 30</_name> > > + <version>30</version> > > + <_vendor>Fedora Project</_vendor> > > + <family>linux</family> > > + <distro>fedora</distro> > > + <upgrades id="http://fedoraproject.org/fedora/29"/> > > + <derives-from id="http://fedoraproject.org/fedora/29"/> > > + > > + <release-date>2019-04-30</release-date> > > + > > + <variant id="workstation"> > > + <_name>Fedora 30 Workstation</_name> > > + </variant> > > + <variant id="workstation-netinst"> > > + <_name>Fedora 30 Workstation</_name> > > + </variant> > > + <variant id="server"> > > + <_name>Fedora 30 Server</_name> > > + </variant> > > + <variant id="server-netinst"> > > + <_name>Fedora 30 Server</_name> > > + </variant> > > + <variant id="everything-netinst"> > > + <_name>Fedora 30 Everything</_name> > > + </variant> > > + > > + <!-- Workstation --> > > + > > + <!-- Live --> > > + <media arch="x86_64" live="true" installer-script="false"> > > + <variant id="workstation"/> > > + <url> > > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-30-1.2.iso</url > > > > > + <iso> > > + <volume-id>Fedora-WS-Live-30.*</volume-id> > > + <system-id>LINUX</system-id> > > Fedora WS Live has removed the "System id:" field from its media, so > the line above must be removed as well. > > > + </iso> > > + <kernel>isolinux/vmlinuz</kernel> > > + <initrd>isolinux/initrd.img</initrd> > > + </media> > > + > > + <!-- Network Installer !--> > > + <media arch="x86_64"> > > + <variant id="workstation-netinst"/> > > + <url> > > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-30-1.2.iso</url > > > > > + <iso> > > + <volume-id>Fedora-WS-dvd-x86_64-30</volume-id> > > + <system-id>LINUX</system-id> > > > Fedora WS netinst has removed the "System id:" field from its media, so > the line above must be removed as well. > > > + </iso> > > + <kernel>isolinux/vmlinuz</kernel> > > + <initrd>isolinux/initrd.img</initrd> > > + <installer> > > + <script id=' > > http://fedoraproject.org/fedora/kickstart/desktop'/> > > + </installer> > > + </media> > > + > > + <!-- Server --> > > + > > + <!-- DVD --> > > + <media arch="x86_64"> > > + <variant id="server"/> > > + <url> > > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/iso/Fedora-Server-dvd-x86_64-30-1.2.iso</url > > > > > + <iso> > > + <volume-id>Fedora-S-dvd-x86_64-30</volume-id> > > + <system-id>LINUX</system-id> > > + <volume-size>3176691712</volume-size> > > > Fedora Server DVD still has its system-id set to "LINUX" but, as Fedora > Server netinst dropped it, we can just drop the volume size attribute. > > > + </iso> > > + <kernel>isolinux/vmlinuz</kernel> > > + <initrd>isolinux/initrd.img</initrd> > > + <installer> > > + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/ > > > > > + </installer> > > + </media> > > + > > + <!-- Network Installer !--> > > + <media arch="x86_64"> > > + <variant id="server-netinst"/> > > + <url> > > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2.iso</url > > > > > + <iso> > > + <volume-id>Fedora-S-dvd-x86_64-30</volume-id> > > + <system-id>LINUX</system-id> > > Fedora Server netinst has removed the "System id:" field from its > media, so the line above must be removed as well. > > > + <volume-size>625999872</volume-size> > > And as the DVD and netinst can be differentiated by the presence (or > not) of the "System id", we can also drop the line above. > > > + </iso> > > + <kernel>isolinux/vmlinuz</kernel> > > + <initrd>isolinux/initrd.img</initrd> > > + <installer> > > + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/ > > > > > + </installer> > > + </media> > > + > > + <!-- Everything --> > > + <media arch="x86_64"> > > + <variant id="everything-netinst"/> > > + <url> > > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-30-1.2.iso</url > > > > > + <iso> > > + <volume-id>Fedora-E-dvd-x86_64-30</volume-id> > > + <system-id>LINUX</system-id> > > + </iso> > > + <kernel>isolinux/vmlinuz</kernel> > > + <initrd>isolinux/initrd.img</initrd> > > + <installer> > > + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/ > > > > > + <script id=' > > http://fedoraproject.org/fedora/kickstart/desktop'/> > > + </installer> > > + </media> > > + > > + <tree arch="x86_64"> > > + <url> > > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/os</url > > > > > + <variant id="workstation"/> > > + <treeinfo> > > + <family>Fedora</family> > > + <version>30</version> > > + <arch>x86_64</arch> > > + <variant>Workstation</variant> > > + </treeinfo> > > + </tree> > > + > > + <tree arch="x86_64"> > > + <url> > > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/os</url > > > > > + <variant id="server"/> > > + <treeinfo> > > + <family>Fedora</family> > > + <version>30</version> > > + <arch>x86_64</arch> > > + <variant>Server</variant> > > + </treeinfo> > > + </tree> > > + > > + <image arch="x86_64" format="qcow2" cloud-init="true"> > > + <url> > > https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2</url > > > > > + </image> > > + > > + <image arch="aarch64" format="qcow2" cloud-init="true"> > > + <url> > > https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/aarch64/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2</url > > > > > + </image> > > + > > + <!-- No install media or tree is provided for Fedora 30 Cloud > > variant --> > > + > > + <resources arch="all"> > > + <minimum> > > + <n-cpus>1</n-cpus> > > + <cpu>1000000000</cpu> > > + <ram>1073741824</ram> > > + <storage>10737418240</storage> > > + </minimum> > > + > > + <recommended> > > + <ram>2147483648</ram> > > + <storage>21474836480</storage> > > + </recommended> > > + </resources> > > + > > + <installer> > > + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> > > + <script id=' > > http://fedoraproject.org/fedora/kickstart/desktop'/> > > + </installer> > > + </os> > > +</libosinfo> > > diff --git a/tests/isodata/fedora/fedora30/Fedora-Server-dvd-x86_64- > > 30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-Server-dvd- > > x86_64-30-1.2.iso.txt > > new file mode 100644 > > index 0000000..528caeb > > --- /dev/null > > +++ b/tests/isodata/fedora/fedora30/Fedora-Server-dvd-x86_64-30- > > 1.2.iso.txt > > @@ -0,0 +1,29 @@ > > +CD-ROM is in ISO 9660 format > > +System id: LINUX > > +Volume id: Fedora-S-dvd-x86_64-30 > > +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: 1551119 > > +El Torito VD version 1 found, boot catalog is in sector 532 > > +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 4A991 305553 > > diff --git a/tests/isodata/fedora/fedora30/Fedora-Server-netinst- > > x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-Server- > > netinst-x86_64-30-1.2.iso.txt > > new file mode 100644 > > index 0000000..ef3c06c > > --- /dev/null > > +++ b/tests/isodata/fedora/fedora30/Fedora-Server-netinst-x86_64-30- > > 1.2.iso.txt > > @@ -0,0 +1,29 @@ > > +CD-ROM is in ISO 9660 format > > +System id: > > +Volume id: Fedora-S-dvd-x86_64-30 > > +Volume set id: > > +Publisher id: > > +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0, > > LIBISOFS-1.5.0, LIBBURN-1.5.0 > > +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: 305664 > > +El Torito VD version 1 found, boot catalog is in sector 40 > > +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 3CA4 15524 > > diff --git a/tests/isodata/fedora/fedora30/Fedora-Workstation-Live- > > x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora- > > Workstation-Live-x86_64-30-1.2.iso.txt > > new file mode 100644 > > index 0000000..89a21e1 > > --- /dev/null > > +++ b/tests/isodata/fedora/fedora30/Fedora-Workstation-Live-x86_64- > > 30-1.2.iso.txt > > @@ -0,0 +1,29 @@ > > +CD-ROM is in ISO 9660 format > > +System id: > > +Volume id: Fedora-WS-Live-30-1-2 > > +Volume set id: > > +Publisher id: > > +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0, > > LIBISOFS-1.5.0, LIBBURN-1.5.0 > > +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: 944704 > > +El Torito VD version 1 found, boot catalog is in sector 42 > > +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 3CA6 15526 > > diff --git a/tests/isodata/fedora/fedora30/Fedora-Workstation- > > netinst-x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora- > > Workstation-netinst-x86_64-30-1.2.iso.txt > > new file mode 100644 > > index 0000000..ac1abcb > > --- /dev/null > > +++ b/tests/isodata/fedora/fedora30/Fedora-Workstation-netinst- > > x86_64-30-1.2.iso.txt > > @@ -0,0 +1,29 @@ > > +CD-ROM is in ISO 9660 format > > +System id: > > +Volume id: Fedora-WS-dvd-x86_64-30 > > +Volume set id: > > +Publisher id: > > +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0, > > LIBISOFS-1.5.0, LIBBURN-1.5.0 > > +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: 305664 > > +El Torito VD version 1 found, boot catalog is in sector 40 > > +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 3CA4 15524 > > > So, there's no need to submit a v2 as I can just push this patch with > the changes mentioned if you agree with them (I'd like to get an ACK > from you in the proposed changes). > > Also, We'd have to bump the regex for Fedora Unknown (currently it > matches 30+, but should match 31+). I also can fix this before pushing. > > Thanks for the contribution! > > Best Regards, > -- > Fabiano Fidêncio > > _______________________________________________ > Libosinfo mailing list > Libosinfo@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libosinfo _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
