[Libosinfo] [PATCH] Add CentOS 7.1 data

[Daniel P. Berrange]

On Thu, Jul 02, 2015 at 12:41:30PM +0200, Christophe Fergeau wrote:
> CentOS is no longer using .minor version numbers, so the long name still
> is CentOS 7, it's just the version which is now 1504. The 7.0/7.1
> numbering is kept in the shortids though.

I'm copying in Karanbir so he can give his opinion on how we should
try to represent CentOS versions in libosinfo, in case there is
some info we're missing in our understanding.

> The ISO label is not different either between 7.0 and 7.1, so I checked
> the ISO size to make the difference.
> ---
>  data/oses/centos.xml.in                            | 42 ++++++++++++++++++++++
>  .../centos7.1/CentOS-7-x86_64-DVD-1503-01.iso.txt  | 29 +++++++++++++++
>  2 files changed, 71 insertions(+)
>  create mode 100644 test/isodata/centos/centos7.1/CentOS-7-x86_64-DVD-1503-01.iso.txt
> 
> diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
> index 3c79918..0b8caeb 100644
> --- a/data/oses/centos.xml.in
> +++ b/data/oses/centos.xml.in
> @@ -317,4 +317,46 @@
>      </installer>
>    </os>
>  
> +  <os id="http://centos.org/centos/7.1">
> +    <short-id>centos7.1</short-id>

I'm inclined to say that since CentOS-7 has explicitly stopped
using RHEL minor numbers, we should honour that in libosinfo
too. Generally we always try to use the same terminology as
used by the vendor themselves.

So, rather than the existing centos-7.0 we should have used
centos7.1406 as the name, and for this new update, we should
use centos7.1503. FYI their official versions are shown here:

  http://wiki.centos.org/Download

This will avoid us pain in the future if we have to deal with
representing multiple CentOS updates / ISOs derived from the
same RHEL7 minor update.

For back compat we would of course have to keep a centos-7.0
entry, but we can make it a trivial alias of a canonical
centos-7.1406 entry.


> +    <_name>CentOS 7</_name>
> +    <version>1504</version>
> +    <_vendor>CentOS</_vendor>
> +    <family>linux</family>
> +    <distro>centos</distro>
> +    <upgrades id="http://centos.org/centos/7.0"/>
> +    <clones id="http://redhat.com/rhel/7.1"/>
> +
> +    <media arch="x86_64">
> +      <iso>
> +        <system-id>LINUX</system-id>
> +        <volume-id>.*CentOS 7 x86_64.*</volume-id>
> +        <volume-size>4310345728</volume-size>
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +
> +    <resources arch="all">
> +      <minimum>
> +        <n-cpus>1</n-cpus>
> +        <cpu>1000000000</cpu>
> +        <ram>1073741824</ram>
> +        <storage>10737418240</storage>
> +      </minimum>
> +
> +      <recommended>
> +        <cpu>400000000</cpu>
> +        <ram>1073741824</ram>
> +        <storage>9663676416</storage>
> +      </recommended>
> +    </resources>
> +
> +    <installer>
> +      <script id='http://redhat.com/scripts/rhel/jeos'/>
> +      <script id='http://redhat.com/scripts/rhel/desktop'/>
> +    </installer>
> +  </os>
> +
> +
>  </libosinfo>
> diff --git a/test/isodata/centos/centos7.1/CentOS-7-x86_64-DVD-1503-01.iso.txt b/test/isodata/centos/centos7.1/CentOS-7-x86_64-DVD-1503-01.iso.txt
> new file mode 100644
> index 0000000..4ba7803
> --- /dev/null
> +++ b/test/isodata/centos/centos7.1/CentOS-7-x86_64-DVD-1503-01.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: CentOS 7 x86_64


It is probably worth a bug report to CentOS to ask if they would be
able to include the minor update number in the volume ID, so we can
avoid having to rely on ISO size, and just match uniquely on the
volume-id alone. Won't help us for this update of course, since
that already exists, but will solve it for future updates.


> +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: 2104661
> +El Torito VD version 1 found, boot catalog is in sector 536
> +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 E9A 3738
> -- 

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|