[Libosinfo] [PATCH osinfo-db 1/2] Add database support for SLE15-SP1

[Charles Arnold]

On Thu, 2019-07-18 at 13:25 +0200, Fabiano Fidêncio  wrote:
> Charles,
> 
> According to the ISO information provided in the second patch, the
> following things should be changed:
> 
> On Wed, Jul 17, 2019 at 10:10 PM Charles Arnold <CARNOLD at suse.com>
> wrote:
> > 
> > ---
> >  data/os/suse.com/sle-15.1.xml.in | 65
> > ++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 65 insertions(+)
> >  create mode 100644 data/os/suse.com/sle-15.1.xml.in
> > 
> > diff --git a/data/os/suse.com/sle-15.1.xml.in
> > b/data/os/suse.com/sle-15.1.xml.in
> > new file mode 100644
> > index 0000000..649f2bf
> > --- /dev/null
> > +++ b/data/os/suse.com/sle-15.1.xml.in
> > @@ -0,0 +1,65 @@
> > +<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://suse.com/sle/15.1">;
> > +    <short-id>sle15sp1</short-id>
> > +    <_name>SUSE Linux Enterprise 15 SP1</_name>
> > +    <version>15.1</version>
> > +    <_vendor>SUSE</_vendor>
> > +    <family>linux</family>
> > +    <distro>sle</distro>
> > +    <upgrades id="http://suse.com/sle/15"/>;
> > +    <derives-from id="http://suse.com/sle/15"/>;
> > +
> > +    <release-date>2019-06-24</release-date>
> > +
> > +    <media arch="x86_64">
> > +      <iso>
> > +        <system-id>LINUX</system-id>
> > +        <volume-id>SLE-15-SP1-Installer-DVD-x86_64</volume-id>
> 
> For some reason, kiwi generates the volume-id as
> "SLE-15-SP1-Installer-DVD-x86.001" ...
> 
> > +      </iso>
> > +      <kernel>boot/x86_64/loader/linux</kernel>
> > +      <initrd>boot/x86_64/loader/initrd</initrd>
> > +    </media>
> > +
> > +    <media arch="aarch64">
> > +      <iso>
> > +        <system-id>LINUX</system-id>
> > +        <volume-id>SLE-15-SP1-Installer-DVD-aarch64</volume-id>
> 
> ... "SLE-15-SP1-Installer-DVD-aar.001" ...
> 
> > +      </iso>
> > +      <kernel>boot/aarch64/linux</kernel>
> > +      <initrd>boot/aarch64/initrd</initrd>
> > +    </media>
> > +
> > +    <media arch="ppc64">
> > +      <iso>
> > +        <system-id>LINUX</system-id>
> > +        <volume-id>SLE-15-SP1-Installer-DVD-ppc64le</volume-id>
> 
> ... "SLE-15-SP1-Installer-DVD-ppc.001" ...
> 
> > +      </iso>
> > +      <kernel>boot/ppc64le/linux</kernel>
> > +      <initrd>boot/ppc64le/initrd</initrd>
> > +    </media>
> > +
> > +    <media arch="s390x">
> > +      <iso>
> > +        <system-id>LINUX</system-id>
> > +        <volume-id>SLE-15-SP1-Installer-DVD-s390x</volume-id>
> 
> and ... "SLE-15-SP1-Installer-DVD-s39.001"
> 
> > +      </iso>
> > +      <kernel>boot/s390x/linux</kernel>
> > +      <initrd>boot/s390x/initrd</initrd>
> > +    </media>
> > +
> > +    <resources arch="all">
> > +      <minimum>
> > +        <cpu>500000000</cpu>
> > +        <ram>536870912</ram>
> > +        <storage>1074151424</storage>
> > +      </minimum>
> > +      <recommended>
> > +        <cpu>2400000000</cpu>
> > +        <ram>1073741824</ram>
> > +        <storage>17179869184</storage>
> > +      </recommended>
> > +    </resources>
> > +  </os>
> > +</libosinfo>
> > --
> > 2.16.4
> > 
> > 
> > _______________________________________________
> > Libosinfo mailing list
> > Libosinfo at redhat.com
> > https://www.redhat.com/mailman/listinfo/libosinfo
> 
> With that in mind, the following patch needs to be squashed into
> yours:
> 
> fidencio at laerte ~/src/upstream/osinfo-db $ git diff
> diff --git a/data/os/suse.com/sle-15.1.xml.in b/data/os/suse.com/sle-
> 15.1.xml.in
> index 649f2bf..6d58b61 100644
> --- a/data/os/suse.com/sle-15.1.xml.in
> +++ b/data/os/suse.com/sle-15.1.xml.in
> @@ -16,7 +16,7 @@
>      <media arch="x86_64">
>        <iso>
>          <system-id>LINUX</system-id>
> -        <volume-id>SLE-15-SP1-Installer-DVD-x86_64</volume-id>
> +        <volume-id>SLE-15-SP1-Installer-DVD-x86\.001</volume-id>
>        </iso>
>        <kernel>boot/x86_64/loader/linux</kernel>
>        <initrd>boot/x86_64/loader/initrd</initrd>
> @@ -25,7 +25,7 @@
>      <media arch="aarch64">
>        <iso>
>          <system-id>LINUX</system-id>
> -        <volume-id>SLE-15-SP1-Installer-DVD-aarch64</volume-id>
> +        <volume-id>SLE-15-SP1-Installer-DVD-aar\.001</volume-id>
>        </iso>
>        <kernel>boot/aarch64/linux</kernel>
>        <initrd>boot/aarch64/initrd</initrd>
> @@ -34,7 +34,7 @@
>      <media arch="ppc64">
>        <iso>
>          <system-id>LINUX</system-id>
> -        <volume-id>SLE-15-SP1-Installer-DVD-ppc64le</volume-id>
> +        <volume-id>SLE-15-SP1-Installer-DVD-ppc\.001</volume-id>
>        </iso>
>        <kernel>boot/ppc64le/linux</kernel>
>        <initrd>boot/ppc64le/initrd</initrd>
> @@ -43,7 +43,7 @@
>      <media arch="s390x">
>        <iso>
>          <system-id>LINUX</system-id>
> -        <volume-id>SLE-15-SP1-Installer-DVD-s390x</volume-id>
> +        <volume-id>SLE-15-SP1-Installer-DVD-s39\.001</volume-id>
>        </iso>
>        <kernel>boot/s390x/linux</kernel>
>        <initrd>boot/s390x/initrd</initrd>
> 
> If you think the changes are reasonable, just give me your ack on the
> changes and I'll squash and push them.

There seems to be some inconsistency in the volume id string of ISOs
from one release to another. Thanks for catching it.

ACK on this change.