--- data/os/fedoraproject.org/fedora-23.xml.in | 165 +++++++++++++++++++++ data/os/fedoraproject.org/fedora-unknown.xml.in | 8 +- po/POTFILES.in | 1 + .../Fedora-Live-Workstation-i686-23_Beta-1.iso.txt | 29 ++++ ...edora-Live-Workstation-x86_64-23_Beta-1.iso.txt | 29 ++++ .../fedora23/Fedora-Server-DVD-i386-23.iso.txt | 29 ++++ .../fedora23/Fedora-Server-DVD-x86_64-23.iso.txt | 29 ++++ .../fedora23/Fedora-Server-netinst-i386-23.iso.txt | 29 ++++ .../Fedora-Server-netinst-x86_64-23.iso.txt | 29 ++++ ...Fedora-Workstation-netinst-i386-23_Beta.iso.txt | 29 ++++ ...dora-Workstation-netinst-x86_64-23_Beta.iso.txt | 29 ++++ 11 files changed, 402 insertions(+), 4 deletions(-) create mode 100644 data/os/fedoraproject.org/fedora-23.xml.in create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt create mode 100644 test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt create mode 100644 test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt create mode 100644 test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in new file mode 100644 index 0000000..c9652aa --- /dev/null +++ b/data/os/fedoraproject.org/fedora-23.xml.in @@ -0,0 +1,165 @@ +<libosinfo version="0.0.1"> + <os id="http://fedoraproject.org/fedora/23";> + <short-id>fedora23</short-id> + <_name>Fedora 23</_name> + <version>23</version> + <_vendor>Fedora Project</_vendor> + <family>linux</family> + <distro>fedora</distro> + <upgrades id="http://fedoraproject.org/fedora/22"/> + <derives-from id="http://fedoraproject.org/fedora/22"/> + + <variant id="workstation"> + <_name>Fedora 23 Workstation</_name> + </variant> + <variant id="workstation-netinst"> + <_name>Fedora 23 Workstation</_name> + </variant> + <variant id="server"> + <_name>Fedora 23 Server</_name> + </variant> + <variant id="server-netinst"> + <_name>Fedora 23 Server</_name> + </variant> + + <!-- Workstation --> + + <!-- Live --> + <media arch="i686" live="true"> + <variant id="workstation"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Live-Workstation-i686-23-10.iso</url> + <iso> + <volume-id>Fedora-Live-WS-i686-23.*</volume-id> + <system-id>LINUX</system-id> + </iso> + <kernel>isolinux/vmlinuz0</kernel> + <initrd>isolinux/initrd0.img</initrd> + </media> + <media arch="x86_64" live="true"> + <variant id="workstation"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-23-10.iso</url> + <iso> + <volume-id>Fedora-Live-WS-x86_64-23.*</volume-id> + <system-id>LINUX</system-id> + </iso> + <kernel>isolinux/vmlinuz0</kernel> + <initrd>isolinux/initrd0.img</initrd> + </media> + + <!-- Network Installer !--> + <media arch="i686"> + <variant id="workstation-netinst"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/i386/iso/Fedora-Workstation-netinst-i386-23.iso</url> + <iso> + <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-i386</volume-id> + <system-id>LINUX</system-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <variant id="workstation-netinst"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-23.iso</url> + <iso> + <volume-id>Fedora-WS-23(_[[:alpha:]]*)*-x86_64</volume-id> + <system-id>LINUX</system-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + + <!-- Server --> + + <!-- DVD --> + <media arch="i686"> + <variant id="server"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-DVD-i386-23.iso</url> + <iso> + <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id> + <system-id>LINUX</system-id> + <!-- We need volume-size to distinguish DVD from netiso here: + + https://fedorahosted.org/rel-eng/ticket/6173 + --> + <volume-size>2254878720</volume-size> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <variant id="server"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-DVD-x86_64-23.iso</url> + <iso> + <volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id> + <system-id>LINUX</system-id> + <volume-size>2149087232</volume-size> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + + <!-- Network Installer !--> + <media arch="i686"> + <variant id="server-netinst"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/iso/Fedora-Server-netinst-i386-23.iso</url> + <iso> + <volume-id>Fedora-S-23(_[[:alpha:]]*)*-i386</volume-id> + <system-id>LINUX</system-id> + <volume-size>479557632</volume-size> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + <media arch="x86_64"> + <variant id="server-netinst"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/iso/Fedora-Server-netinst-x86_64-23.iso</url> + <iso> + <volume-id>Fedora-S-23(_[[:alpha:]]*)*-x86_64</volume-id> + <system-id>LINUX</system-id> + <volume-size>435079168</volume-size> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + </media> + + <tree arch="i686"> + <variant id="server"/> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/</url> + <treeinfo> + <family>Fedora</family> + <version>23</version> + <arch>i386</arch> + </treeinfo> + </tree> + <tree arch="x86_64"> + <url>http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/</url> + <variant id="server"/> + <treeinfo> + <family>Fedora</family> + <version>23</version> + <arch>x86_64</arch> + </treeinfo> + </tree> + + <!-- No install media or tree is provided for Fedora 23 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/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in index 3d2b9c5..f4b74b9 100644 --- a/data/os/fedoraproject.org/fedora-unknown.xml.in +++ b/data/os/fedoraproject.org/fedora-unknown.xml.in @@ -12,13 +12,13 @@ <media arch="i686"> <iso> - <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386</volume-id> + <volume-id>Fedora.*-([2-9][4-9]|[0-9]{3,}).*-i386</volume-id> <system-id>LINUX</system-id> </iso> </media> <media arch="x86_64"> <iso> - <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64</volume-id> + <volume-id>Fedora.*-([2-9][4-9]|[0-9]{3,}).*-x86_64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>isolinux/vmlinuz</kernel> @@ -27,13 +27,13 @@ <media arch="i686" live="true"> <iso> - <volume-id>Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,})</volume-id> + <volume-id>Fedora-Live-.*-i686-([2-9][4-9]|[0-9]{3,})</volume-id> <system-id>LINUX</system-id> </iso> </media> <media arch="x86_64" live="true"> <iso> - <volume-id>Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,})</volume-id> + <volume-id>Fedora-Live-.*-x86_64-([2-9][4-9]|[0-9]{3,})</volume-id> <system-id>LINUX</system-id> </iso> </media> diff --git a/po/POTFILES.in b/po/POTFILES.in index f5d40c8..56ff0b7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -58,6 +58,7 @@ data/os/fedoraproject.org/fedora-19.xml.in data/os/fedoraproject.org/fedora-20.xml.in data/os/fedoraproject.org/fedora-21.xml.in data/os/fedoraproject.org/fedora-22.xml.in +data/os/fedoraproject.org/fedora-23.xml.in data/os/fedoraproject.org/fedora-unknown.xml.in data/os/freebsd.org/freebsd-1.0.xml.in data/os/freebsd.org/freebsd-2.0.5.xml.in diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt new file mode 100644 index 0000000..00240d9 --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-i686-23_Beta-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-WS-i686-23_B-1 +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: 709990 +El Torito VD version 1 found, boot catalog is in sector 36 +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 25 37 diff --git a/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt new file mode 100644 index 0000000..5880a32 --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Live-Workstation-x86_64-23_Beta-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-WS-x86_64-23_B-1 +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: 716965 +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 842 2114 diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt new file mode 100644 index 0000000..27eabb4 --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-i386-23.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-23-i386 +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: 1101015 +El Torito VD version 1 found, boot catalog is in sector 404 +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 195 405 diff --git a/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt new file mode 100644 index 0000000..136c323 --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Server-DVD-x86_64-23.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-23-x86_64 +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: 1049359 +El Torito VD version 1 found, boot catalog is in sector 417 +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 3651 13905 diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt new file mode 100644 index 0000000..f7a14cd --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-i386-23.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-23-i386 +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: 234159 +El Torito VD version 1 found, boot catalog is in sector 38 +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 390FA 233722 diff --git a/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt new file mode 100644 index 0000000..22e13fd --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Server-netinst-x86_64-23.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-23-x86_64 +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: 212441 +El Torito VD version 1 found, boot catalog is in sector 44 +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 3329D 209565 diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt new file mode 100644 index 0000000..3767783 --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-i386-23_Beta.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-WS-23_B-i386 +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: 281215 +El Torito VD version 1 found, boot catalog is in sector 39 +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 448C9 280777 diff --git a/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt new file mode 100644 index 0000000..bf6053e --- /dev/null +++ b/test/isodata/fedora/fedora23/Fedora-Workstation-netinst-x86_64-23_Beta.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-WS-23_B-x86_64 +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: 238732 +El Torito VD version 1 found, boot catalog is in sector 45 +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 3994F 235855 -- 2.5.0 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
