[Libosinfo] [PATCH libosinfo] oses: Add Ubuntu 14.04 LTS

[Cole Robinson]

On 09/23/2014 03:33 AM, Christophe Fergeau wrote:
> On Mon, Sep 22, 2014 at 01:52:03PM -0400, Cole Robinson wrote:
>> Signed-off-by: Cole Robinson <crobinso at redhat.com>
>> ---
>> I added the test data before making the volume ID lookup actually work,
>> yet 'make check' still passed... Does the test suite not ensure isodata
>> is mapped to a valid OS?
> 
> It does, but the file must be named foo.txt, in your patch it's only
> foo.iso.
> 
>>
>>  data/oses/ubuntu.xml.in                            | 67 ++++++++++++++++++++++
>>  .../ubuntu14.04/ubuntu-14.04.1-desktop-i386.iso    | 29 ++++++++++
>>  2 files changed, 96 insertions(+)
>>  create mode 100644 test/isodata/ubuntu/ubuntu14.04/ubuntu-14.04.1-desktop-i386.iso
>>
>> diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
>> index 3a5d248..78e9b2e 100644
>> --- a/data/oses/ubuntu.xml.in
>> +++ b/data/oses/ubuntu.xml.in
>> @@ -1316,4 +1316,71 @@
>>        <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
>>      </installer>
>>    </os>
>> +
>> +  <os id="http://ubuntu.com/ubuntu/14.04">
>> +    <short-id>ubuntu14.04</short-id>
>> +    <short-id>ubuntutrusty</short-id>
>> +    <_name>Ubuntu Trusty Tahr LTS</_name>
>> +    <version>14.04</version>
>> +    <_vendor>Canonical Ltd</_vendor>
>> +    <family>linux</family>
>> +    <distro>ubuntu</distro>
>> +    <codename>Trusty Tahr</codename>
>> +    <upgrades id="http://ubuntu.com/ubuntu/14.04"/>
>> +    <derives-from id="http://ubuntu.com/ubuntu/14.04"/>
>> +
>> +    <release-date>2014-04-26</release-date>
>> +    <eol-date>2019-04-01</eol-date>
>> +
>> +    <resources arch="all">
>> +      <minimum>
>> +        <cpu>1000000000</cpu>
>> +        <n-cpus>1</n-cpus>
>> +        <ram>1073741824</ram>
>> +        <storage>5368709120</storage>
>> +      </minimum>
>> +      <recommended>
>> +        <cpu>1000000000</cpu>
>> +        <ram>1073741824</ram>
>> +        <storage>16106127360</storage>
>> +      </recommended>
>> +    </resources>
>> +
>> +    <media arch="i686">
>> +      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-i386.iso</url>
>> +      <iso>
>> +        <volume-id>Ubuntu-Server 14.04(.\d)? i386</volume-id>
>> +      </iso>
>> +      <kernel>casper/vmlinuz</kernel>
>> +      <initrd>casper/initrd.img</initrd>
>> +    </media>
>> +    <media arch="x86_64">
>> +      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso</url>
>> +      <iso>
>> +        <volume-id>Ubuntu-Server 14.04(.\d)? amd64</volume-id>
>> +      </iso>
>> +      <kernel>casper/vmlinuz</kernel>
>> +      <initrd>casper/initrd.img</initrd>
>> +    </media>
> 
> These 2 entries are missing "LTS", see attached files
> 
> 
>> +    <media arch="i686" live="true">
>> +      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso</url>
>> +      <iso>
>> +        <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id>
>> +      </iso>
>> +      <kernel>casper/vmlinuz</kernel>
>> +      <initrd>casper/initrd.img</initrd>
>> +    </media>
>> +    <media arch="x86_64" live="true">
>> +      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso</url>
>> +      <iso>
>> +        <volume-id>Ubuntu 14.04(.\d)? amd64</volume-id>
>> +      </iso>
> 
> This is missing an LTS, I'm attaching the isoinfo output for this image.
> ACK with this fixed, with .iso renamed to .iso.txt, and with the
> additional isoinfo files squashed in.
> 
> Christophe
> 

Thanks, pushed with those fixes.

- Cole