Re: [PATCH 4/4] recognize Mageia 5

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Mar 25, 2016 at 10:05:59PM +0100, Christophe Fergeau wrote:
> From: Thierry Vignaud <thierry.vignaud@xxxxxxxxx>
> 
> ---
>  data/os/mageia.org/mageia-5.xml.in                 | 67 ++++++++++++++++++++++
>  data/os/mageia.org/mageia-unknown.xml.in           |  8 +--
>  po/POTFILES.in                                     |  1 +
>  .../Mageia-5-LiveCD-GNOME-en-i586-CD.iso.txt       | 29 ++++++++++
>  .../Mageia-5-LiveCD-KDE4-en-i586-CD.iso.txt        | 29 ++++++++++
>  .../Mageia-5-LiveDVD-GNOME-i586-DVD.iso.txt        | 29 ++++++++++
>  .../Mageia-5-LiveDVD-GNOME-x86_64-DVD.iso.txt      | 29 ++++++++++
>  .../mageia5/Mageia-5-LiveDVD-KDE4-i586-DVD.iso.txt | 29 ++++++++++
>  .../Mageia-5-LiveDVD-KDE4-x86_64-DVD.iso.txt       | 29 ++++++++++
>  .../mageia/mageia5/Mageia-5-dual-DVD.iso.txt       | 29 ++++++++++
>  .../mageia/mageia5/Mageia-5-i586-DVD.iso.txt       | 29 ++++++++++
>  .../mageia/mageia5/Mageia-5-x86_64-DVD.iso.txt     | 29 ++++++++++
>  12 files changed, 333 insertions(+), 4 deletions(-)
>  create mode 100644 data/os/mageia.org/mageia-5.xml.in
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-LiveCD-GNOME-en-i586-CD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-LiveCD-KDE4-en-i586-CD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-i586-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-x86_64-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-i586-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-x86_64-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-dual-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-i586-DVD.iso.txt
>  create mode 100644 test/isodata/mageia/mageia5/Mageia-5-x86_64-DVD.iso.txt
> 
> diff --git a/data/os/mageia.org/mageia-5.xml.in b/data/os/mageia.org/mageia-5.xml.in
> new file mode 100644
> index 0000000..2b003af
> --- /dev/null
> +++ b/data/os/mageia.org/mageia-5.xml.in
> @@ -0,0 +1,67 @@
> +<libosinfo version="0.0.1">
> +  <os id="http://mageia.org/mageia/5";>
> +    <short-id>mageia5</short-id>
> +    <_name>Mageia 5</_name>
> +    <_vendor>Mageia</_vendor>
> +    <family>linux</family>
> +    <distro>mageia</distro>
> +    <version>5</version>
> +    <derives-from id="http://mageia.org/mageia/3"/>

The /3 is wrong here btw. Would be nice to have some
<upgrades id="http://mageia.org/mageia/4/";> relationship too for all
mageia releases as I think it's possible to upgrade from release to
release.

Christophe

> +    <release-date>2015-06-19</release-date>
> +    <eol-date>2016-12-16</eol-date>
> +
> +    <media arch="i686">
> +      <variant id="net-install"/>
> +      <url>ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/5/i586/install/images/boot.iso</url>
> +      <iso>
> +        <volume-id>Mageia-5-i686-netinstall</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/5/x86_64/install/images/boot.iso</url>
> +      <iso>
> +        <volume-id>Mageia-5-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-5-i586-DVD.iso</url>
> +<!--
> +      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-5-dual-CD.iso</url>
> +-->
> +      <iso>
> +        <volume-id>Mageia-5(-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-5-x86_64-DVD.iso</url>
> +<!--
> +      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-4-dual-CD.iso</url>
> +-->
> +      <iso>
> +        <volume-id>Mageia-5(-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-5-LiveDVD-KDE4-i586-DVD.iso</url>
> +<!--
> +      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-5-LiveDVD-GNOME-i586-DVD.iso</url>
> +      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-5-LiveCD-KDE4-en-i586-CD.iso</url>
> +      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-5-LiveCD-GNOME-en-i586-CD.iso</url>
> +-->
> +      <iso>
> +        <volume-id>Mageia-5-(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 859f4ea..f989656 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/4"/>
> +    <derives-from id="http://mageia.org/mageia/5"/>
>  
>      <media arch="i686">
>        <variant id="net-install"/>
> @@ -32,7 +32,7 @@
>      <media arch="i686">
>        <variant id="regular-installer"/>
>        <iso>
> -        <volume-id>Mageia-[5-9]-.*i586</volume-id>
> +        <volume-id>Mageia-[6-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-[5-9].*x86_64</volume-id>
> +        <volume-id>Mageia-[6-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-[5-9]-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
> +        <volume-id>Mageia-[6-9]-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
>        </iso>
>      </media>
>    </os>
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 2bb969d..f7bd3ed 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -119,6 +119,7 @@ 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/mageia.org/mageia-4.1.xml.in
> +data/os/mageia.org/mageia-5.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/mageia5/Mageia-5-LiveCD-GNOME-en-i586-CD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-LiveCD-GNOME-en-i586-CD.iso.txt
> new file mode 100644
> index 0000000..eb9f8c7
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-LiveCD-GNOME-en-i586-CD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Mageia-5-GNOME-LiveCD
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.3.8 2014.06.28.071001, LIBISOBURN-1.3.8, LIBISOFS-1.3.8, LIBBURN-1.3.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: 351082
> +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 2E 46
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-LiveCD-KDE4-en-i586-CD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-LiveCD-KDE4-en-i586-CD.iso.txt
> new file mode 100644
> index 0000000..33d3ac6
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-LiveCD-KDE4-en-i586-CD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Mageia-5-KDE4-LiveCD
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.3.8 2014.06.28.071001, LIBISOBURN-1.3.8, LIBISOFS-1.3.8, LIBBURN-1.3.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: 357948
> +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 2E 46
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-i586-DVD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-i586-DVD.iso.txt
> new file mode 100644
> index 0000000..bc0e25b
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-i586-DVD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Mageia-5-GNOME-LiveDVD
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.3.8 2014.06.28.071001, LIBISOBURN-1.3.8, LIBISOFS-1.3.8, LIBBURN-1.3.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: 769070
> +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 2E 46
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-x86_64-DVD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-x86_64-DVD.iso.txt
> new file mode 100644
> index 0000000..67c5e54
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-GNOME-x86_64-DVD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Mageia-5-GNOME-LiveDVD
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.3.8 2014.06.28.071001, LIBISOBURN-1.3.8, LIBISOFS-1.3.8, LIBBURN-1.3.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: 794159
> +El Torito VD version 1 found, boot catalog is in sector 55
> +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 38 56
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-i586-DVD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-i586-DVD.iso.txt
> new file mode 100644
> index 0000000..0746b55
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-i586-DVD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Mageia-5-KDE4-LiveDVD
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.3.8 2014.06.28.071001, LIBISOBURN-1.3.8, LIBISOFS-1.3.8, LIBBURN-1.3.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: 871530
> +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 2E 46
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-x86_64-DVD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-x86_64-DVD.iso.txt
> new file mode 100644
> index 0000000..593762f
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-LiveDVD-KDE4-x86_64-DVD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Mageia-5-KDE4-LiveDVD
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.3.8 2014.06.28.071001, LIBISOBURN-1.3.8, LIBISOFS-1.3.8, LIBBURN-1.3.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: 894774
> +El Torito VD version 1 found, boot catalog is in sector 55
> +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 38 56
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-dual-DVD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-dual-DVD.iso.txt
> new file mode 100644
> index 0000000..5edcd19
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-dual-DVD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: MAGEIA.ORG
> +Volume id: Mageia-5
> +Volume set id: Mageia.Org Mageia - 5
> +Publisher id: MAGEIA.ORG
> +Data preparer id: MAGEIA.ORG BCD
> +Application id: MAGEIA - 5
> +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: 628777
> +El Torito VD version 1 found, boot catalog is in sector 373
> +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 176 374
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-i586-DVD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-i586-DVD.iso.txt
> new file mode 100644
> index 0000000..bfeaf70
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-i586-DVD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: MAGEIA
> +Volume id: Mageia-5-i586
> +Volume set id: Mageia 5 - i586 DVD
> +Publisher id: MAGEIA
> +Data preparer id: MAGEIA BCD
> +Application id: MAGEIA 5
> +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: 1761672
> +El Torito VD version 1 found, boot catalog is in sector 643
> +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 284 644
> diff --git a/test/isodata/mageia/mageia5/Mageia-5-x86_64-DVD.iso.txt b/test/isodata/mageia/mageia5/Mageia-5-x86_64-DVD.iso.txt
> new file mode 100644
> index 0000000..85a6c5c
> --- /dev/null
> +++ b/test/isodata/mageia/mageia5/Mageia-5-x86_64-DVD.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: MAGEIA
> +Volume id: Mageia-5-x86_64
> +Volume set id: Mageia 5 - x86_64 DVD
> +Publisher id: MAGEIA
> +Data preparer id: MAGEIA BCD
> +Application id: MAGEIA 5
> +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: 1913102
> +El Torito VD version 1 found, boot catalog is in sector 659
> +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 294 660
> -- 
> 2.5.5
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/libosinfo

Attachment: signature.asc
Description: PGP signature

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo

[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux