From: Thierry Vignaud <thierry.vignaud@xxxxxxxxx> --- data/os/mageia.org/mageia-4.xml.in | 67 ++++++++++++++++++++++ data/os/mageia.org/mageia-unknown.xml.in | 8 +-- po/POTFILES.in | 1 + .../Mageia-4-LiveCD-GNOME-en-i586-CD.iso.txt | 29 ++++++++++ .../Mageia-4-LiveCD-KDE4-en-i586-CD.iso.txt | 29 ++++++++++ .../Mageia-4-LiveDVD-GNOME-i586-DVD.iso.txt | 29 ++++++++++ .../Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso.txt | 29 ++++++++++ .../mageia4/Mageia-4-LiveDVD-KDE4-i586-DVD.iso.txt | 29 ++++++++++ .../Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso.txt | 29 ++++++++++ .../mageia/mageia4/Mageia-4-dual-DVD.iso.txt | 29 ++++++++++ .../mageia/mageia4/Mageia-4-i586-DVD.iso.txt | 29 ++++++++++ .../mageia/mageia4/Mageia-4-x86_64-DVD.iso.txt | 29 ++++++++++ 12 files changed, 333 insertions(+), 4 deletions(-) create mode 100644 data/os/mageia.org/mageia-4.xml.in create mode 100644 test/isodata/mageia/mageia4/Mageia-4-LiveCD-GNOME-en-i586-CD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-LiveCD-KDE4-en-i586-CD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-i586-DVD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-i586-DVD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-dual-DVD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-i586-DVD.iso.txt create mode 100644 test/isodata/mageia/mageia4/Mageia-4-x86_64-DVD.iso.txt diff --git a/data/os/mageia.org/mageia-4.xml.in b/data/os/mageia.org/mageia-4.xml.in new file mode 100644 index 0000000..5c1c9bb --- /dev/null +++ b/data/os/mageia.org/mageia-4.xml.in @@ -0,0 +1,67 @@ +<libosinfo version="0.0.1"> + <os id="http://mageia.org/mageia/4";> + <short-id>mageia4</short-id> + <_name>Mageia 4</_name> + <_vendor>Mageia</_vendor> + <family>linux</family> + <distro>mageia</distro> + <version>4</version> + <derives-from id="http://mageia.org/mageia/3"/> + <release-date>2014-02-01</release-date> + <eol-date>2015-09-19</eol-date> + + <media arch="i686"> + <variant id="net-install"/> + <url>ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/4/i586/install/images/boot.iso</url> + <iso> + <volume-id>Mga Boot ISO</volume-id> + </iso> + <kernel>isolinux/i386/vmlinuz</kernel> + <initrd>isolinux/i386/all.rdz</initrd> + </media> + + <media arch="x86_64"> + <variant id="net-install"/> + <url>ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/4/x86_64/install/images/boot.iso</url> + <iso> + <volume-id>Mageia 4 x86_64 Netinstall</volume-id> + </iso> + <kernel>isolinux/x86_64/vmlinuz</kernel> + <initrd>isolinux/x86_64/all.rdz</initrd> + </media> + + <media arch="i686"> + <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4-i586-DVD.iso</url> +<!-- + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-dual-CD.iso</url> +--> + <iso> + <volume-id>Mageia-4(-i586)?</volume-id> + </iso> + <kernel>isolinux/i386/vmlinuz</kernel> + <initrd>isolinux/i386/all.rdz</initrd> + </media> + <media arch="x86_64"> + <url>https://www.mageia.org/en/downloads/get/?q=Mageia-4-x86_64-DVD.iso</url> +<!-- + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-dual-CD.iso</url> +--> + <iso> + <volume-id>Mageia-4(-x86_64)?</volume-id> + </iso> + <kernel>isolinux/x86_64/vmlinuz</kernel> + <initrd>isolinux/x86_64/all.rdz</initrd> + </media> + <media live="true" arch="i686"> + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-LiveDVD-KDE4-i586-DVD.iso</url> +<!-- + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-LiveDVD-GNOME-i586-DVD.iso</url> + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-LiveCD-KDE4-en-i586-CD.iso</url> + <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-LiveCD-GNOME-en-i586-CD.iso</url> +--> + <iso> + <volume-id>Mageia-4-(GNOME|KDE4)-Live(CD|DVD)</volume-id> + </iso> + </media> + </os> +</libosinfo> diff --git a/data/os/mageia.org/mageia-unknown.xml.in b/data/os/mageia.org/mageia-unknown.xml.in index 5eff18c..859f4ea 100644 --- a/data/os/mageia.org/mageia-unknown.xml.in +++ b/data/os/mageia.org/mageia-unknown.xml.in @@ -7,7 +7,7 @@ <family>linux</family> <distro>mageia</distro> <version>unknown</version> - <derives-from id="http://mageia.org/mageia/3"/> + <derives-from id="http://mageia.org/mageia/4"/> <media arch="i686"> <variant id="net-install"/> @@ -32,7 +32,7 @@ <media arch="i686"> <variant id="regular-installer"/> <iso> - <volume-id>Mageia-[4-9]-.*i586</volume-id> + <volume-id>Mageia-[5-9]-.*i586</volume-id> </iso> <kernel>isolinux/i386/vmlinuz</kernel> <initrd>isolinux/i386/all.rdz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <variant id="regular-installer"/> <iso> - <volume-id>Mageia-[4-9].*x86_64</volume-id> + <volume-id>Mageia-[5-9].*x86_64</volume-id> </iso> <kernel>isolinux/x86_64/vmlinuz</kernel> <initrd>isolinux/x86_64/all.rdz</initrd> @@ -51,7 +51,7 @@ <media live="true" arch="x86_64"> <variant id="live"/> <iso> - <volume-id>Mageia-[4-9]-(GNOME|KDE4)-Live(CD|DVD)</volume-id> + <volume-id>Mageia-[5-9]-(GNOME|KDE4)-Live(CD|DVD)</volume-id> </iso> </media> </os> diff --git a/po/POTFILES.in b/po/POTFILES.in index fecdd95..b086dee 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -117,6 +117,7 @@ data/os/gnome.org/gnome-continuous-3.14.xml.in data/os/mageia.org/mageia-1.xml.in data/os/mageia.org/mageia-2.xml.in data/os/mageia.org/mageia-3.xml.in +data/os/mageia.org/mageia-4.xml.in data/os/mandriva.com/mandrake-5.1.xml.in data/os/mandriva.com/mandrake-5.2.xml.in data/os/mandriva.com/mandrake-5.3.xml.in diff --git a/test/isodata/mageia/mageia4/Mageia-4-LiveCD-GNOME-en-i586-CD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-LiveCD-GNOME-en-i586-CD.iso.txt new file mode 100644 index 0000000..063319f --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-LiveCD-GNOME-en-i586-CD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Mageia-4-GNOME-LiveCD +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: 335695 +El Torito VD version 1 found, boot catalog is in sector 49 +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 1C5 453 diff --git a/test/isodata/mageia/mageia4/Mageia-4-LiveCD-KDE4-en-i586-CD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-LiveCD-KDE4-en-i586-CD.iso.txt new file mode 100644 index 0000000..9123332 --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-LiveCD-KDE4-en-i586-CD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Mageia-4-KDE4-LiveCD +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: 332276 +El Torito VD version 1 found, boot catalog is in sector 49 +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 1C5 453 diff --git a/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-i586-DVD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-i586-DVD.iso.txt new file mode 100644 index 0000000..93f0b97 --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-i586-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Mageia-4-GNOME-LiveDVD +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: 713728 +El Torito VD version 1 found, boot catalog is in sector 49 +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 1C5 453 diff --git a/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso.txt new file mode 100644 index 0000000..f383320 --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-GNOME-x86_64-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Mageia-4-GNOME-LiveDVD +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: 741346 +El Torito VD version 1 found, boot catalog is in sector 57 +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 1CD 461 diff --git a/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-i586-DVD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-i586-DVD.iso.txt new file mode 100644 index 0000000..3dc6c14 --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-i586-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Mageia-4-KDE4-LiveDVD +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: 752819 +El Torito VD version 1 found, boot catalog is in sector 49 +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 1C5 453 diff --git a/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso.txt new file mode 100644 index 0000000..a40799b --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-LiveDVD-KDE4-x86_64-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Mageia-4-KDE4-LiveDVD +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: 780836 +El Torito VD version 1 found, boot catalog is in sector 57 +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 1CD 461 diff --git a/test/isodata/mageia/mageia4/Mageia-4-dual-DVD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-dual-DVD.iso.txt new file mode 100644 index 0000000..6f0dab5 --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-dual-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: Mageia.Org +Volume id: Mageia-4 +Volume set id: Mageia.Org Mageia - 4 +Publisher id: Mageia.Org +Data preparer id: Mageia.Org BCD +Application id: Mageia - 4 +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: 526334 +El Torito VD version 1 found, boot catalog is in sector 356 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Mageia.Org' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 165 357 diff --git a/test/isodata/mageia/mageia4/Mageia-4-i586-DVD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-i586-DVD.iso.txt new file mode 100644 index 0000000..d25f00b --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-i586-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: Mageia +Volume id: Mageia-4-i586 +Volume set id: Mageia 4 - i586 DVD +Publisher id: Mageia +Data preparer id: Mageia BCD +Application id: Mageia 4 +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: 1894830 +El Torito VD version 1 found, boot catalog is in sector 688 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Mageia' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 2B1 689 diff --git a/test/isodata/mageia/mageia4/Mageia-4-x86_64-DVD.iso.txt b/test/isodata/mageia/mageia4/Mageia-4-x86_64-DVD.iso.txt new file mode 100644 index 0000000..b11c1a4 --- /dev/null +++ b/test/isodata/mageia/mageia4/Mageia-4-x86_64-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: Mageia +Volume id: Mageia-4-x86_64 +Volume set id: Mageia 4 - x86_64 DVD +Publisher id: Mageia +Data preparer id: Mageia BCD +Application id: Mageia 4 +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: 1899080 +El Torito VD version 1 found, boot catalog is in sector 704 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Mageia' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 38C1 14529 -- 2.5.5 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
