From fidencio at redhat.com  Thu May  2 07:46:23 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Thu, 02 May 2019 09:46:23 +0200
Subject: [Libosinfo] [PATCH 1/2] fedora: Add fedora30 info and isodata
In-Reply-To: <20190430155135.4034-1-feborges@redhat.com>
References: <20190430155135.4034-1-feborges@redhat.com>
Message-ID: <072155c87243dc90bea6fac47b40ff63f412fe88.camel@redhat.com>

Felipe,

On Tue, 2019-04-30 at 17:51 +0200, Felipe Borges wrote:
> Signed-off-by: Felipe Borges <feborges at redhat.com>
> ---
>  data/os/fedoraproject.org/fedora-30.xml.in    | 162
> ++++++++++++++++++
>  .../Fedora-Server-dvd-x86_64-30-1.2.iso.txt   |  29 ++++
>  ...edora-Server-netinst-x86_64-30-1.2.iso.txt |  29 ++++
>  ...ora-Workstation-Live-x86_64-30-1.2.iso.txt |  29 ++++
>  ...-Workstation-netinst-x86_64-30-1.2.iso.txt |  29 ++++

We're missing the ISO data for Fedora Everything.

>  5 files changed, 278 insertions(+)
>  create mode 100644 data/os/fedoraproject.org/fedora-30.xml.in
>  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Server-dvd-
> x86_64-30-1.2.iso.txt
>  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Server-
> netinst-x86_64-30-1.2.iso.txt
>  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Workstation-
> Live-x86_64-30-1.2.iso.txt
>  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Workstation-
> netinst-x86_64-30-1.2.iso.txt
> 
> diff --git a/data/os/fedoraproject.org/fedora-30.xml.in
> b/data/os/fedoraproject.org/fedora-30.xml.in
> new file mode 100644
> index 0000000..9899b53
> --- /dev/null
> +++ b/data/os/fedoraproject.org/fedora-30.xml.in
> @@ -0,0 +1,162 @@
> +<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://fedoraproject.org/fedora/30">
> +    <short-id>fedora30</short-id>
> +    <_name>Fedora 30</_name>
> +    <version>30</version>
> +    <_vendor>Fedora Project</_vendor>
> +    <family>linux</family>
> +    <distro>fedora</distro>
> +    <upgrades id="http://fedoraproject.org/fedora/29"/>
> +    <derives-from id="http://fedoraproject.org/fedora/29"/>
> +
> +    <release-date>2019-04-30</release-date>
> +
> +    <variant id="workstation">
> +      <_name>Fedora 30 Workstation</_name>
> +    </variant>
> +    <variant id="workstation-netinst">
> +      <_name>Fedora 30 Workstation</_name>
> +    </variant>
> +    <variant id="server">
> +      <_name>Fedora 30 Server</_name>
> +    </variant>
> +    <variant id="server-netinst">
> +      <_name>Fedora 30 Server</_name>
> +    </variant>
> +    <variant id="everything-netinst">
> +      <_name>Fedora 30 Everything</_name>
> +    </variant>
> +
> +    <!-- Workstation -->
> +
> +    <!-- Live -->
> +    <media arch="x86_64" live="true" installer-script="false">
> +      <variant id="workstation"/>
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-30-1.2.iso</url
> >
> +      <iso>
> +        <volume-id>Fedora-WS-Live-30.*</volume-id>
> +        <system-id>LINUX</system-id>

Fedora WS Live has removed the "System id:" field from its media, so
the line above must be removed as well.

> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +
> +    <!-- Network Installer !-->
> +    <media arch="x86_64">
> +      <variant id="workstation-netinst"/>
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-30-1.2.iso</url
> >
> +      <iso>
> +        <volume-id>Fedora-WS-dvd-x86_64-30</volume-id>
> +        <system-id>LINUX</system-id>


Fedora WS netinst has removed the "System id:" field from its media, so
the line above must be removed as well.

> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +      <installer>
> +        <script id='
> http://fedoraproject.org/fedora/kickstart/desktop'/>
> +      </installer>
> +    </media>
> +
> +    <!-- Server -->
> +
> +    <!-- DVD -->
> +    <media arch="x86_64">
> +      <variant id="server"/>
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/iso/Fedora-Server-dvd-x86_64-30-1.2.iso</url
> >
> +      <iso>
> +        <volume-id>Fedora-S-dvd-x86_64-30</volume-id>
> +        <system-id>LINUX</system-id>
> +        <volume-size>3176691712</volume-size>


Fedora Server DVD still has its system-id set to "LINUX" but, as Fedora
Server netinst dropped it, we can just drop the volume size attribute.

> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +      <installer>
> +        <script id='http://fedoraproject.org/fedora/kickstart/jeos'/
> >
> +      </installer>
> +    </media>
> +
> +    <!-- Network Installer !-->
> +    <media arch="x86_64">
> +      <variant id="server-netinst"/>
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2.iso</url
> >
> +      <iso>
> +        <volume-id>Fedora-S-dvd-x86_64-30</volume-id>
> +        <system-id>LINUX</system-id>

Fedora Server netinst has removed the "System id:" field from its
media, so the line above must be removed as well.

> +        <volume-size>625999872</volume-size>

And as the DVD and netinst can be differentiated by the presence (or
not) of the "System id", we can also drop the line above.

> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +      <installer>
> +        <script id='http://fedoraproject.org/fedora/kickstart/jeos'/
> >
> +      </installer>
> +    </media>
> +
> +    <!-- Everything -->
> +    <media arch="x86_64">
> +      <variant id="everything-netinst"/>
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-30-1.2.iso</url
> >
> +      <iso>
> +        <volume-id>Fedora-E-dvd-x86_64-30</volume-id>
> +        <system-id>LINUX</system-id>
> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +      <installer>
> +        <script id='http://fedoraproject.org/fedora/kickstart/jeos'/
> >
> +        <script id='
> http://fedoraproject.org/fedora/kickstart/desktop'/>
> +      </installer>
> +    </media>
> +
> +    <tree arch="x86_64">
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/os</url
> >
> +      <variant id="workstation"/>
> +      <treeinfo>
> +        <family>Fedora</family>
> +        <version>30</version>
> +        <arch>x86_64</arch>
> +        <variant>Workstation</variant>
> +      </treeinfo>
> +    </tree>
> +
> +    <tree arch="x86_64">
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/os</url
> >
> +      <variant id="server"/>
> +      <treeinfo>
> +        <family>Fedora</family>
> +        <version>30</version>
> +        <arch>x86_64</arch>
> +        <variant>Server</variant>
> +      </treeinfo>
> +    </tree>
> +
> +    <image arch="x86_64" format="qcow2" cloud-init="true">
> +      <url>
> https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2</url
> >
> +    </image>
> +
> +    <image arch="aarch64" format="qcow2" cloud-init="true">
> +      <url>
> https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/aarch64/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2</url
> >
> +    </image>
> +
> +    <!-- No install media or tree is provided for Fedora 30 Cloud
> variant -->
> +
> +    <resources arch="all">
> +      <minimum>
> +        <n-cpus>1</n-cpus>
> +        <cpu>1000000000</cpu>
> +        <ram>1073741824</ram>
> +        <storage>10737418240</storage>
> +      </minimum>
> +
> +      <recommended>
> +        <ram>2147483648</ram>
> +        <storage>21474836480</storage>
> +      </recommended>
> +    </resources>
> +
> +    <installer>
> +      <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
> +      <script id='
> http://fedoraproject.org/fedora/kickstart/desktop'/>
> +    </installer>
> +  </os>
> +</libosinfo>
> diff --git a/tests/isodata/fedora/fedora30/Fedora-Server-dvd-x86_64-
> 30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-Server-dvd-
> x86_64-30-1.2.iso.txt
> new file mode 100644
> index 0000000..528caeb
> --- /dev/null
> +++ b/tests/isodata/fedora/fedora30/Fedora-Server-dvd-x86_64-30-
> 1.2.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-S-dvd-x86_64-30
> +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: 1551119
> +El Torito VD version 1 found, boot catalog is in sector 532
> +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 4A991 305553
> diff --git a/tests/isodata/fedora/fedora30/Fedora-Server-netinst-
> x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-Server-
> netinst-x86_64-30-1.2.iso.txt
> new file mode 100644
> index 0000000..ef3c06c
> --- /dev/null
> +++ b/tests/isodata/fedora/fedora30/Fedora-Server-netinst-x86_64-30-
> 1.2.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Fedora-S-dvd-x86_64-30
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0, 
> LIBISOFS-1.5.0, LIBBURN-1.5.0
> +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: 305664
> +El Torito VD version 1 found, boot catalog is in sector 40
> +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 3CA4 15524
> diff --git a/tests/isodata/fedora/fedora30/Fedora-Workstation-Live-
> x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-
> Workstation-Live-x86_64-30-1.2.iso.txt
> new file mode 100644
> index 0000000..89a21e1
> --- /dev/null
> +++ b/tests/isodata/fedora/fedora30/Fedora-Workstation-Live-x86_64-
> 30-1.2.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Fedora-WS-Live-30-1-2
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0, 
> LIBISOFS-1.5.0, LIBBURN-1.5.0
> +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: 944704
> +El Torito VD version 1 found, boot catalog is in sector 42
> +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 3CA6 15526
> diff --git a/tests/isodata/fedora/fedora30/Fedora-Workstation-
> netinst-x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-
> Workstation-netinst-x86_64-30-1.2.iso.txt
> new file mode 100644
> index 0000000..ac1abcb
> --- /dev/null
> +++ b/tests/isodata/fedora/fedora30/Fedora-Workstation-netinst-
> x86_64-30-1.2.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Fedora-WS-dvd-x86_64-30
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0, 
> LIBISOFS-1.5.0, LIBBURN-1.5.0
> +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: 305664
> +El Torito VD version 1 found, boot catalog is in sector 40
> +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 3CA4 15524


So, there's no need to submit a v2 as I can just push this patch with
the changes mentioned if you agree with them (I'd like to get an ACK
from you in the proposed changes).

Also, We'd have to bump the regex for Fedora Unknown (currently it
matches 30+, but should match 31+). I also can fix this before pushing.

Thanks for the contribution!

Best Regards,
-- 
Fabiano Fid?ncio



From fidencio at redhat.com  Thu May  2 07:47:46 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Thu, 02 May 2019 09:47:46 +0200
Subject: [Libosinfo] [PATCH 2/2] silverblue: add silverblue30 info
In-Reply-To: <20190430155135.4034-2-feborges@redhat.com>
References: <20190430155135.4034-1-feborges@redhat.com>
	<20190430155135.4034-2-feborges@redhat.com>
Message-ID: <d3d3c365968867d7c1c87fde9a65c4ddf9d4b712.camel@redhat.com>

On Tue, 2019-04-30 at 17:51 +0200, Felipe Borges wrote:
> Signed-off-by: Felipe Borges <feborges at redhat.com>
> ---
>  .../os/fedoraproject.org/silverblue-30.xml.in | 58
> +++++++++++++++++++
>  ...ra-Silverblue-ostree-x86_64-30-1.2.iso.txt | 29 ++++++++++
>  2 files changed, 87 insertions(+)
>  create mode 100644 data/os/fedoraproject.org/silverblue-30.xml.in
>  create mode 100644 tests/isodata/fedora/silverblue30/Fedora-
> Silverblue-ostree-x86_64-30-1.2.iso.txt
> 
> diff --git a/data/os/fedoraproject.org/silverblue-30.xml.in
> b/data/os/fedoraproject.org/silverblue-30.xml.in
> new file mode 100644
> index 0000000..5589b9c
> --- /dev/null
> +++ b/data/os/fedoraproject.org/silverblue-30.xml.in
> @@ -0,0 +1,58 @@
> +<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://fedoraproject.org/silverblue/30">
> +    <short-id>silverblue30</short-id>
> +    <_name>Fedora Silverblue 30</_name>
> +    <version>30</version>
> +    <_vendor>Fedora Project</_vendor>
> +    <family>linux</family>
> +    <distro>fedora</distro>
> +    <upgrades id="http://fedoraproject.org/silverblue/29"/>
> +    <derives-from id="http://fedoraproject.org/silverblue/29"/>
> +
> +    <release-date>2019-04-30</release-date>
> +
> +    <media arch="x86_64">
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Silverblue/x86_64/iso/Fedora-Silverblue-ostree-x86_64-30-1.2.iso</url
> >
> +      <iso>
> +        <volume-id>Fedora-SB-ostree-x86_64-30</volume-id>
> +        <system-id>LINUX</system-id>

Fedora Silverblue has removed the "System id:" field from its media, so
the line above must be removed as well.

> +      </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
> +    </media>
> +
> +    <tree arch="x86_64">
> +      <url>
> https://download.fedoraproject.org/pub/fedora/linux/releases/30/Silverblue/x86_64/os</url
> >
> +      <treeinfo>
> +        <family>Fedora</family>
> +        <variant>Silverblue</variant>
> +        <version>30</version>
> +        <arch>x86_64</arch>
> +      </treeinfo>
> +    </tree>
> +
> +    <resources arch="all">
> +      <minimum>
> +        <n-cpus>1</n-cpus>
> +        <cpu>1000000000</cpu>
> +        <ram>1073741824</ram>
> +        <storage>10737418240</storage>
> +      </minimum>
> +
> +      <recommended>
> +        <ram>2147483648</ram>
> +        <storage>21474836480</storage>
> +      </recommended>
> +
> +      <network-install>
> +        <ram>5368709120</ram>
> +      </network-install>
> +    </resources>
> +
> +    <installer>
> +      <script id='
> http://fedoraproject.org/silverblue/kickstart/desktop'/>
> +    </installer>
> +  </os>
> +</libosinfo>
> diff --git a/tests/isodata/fedora/silverblue30/Fedora-Silverblue-
> ostree-x86_64-30-1.2.iso.txt
> b/tests/isodata/fedora/silverblue30/Fedora-Silverblue-ostree-x86_64-
> 30-1.2.iso.txt
> new file mode 100644
> index 0000000..62bfc41
> --- /dev/null
> +++ b/tests/isodata/fedora/silverblue30/Fedora-Silverblue-ostree-
> x86_64-30-1.2.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Fedora-SB-ostree-x86_64-30
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0, 
> LIBISOFS-1.5.0, LIBBURN-1.5.0
> +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: 1066864
> +El Torito VD version 1 found, boot catalog is in sector 40
> +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 13A4 5028


As the other patch, I can fix this before pushing, but I'd like to have
your ACK in the proposed changes.

Best Regards,
-- 
Fabiano Fid?ncio



From felipe10borges at gmail.com  Thu May  2 08:09:15 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Thu, 2 May 2019 10:09:15 +0200
Subject: [Libosinfo] [PATCH 2/2] silverblue: add silverblue30 info
In-Reply-To: <d3d3c365968867d7c1c87fde9a65c4ddf9d4b712.camel@redhat.com>
References: <20190430155135.4034-1-feborges@redhat.com>
	<20190430155135.4034-2-feborges@redhat.com>
	<d3d3c365968867d7c1c87fde9a65c4ddf9d4b712.camel@redhat.com>
Message-ID: <CAM8h4FPp61J4Xx9-nosGy5Nug91bQCtWf=isi=9nEFxi=76gcw@mail.gmail.com>

Sure, thanks for the review! Feel free to amend the proposed changes.

Acked-by: Felipe Borges <feborges at redhat.com>



On Thu, May 2, 2019 at 9:47 AM Fabiano Fid?ncio <fidencio at redhat.com> wrote:
>
> On Tue, 2019-04-30 at 17:51 +0200, Felipe Borges wrote:
> > Signed-off-by: Felipe Borges <feborges at redhat.com>
> > ---
> >  .../os/fedoraproject.org/silverblue-30.xml.in | 58
> > +++++++++++++++++++
> >  ...ra-Silverblue-ostree-x86_64-30-1.2.iso.txt | 29 ++++++++++
> >  2 files changed, 87 insertions(+)
> >  create mode 100644 data/os/fedoraproject.org/silverblue-30.xml.in
> >  create mode 100644 tests/isodata/fedora/silverblue30/Fedora-
> > Silverblue-ostree-x86_64-30-1.2.iso.txt
> >
> > diff --git a/data/os/fedoraproject.org/silverblue-30.xml.in
> > b/data/os/fedoraproject.org/silverblue-30.xml.in
> > new file mode 100644
> > index 0000000..5589b9c
> > --- /dev/null
> > +++ b/data/os/fedoraproject.org/silverblue-30.xml.in
> > @@ -0,0 +1,58 @@
> > +<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://fedoraproject.org/silverblue/30">
> > +    <short-id>silverblue30</short-id>
> > +    <_name>Fedora Silverblue 30</_name>
> > +    <version>30</version>
> > +    <_vendor>Fedora Project</_vendor>
> > +    <family>linux</family>
> > +    <distro>fedora</distro>
> > +    <upgrades id="http://fedoraproject.org/silverblue/29"/>
> > +    <derives-from id="http://fedoraproject.org/silverblue/29"/>
> > +
> > +    <release-date>2019-04-30</release-date>
> > +
> > +    <media arch="x86_64">
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Silverblue/x86_64/iso/Fedora-Silverblue-ostree-x86_64-30-1.2.iso</url
> > >
> > +      <iso>
> > +        <volume-id>Fedora-SB-ostree-x86_64-30</volume-id>
> > +        <system-id>LINUX</system-id>
>
> Fedora Silverblue has removed the "System id:" field from its media, so
> the line above must be removed as well.
>
> > +      </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> > +    </media>
> > +
> > +    <tree arch="x86_64">
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Silverblue/x86_64/os</url
> > >
> > +      <treeinfo>
> > +        <family>Fedora</family>
> > +        <variant>Silverblue</variant>
> > +        <version>30</version>
> > +        <arch>x86_64</arch>
> > +      </treeinfo>
> > +    </tree>
> > +
> > +    <resources arch="all">
> > +      <minimum>
> > +        <n-cpus>1</n-cpus>
> > +        <cpu>1000000000</cpu>
> > +        <ram>1073741824</ram>
> > +        <storage>10737418240</storage>
> > +      </minimum>
> > +
> > +      <recommended>
> > +        <ram>2147483648</ram>
> > +        <storage>21474836480</storage>
> > +      </recommended>
> > +
> > +      <network-install>
> > +        <ram>5368709120</ram>
> > +      </network-install>
> > +    </resources>
> > +
> > +    <installer>
> > +      <script id='
> > http://fedoraproject.org/silverblue/kickstart/desktop'/>
> > +    </installer>
> > +  </os>
> > +</libosinfo>
> > diff --git a/tests/isodata/fedora/silverblue30/Fedora-Silverblue-
> > ostree-x86_64-30-1.2.iso.txt
> > b/tests/isodata/fedora/silverblue30/Fedora-Silverblue-ostree-x86_64-
> > 30-1.2.iso.txt
> > new file mode 100644
> > index 0000000..62bfc41
> > --- /dev/null
> > +++ b/tests/isodata/fedora/silverblue30/Fedora-Silverblue-ostree-
> > x86_64-30-1.2.iso.txt
> > @@ -0,0 +1,29 @@
> > +CD-ROM is in ISO 9660 format
> > +System id:
> > +Volume id: Fedora-SB-ostree-x86_64-30
> > +Volume set id:
> > +Publisher id:
> > +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0,
> > LIBISOFS-1.5.0, LIBBURN-1.5.0
> > +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: 1066864
> > +El Torito VD version 1 found, boot catalog is in sector 40
> > +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 13A4 5028
>
>
> As the other patch, I can fix this before pushing, but I'd like to have
> your ACK in the proposed changes.
>
> Best Regards,
> --
> Fabiano Fid?ncio
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



From felipe10borges at gmail.com  Thu May  2 08:09:28 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Thu, 2 May 2019 10:09:28 +0200
Subject: [Libosinfo] [PATCH 1/2] fedora: Add fedora30 info and isodata
In-Reply-To: <072155c87243dc90bea6fac47b40ff63f412fe88.camel@redhat.com>
References: <20190430155135.4034-1-feborges@redhat.com>
	<072155c87243dc90bea6fac47b40ff63f412fe88.camel@redhat.com>
Message-ID: <CAM8h4FNnD8f1qkuQQfkckM6HGTXPYtNGF32bf7p3Cn09B5s5Mg@mail.gmail.com>

Sure, thanks for the review! Feel free to amend the proposed changes.

Acked-by: Felipe Borges <feborges at redhat.com>

On Thu, May 2, 2019 at 9:46 AM Fabiano Fid?ncio <fidencio at redhat.com> wrote:
>
> Felipe,
>
> On Tue, 2019-04-30 at 17:51 +0200, Felipe Borges wrote:
> > Signed-off-by: Felipe Borges <feborges at redhat.com>
> > ---
> >  data/os/fedoraproject.org/fedora-30.xml.in    | 162
> > ++++++++++++++++++
> >  .../Fedora-Server-dvd-x86_64-30-1.2.iso.txt   |  29 ++++
> >  ...edora-Server-netinst-x86_64-30-1.2.iso.txt |  29 ++++
> >  ...ora-Workstation-Live-x86_64-30-1.2.iso.txt |  29 ++++
> >  ...-Workstation-netinst-x86_64-30-1.2.iso.txt |  29 ++++
>
> We're missing the ISO data for Fedora Everything.
>
> >  5 files changed, 278 insertions(+)
> >  create mode 100644 data/os/fedoraproject.org/fedora-30.xml.in
> >  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Server-dvd-
> > x86_64-30-1.2.iso.txt
> >  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Server-
> > netinst-x86_64-30-1.2.iso.txt
> >  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Workstation-
> > Live-x86_64-30-1.2.iso.txt
> >  create mode 100644 tests/isodata/fedora/fedora30/Fedora-Workstation-
> > netinst-x86_64-30-1.2.iso.txt
> >
> > diff --git a/data/os/fedoraproject.org/fedora-30.xml.in
> > b/data/os/fedoraproject.org/fedora-30.xml.in
> > new file mode 100644
> > index 0000000..9899b53
> > --- /dev/null
> > +++ b/data/os/fedoraproject.org/fedora-30.xml.in
> > @@ -0,0 +1,162 @@
> > +<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://fedoraproject.org/fedora/30">
> > +    <short-id>fedora30</short-id>
> > +    <_name>Fedora 30</_name>
> > +    <version>30</version>
> > +    <_vendor>Fedora Project</_vendor>
> > +    <family>linux</family>
> > +    <distro>fedora</distro>
> > +    <upgrades id="http://fedoraproject.org/fedora/29"/>
> > +    <derives-from id="http://fedoraproject.org/fedora/29"/>
> > +
> > +    <release-date>2019-04-30</release-date>
> > +
> > +    <variant id="workstation">
> > +      <_name>Fedora 30 Workstation</_name>
> > +    </variant>
> > +    <variant id="workstation-netinst">
> > +      <_name>Fedora 30 Workstation</_name>
> > +    </variant>
> > +    <variant id="server">
> > +      <_name>Fedora 30 Server</_name>
> > +    </variant>
> > +    <variant id="server-netinst">
> > +      <_name>Fedora 30 Server</_name>
> > +    </variant>
> > +    <variant id="everything-netinst">
> > +      <_name>Fedora 30 Everything</_name>
> > +    </variant>
> > +
> > +    <!-- Workstation -->
> > +
> > +    <!-- Live -->
> > +    <media arch="x86_64" live="true" installer-script="false">
> > +      <variant id="workstation"/>
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-30-1.2.iso</url
> > >
> > +      <iso>
> > +        <volume-id>Fedora-WS-Live-30.*</volume-id>
> > +        <system-id>LINUX</system-id>
>
> Fedora WS Live has removed the "System id:" field from its media, so
> the line above must be removed as well.
>
> > +      </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> > +    </media>
> > +
> > +    <!-- Network Installer !-->
> > +    <media arch="x86_64">
> > +      <variant id="workstation-netinst"/>
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-30-1.2.iso</url
> > >
> > +      <iso>
> > +        <volume-id>Fedora-WS-dvd-x86_64-30</volume-id>
> > +        <system-id>LINUX</system-id>
>
>
> Fedora WS netinst has removed the "System id:" field from its media, so
> the line above must be removed as well.
>
> > +      </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> > +      <installer>
> > +        <script id='
> > http://fedoraproject.org/fedora/kickstart/desktop'/>
> > +      </installer>
> > +    </media>
> > +
> > +    <!-- Server -->
> > +
> > +    <!-- DVD -->
> > +    <media arch="x86_64">
> > +      <variant id="server"/>
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/iso/Fedora-Server-dvd-x86_64-30-1.2.iso</url
> > >
> > +      <iso>
> > +        <volume-id>Fedora-S-dvd-x86_64-30</volume-id>
> > +        <system-id>LINUX</system-id>
> > +        <volume-size>3176691712</volume-size>
>
>
> Fedora Server DVD still has its system-id set to "LINUX" but, as Fedora
> Server netinst dropped it, we can just drop the volume size attribute.
>
> > +      </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> > +      <installer>
> > +        <script id='http://fedoraproject.org/fedora/kickstart/jeos'/
> > >
> > +      </installer>
> > +    </media>
> > +
> > +    <!-- Network Installer !-->
> > +    <media arch="x86_64">
> > +      <variant id="server-netinst"/>
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2.iso</url
> > >
> > +      <iso>
> > +        <volume-id>Fedora-S-dvd-x86_64-30</volume-id>
> > +        <system-id>LINUX</system-id>
>
> Fedora Server netinst has removed the "System id:" field from its
> media, so the line above must be removed as well.
>
> > +        <volume-size>625999872</volume-size>
>
> And as the DVD and netinst can be differentiated by the presence (or
> not) of the "System id", we can also drop the line above.
>
> > +      </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> > +      <installer>
> > +        <script id='http://fedoraproject.org/fedora/kickstart/jeos'/
> > >
> > +      </installer>
> > +    </media>
> > +
> > +    <!-- Everything -->
> > +    <media arch="x86_64">
> > +      <variant id="everything-netinst"/>
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-30-1.2.iso</url
> > >
> > +      <iso>
> > +        <volume-id>Fedora-E-dvd-x86_64-30</volume-id>
> > +        <system-id>LINUX</system-id>
> > +      </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> > +      <installer>
> > +        <script id='http://fedoraproject.org/fedora/kickstart/jeos'/
> > >
> > +        <script id='
> > http://fedoraproject.org/fedora/kickstart/desktop'/>
> > +      </installer>
> > +    </media>
> > +
> > +    <tree arch="x86_64">
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Workstation/x86_64/os</url
> > >
> > +      <variant id="workstation"/>
> > +      <treeinfo>
> > +        <family>Fedora</family>
> > +        <version>30</version>
> > +        <arch>x86_64</arch>
> > +        <variant>Workstation</variant>
> > +      </treeinfo>
> > +    </tree>
> > +
> > +    <tree arch="x86_64">
> > +      <url>
> > https://download.fedoraproject.org/pub/fedora/linux/releases/30/Server/x86_64/os</url
> > >
> > +      <variant id="server"/>
> > +      <treeinfo>
> > +        <family>Fedora</family>
> > +        <version>30</version>
> > +        <arch>x86_64</arch>
> > +        <variant>Server</variant>
> > +      </treeinfo>
> > +    </tree>
> > +
> > +    <image arch="x86_64" format="qcow2" cloud-init="true">
> > +      <url>
> > https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2</url
> > >
> > +    </image>
> > +
> > +    <image arch="aarch64" format="qcow2" cloud-init="true">
> > +      <url>
> > https://dl.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/aarch64/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2</url
> > >
> > +    </image>
> > +
> > +    <!-- No install media or tree is provided for Fedora 30 Cloud
> > variant -->
> > +
> > +    <resources arch="all">
> > +      <minimum>
> > +        <n-cpus>1</n-cpus>
> > +        <cpu>1000000000</cpu>
> > +        <ram>1073741824</ram>
> > +        <storage>10737418240</storage>
> > +      </minimum>
> > +
> > +      <recommended>
> > +        <ram>2147483648</ram>
> > +        <storage>21474836480</storage>
> > +      </recommended>
> > +    </resources>
> > +
> > +    <installer>
> > +      <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
> > +      <script id='
> > http://fedoraproject.org/fedora/kickstart/desktop'/>
> > +    </installer>
> > +  </os>
> > +</libosinfo>
> > diff --git a/tests/isodata/fedora/fedora30/Fedora-Server-dvd-x86_64-
> > 30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-Server-dvd-
> > x86_64-30-1.2.iso.txt
> > new file mode 100644
> > index 0000000..528caeb
> > --- /dev/null
> > +++ b/tests/isodata/fedora/fedora30/Fedora-Server-dvd-x86_64-30-
> > 1.2.iso.txt
> > @@ -0,0 +1,29 @@
> > +CD-ROM is in ISO 9660 format
> > +System id: LINUX
> > +Volume id: Fedora-S-dvd-x86_64-30
> > +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: 1551119
> > +El Torito VD version 1 found, boot catalog is in sector 532
> > +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 4A991 305553
> > diff --git a/tests/isodata/fedora/fedora30/Fedora-Server-netinst-
> > x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-Server-
> > netinst-x86_64-30-1.2.iso.txt
> > new file mode 100644
> > index 0000000..ef3c06c
> > --- /dev/null
> > +++ b/tests/isodata/fedora/fedora30/Fedora-Server-netinst-x86_64-30-
> > 1.2.iso.txt
> > @@ -0,0 +1,29 @@
> > +CD-ROM is in ISO 9660 format
> > +System id:
> > +Volume id: Fedora-S-dvd-x86_64-30
> > +Volume set id:
> > +Publisher id:
> > +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0,
> > LIBISOFS-1.5.0, LIBBURN-1.5.0
> > +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: 305664
> > +El Torito VD version 1 found, boot catalog is in sector 40
> > +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 3CA4 15524
> > diff --git a/tests/isodata/fedora/fedora30/Fedora-Workstation-Live-
> > x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-
> > Workstation-Live-x86_64-30-1.2.iso.txt
> > new file mode 100644
> > index 0000000..89a21e1
> > --- /dev/null
> > +++ b/tests/isodata/fedora/fedora30/Fedora-Workstation-Live-x86_64-
> > 30-1.2.iso.txt
> > @@ -0,0 +1,29 @@
> > +CD-ROM is in ISO 9660 format
> > +System id:
> > +Volume id: Fedora-WS-Live-30-1-2
> > +Volume set id:
> > +Publisher id:
> > +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0,
> > LIBISOFS-1.5.0, LIBBURN-1.5.0
> > +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: 944704
> > +El Torito VD version 1 found, boot catalog is in sector 42
> > +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 3CA6 15526
> > diff --git a/tests/isodata/fedora/fedora30/Fedora-Workstation-
> > netinst-x86_64-30-1.2.iso.txt b/tests/isodata/fedora/fedora30/Fedora-
> > Workstation-netinst-x86_64-30-1.2.iso.txt
> > new file mode 100644
> > index 0000000..ac1abcb
> > --- /dev/null
> > +++ b/tests/isodata/fedora/fedora30/Fedora-Workstation-netinst-
> > x86_64-30-1.2.iso.txt
> > @@ -0,0 +1,29 @@
> > +CD-ROM is in ISO 9660 format
> > +System id:
> > +Volume id: Fedora-WS-dvd-x86_64-30
> > +Volume set id:
> > +Publisher id:
> > +Data preparer id: XORRISO-1.5.0 2018.09.15.133001, LIBISOBURN-1.5.0,
> > LIBISOFS-1.5.0, LIBBURN-1.5.0
> > +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: 305664
> > +El Torito VD version 1 found, boot catalog is in sector 40
> > +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 3CA4 15524
>
>
> So, there's no need to submit a v2 as I can just push this patch with
> the changes mentioned if you agree with them (I'd like to get an ACK
> from you in the proposed changes).
>
> Also, We'd have to bump the regex for Fedora Unknown (currently it
> matches 30+, but should match 31+). I also can fix this before pushing.
>
> Thanks for the contribution!
>
> Best Regards,
> --
> Fabiano Fid?ncio
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



From fidencio at redhat.com  Thu May  2 08:19:46 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 10:19:46 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/3] fedora-unknown: Update after f30
	release
Message-ID: <20190502081949.19598-1-fidencio@redhat.com>

Some changes are needed in the fedora-unknown XML after f30 release, as:
- Bump the regex to match f31+
- Remove the <system-id/> attribute, as its been removed from the most
  part of the ISOs

Also, an improvement is done as part of this patcheset, adding the kernel
& initrd path for the fedora unknown workstation live media.

This series is built atop of the:
https://www.redhat.com/archives/libosinfo/2019-April/msg00211.html

Fabiano Fid?ncio (3):
  fedora-unknown: Bump the regex after f30 release
  fedora-unknown: Remove system-id attribute
  fedora-unknown: Add kernel/initrd info for WS Live

 data/os/fedoraproject.org/fedora-unknown.xml.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Thu May  2 08:19:47 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 10:19:47 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/3] fedora-unknown: Bump the regex
	after f30 release
In-Reply-To: <20190502081949.19598-1-fidencio@redhat.com>
References: <20190502081949.19598-1-fidencio@redhat.com>
Message-ID: <20190502081949.19598-2-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/fedora-unknown.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index c13c1ab..8ba80e2 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -14,7 +14,7 @@
 
     <media arch="x86_64">
       <iso>
-        <volume-id>Fedora-.*-dvd-x86_64-[3-9][0-9]</volume-id>
+        <volume-id>Fedora-.*-dvd-x86_64-[3-9][1-9]</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
@@ -23,7 +23,7 @@
 
     <media arch="x86_64" live="true">
       <iso>
-        <volume-id>Fedora-.*-Live-[3-9][0-9].*</volume-id>
+        <volume-id>Fedora-.*-Live-[3-9][1-9].*</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
@@ -31,7 +31,7 @@
     <tree arch="x86_64">
       <treeinfo>
         <family>Fedora</family>
-        <version>[3-9][0-9]</version>
+        <version>[3-9][1-9]</version>
         <arch>x86_64</arch>
       </treeinfo>
     </tree>
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 08:19:48 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 10:19:48 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/3] fedora-unknown: Remove system-id
	attribute
In-Reply-To: <20190502081949.19598-1-fidencio@redhat.com>
References: <20190502081949.19598-1-fidencio@redhat.com>
Message-ID: <20190502081949.19598-3-fidencio@redhat.com>

It's been removed for the most part of the Fedora 30 ISOs.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/fedora-unknown.xml.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index 8ba80e2..f1f08f3 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -15,7 +15,6 @@
     <media arch="x86_64">
       <iso>
         <volume-id>Fedora-.*-dvd-x86_64-[3-9][1-9]</volume-id>
-        <system-id>LINUX</system-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
@@ -24,7 +23,6 @@
     <media arch="x86_64" live="true">
       <iso>
         <volume-id>Fedora-.*-Live-[3-9][1-9].*</volume-id>
-        <system-id>LINUX</system-id>
       </iso>
     </media>
 
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 08:19:49 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 10:19:49 +0200
Subject: [Libosinfo] [osinfo-db PATCH 3/3] fedora-unknown: Add kernel/initrd
	info for WS Live
In-Reply-To: <20190502081949.19598-1-fidencio@redhat.com>
References: <20190502081949.19598-1-fidencio@redhat.com>
Message-ID: <20190502081949.19598-4-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/fedora-unknown.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index f1f08f3..4cf004e 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -24,6 +24,8 @@
       <iso>
         <volume-id>Fedora-.*-Live-[3-9][1-9].*</volume-id>
       </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
     </media>
 
     <tree arch="x86_64">
-- 
2.21.0



From felipe10borges at gmail.com  Thu May  2 08:23:35 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Thu, 2 May 2019 10:23:35 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/3] fedora-unknown: Bump the
 regex after f30 release
In-Reply-To: <20190502081949.19598-2-fidencio@redhat.com>
References: <20190502081949.19598-1-fidencio@redhat.com>
	<20190502081949.19598-2-fidencio@redhat.com>
Message-ID: <CAM8h4FOh75WLEjr5pbchEKtvfCn8v7fX43rJhvdX8tptGOcDqQ@mail.gmail.com>

Reviewed-by: Felipe Borges <feborges at redhat.com>

Thanks!
Felipe.

On Thu, May 2, 2019 at 10:19 AM Fabiano Fid?ncio <fidencio at redhat.com> wrote:
>
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  data/os/fedoraproject.org/fedora-unknown.xml.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
> index c13c1ab..8ba80e2 100644
> --- a/data/os/fedoraproject.org/fedora-unknown.xml.in
> +++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
> @@ -14,7 +14,7 @@
>
>      <media arch="x86_64">
>        <iso>
> -        <volume-id>Fedora-.*-dvd-x86_64-[3-9][0-9]</volume-id>
> +        <volume-id>Fedora-.*-dvd-x86_64-[3-9][1-9]</volume-id>
>          <system-id>LINUX</system-id>
>        </iso>
>        <kernel>isolinux/vmlinuz</kernel>
> @@ -23,7 +23,7 @@
>
>      <media arch="x86_64" live="true">
>        <iso>
> -        <volume-id>Fedora-.*-Live-[3-9][0-9].*</volume-id>
> +        <volume-id>Fedora-.*-Live-[3-9][1-9].*</volume-id>
>          <system-id>LINUX</system-id>
>        </iso>
>      </media>
> @@ -31,7 +31,7 @@
>      <tree arch="x86_64">
>        <treeinfo>
>          <family>Fedora</family>
> -        <version>[3-9][0-9]</version>
> +        <version>[3-9][1-9]</version>
>          <arch>x86_64</arch>
>        </treeinfo>
>      </tree>
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



From felipe10borges at gmail.com  Thu May  2 08:23:54 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Thu, 2 May 2019 10:23:54 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/3] fedora-unknown: Remove
 system-id attribute
In-Reply-To: <20190502081949.19598-3-fidencio@redhat.com>
References: <20190502081949.19598-1-fidencio@redhat.com>
	<20190502081949.19598-3-fidencio@redhat.com>
Message-ID: <CAM8h4FOiBhwmCbG+L8K4EWEaQsi+sAAWfjcKX9n8Ov5k636Dtw@mail.gmail.com>

Reviewed-by: Felipe Borges <feborges at redhat.com>

Sure!

Thanks!

On Thu, May 2, 2019 at 10:19 AM Fabiano Fid?ncio <fidencio at redhat.com> wrote:
>
> It's been removed for the most part of the Fedora 30 ISOs.
>
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  data/os/fedoraproject.org/fedora-unknown.xml.in | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
> index 8ba80e2..f1f08f3 100644
> --- a/data/os/fedoraproject.org/fedora-unknown.xml.in
> +++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
> @@ -15,7 +15,6 @@
>      <media arch="x86_64">
>        <iso>
>          <volume-id>Fedora-.*-dvd-x86_64-[3-9][1-9]</volume-id>
> -        <system-id>LINUX</system-id>
>        </iso>
>        <kernel>isolinux/vmlinuz</kernel>
>        <initrd>isolinux/initrd.img</initrd>
> @@ -24,7 +23,6 @@
>      <media arch="x86_64" live="true">
>        <iso>
>          <volume-id>Fedora-.*-Live-[3-9][1-9].*</volume-id>
> -        <system-id>LINUX</system-id>
>        </iso>
>      </media>
>
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



From felipe10borges at gmail.com  Thu May  2 08:24:11 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Thu, 2 May 2019 10:24:11 +0200
Subject: [Libosinfo] [osinfo-db PATCH 3/3] fedora-unknown: Add
 kernel/initrd info for WS Live
In-Reply-To: <20190502081949.19598-4-fidencio@redhat.com>
References: <20190502081949.19598-1-fidencio@redhat.com>
	<20190502081949.19598-4-fidencio@redhat.com>
Message-ID: <CAM8h4FNEmnTgikx1tbS0LPWu46hzEM+MhZpsAm9t9=d81GA4wA@mail.gmail.com>

Sure!

Reviewed-by: Felipe Borges <feborges at redhat.com>

On Thu, May 2, 2019 at 10:20 AM Fabiano Fid?ncio <fidencio at redhat.com> wrote:
>
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  data/os/fedoraproject.org/fedora-unknown.xml.in | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
> index f1f08f3..4cf004e 100644
> --- a/data/os/fedoraproject.org/fedora-unknown.xml.in
> +++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
> @@ -24,6 +24,8 @@
>        <iso>
>          <volume-id>Fedora-.*-Live-[3-9][1-9].*</volume-id>
>        </iso>
> +      <kernel>isolinux/vmlinuz</kernel>
> +      <initrd>isolinux/initrd.img</initrd>
>      </media>
>
>      <tree arch="x86_64">
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



From felipe10borges at gmail.com  Thu May  2 08:27:17 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Thu, 2 May 2019 10:27:17 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/3] fedora-unknown: Update after
 f30 release
In-Reply-To: <20190502081949.19598-1-fidencio@redhat.com>
References: <20190502081949.19598-1-fidencio@redhat.com>
Message-ID: <CAM8h4FNNKw+stoceiUKX8B32bNMHJJR5rVHKO6J=T2zv8NzYAg@mail.gmail.com>

Thanks for all the changes!

Reviewed-by: Felipe Borges <feborges at redhat.com>

On Thu, May 2, 2019 at 10:19 AM Fabiano Fid?ncio <fidencio at redhat.com> wrote:
>
> Some changes are needed in the fedora-unknown XML after f30 release, as:
> - Bump the regex to match f31+
> - Remove the <system-id/> attribute, as its been removed from the most
>   part of the ISOs
>
> Also, an improvement is done as part of this patcheset, adding the kernel
> & initrd path for the fedora unknown workstation live media.
>
> This series is built atop of the:
> https://www.redhat.com/archives/libosinfo/2019-April/msg00211.html
>
> Fabiano Fid?ncio (3):
>   fedora-unknown: Bump the regex after f30 release
>   fedora-unknown: Remove system-id attribute
>   fedora-unknown: Add kernel/initrd info for WS Live
>
>  data/os/fedoraproject.org/fedora-unknown.xml.in | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



From crobinso at redhat.com  Thu May  2 12:58:26 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 2 May 2019 08:58:26 -0400
Subject: [Libosinfo] [osinfo-db PATCH 0/8] Add missing command line info
 for tree based installations
In-Reply-To: <CAAY6XscvjqBinNRxCKtog_oOMcH8dWJk=eBK1G+xyK37zBq3gw@mail.gmail.com>
References: <20190425132800.2880-1-fidencio@redhat.com>
	<cf79de65-7e78-945f-35f4-3cd3b33ee19b@redhat.com>
	<CAAY6XscvjqBinNRxCKtog_oOMcH8dWJk=eBK1G+xyK37zBq3gw@mail.gmail.com>
Message-ID: <1f8c73b7-f5cc-6379-79dd-ab633afc6111@redhat.com>

On 4/30/19 3:24 PM, Fabiano Fid?ncio wrote:
> On Tue, Apr 30, 2019 at 9:11 PM Cole Robinson <crobinso at redhat.com> wrote:
>>
>> On 4/25/19 9:27 AM, Fabiano Fid?ncio wrote:
>>> Tree based installations will need more info from the command line than
>>> what's currently provided by osinfo-db.
>>>
>>> For instance:
>>> - OpenSUSE requires "install=URL"
>>> - Silverblue requires "inst.repo=URL"
>>> - Fedora < 19 requires "method=URL" and >= 19 requires "inst.repo=URL"
>>> - CentOS/RedHat < 7 require "method=URL" and >= 7 require "inst.repo=URL"
>>>
>>> With those patches, management apps can rely solely in the command line
>>> generated by us for doing tree based installations.
>>>
>>
>> This is an improvement, but I was originally thinking we would expose
>> the kernel argument in some way that it could be queried by apps
>> directly. That way virt-install could eventually use it to drop our own
>> hardcoded method/inst.repo/install mapping and just depend on osinfo-db
>> to provide it. Maybe if we solve that problem too then the result will
>> look a bit different
> 
> osinfo-db, at least for now, only cares about the kernel command line
> when dealing with a unattended installation. And the way we deal with
> that is: https://gitlab.com/libosinfo/libosinfo/blob/master/osinfo/osinfo_install_script.c#L1617
> 
> As far as I understand, your suggestion is to have the command-line
> needed by the unattended installation exposed "somewhere", so apps
> could query that even when not performing an unattended installation
> using our scripts/APIs, right?
> 

Yeah something like that. I dunno if it makes sense as I'd need to check
the unattended code more deeply. Maybe add some unattended option to
actually make the install 'attended' :) ? Or some way to access the
command line template magic independent of the install script. Maybe
that's overthinking it...

>>
>> I'm not really sure how to best do that besides putting a
>> <kernel-url-arg> field or something in the <os>, but that seems
>> inflexible. Any ideas? Some way to query the unattended API objects for
>> this info?
>>
> 
> A <kernel-url-arg/> attribute, under <os/>, may be the simplest way to
> go, with the new osinfo_os_get_kernel_url_argument() API.
> 

Yeah that will certainly cover the only cases we have in virt-install so
maybe it's that simple

I filed:

https://gitlab.com/libosinfo/osinfo-db/issues/28

Thanks,
Cole



From fidencio at redhat.com  Thu May  2 14:39:10 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:39:10 +0200
Subject: [Libosinfo] [libosinfo PATCH] os: Add kernel-url-argument API
Message-ID: <20190502143910.28228-1-fidencio@redhat.com>

Tree based installations will require a kernel-url-argument to be
assed. Let's provide an API to the apps to get this info from OsinfoOS.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/libosinfo.syms                         |  2 +
 osinfo/osinfo_loader.c                        |  1 +
 osinfo/osinfo_os.c                            | 40 +++++++++++++++++++
 osinfo/osinfo_os.h                            |  3 ++
 .../dbdata/os/libosinfo.org/test-os-test1.xml |  2 +
 tests/test-os.c                               |  2 +
 6 files changed, 50 insertions(+)

diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index 853acf5..f8b56a7 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -577,6 +577,8 @@ LIBOSINFO_1.5.0 {
 	osinfo_install_config_get_installation_url;
 	osinfo_install_config_set_installation_url;
 
+	osinfo_os_get_kernel_url_argument;
+
 	osinfo_product_get_short_id_list;
 
 	osinfo_tree_get_os;
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index 522162f..7735357 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -1563,6 +1563,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
         { OSINFO_OS_PROP_FAMILY, G_TYPE_STRING },
         { OSINFO_OS_PROP_DISTRO, G_TYPE_STRING },
         { OSINFO_OS_PROP_RELEASE_STATUS, G_TYPE_STRING },
+        { OSINFO_OS_PROP_KERNEL_URL_ARGUMENT, G_TYPE_STRING },
         { NULL, G_TYPE_INVALID }
     };
 
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index e458a45..48ca06f 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -75,6 +75,7 @@ enum {
 
     PROP_FAMILY,
     PROP_DISTRO,
+    PROP_KERNEL_URL_ARGUMENT,
 };
 
 static void osinfo_os_finalize(GObject *object);
@@ -99,6 +100,11 @@ osinfo_os_get_property(GObject    *object,
                                 osinfo_entity_get_param_value(entity,
                                                                "distro"));
             break;
+        case PROP_KERNEL_URL_ARGUMENT:
+            g_value_set_string(value,
+                               osinfo_entity_get_param_value(entity,
+                                                             OSINFO_OS_PROP_KERNEL_URL_ARGUMENT));
+            break;
         default:
             /* We don't have any other property... */
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
@@ -172,6 +178,22 @@ osinfo_os_class_init(OsinfoOsClass *klass)
     g_object_class_install_property(g_klass,
                                     PROP_DISTRO,
                                     pspec);
+
+    /**
+     * OsinfoOs:kernel-url-argument:
+     *
+     * The argument to be passed to kernel command line when performing a
+     * tree based installation of this OS.
+     */
+    pspec = g_param_spec_string("kernel-url-argument",
+                                "KernelURLArgument",
+                                _("Kernel URL Argument"),
+                                NULL /* default value */,
+                                G_PARAM_READABLE |
+                                G_PARAM_STATIC_STRINGS);
+    g_object_class_install_property(g_klass,
+                                    PROP_KERNEL_URL_ARGUMENT,
+                                    pspec);
 }
 
 static void
@@ -1142,3 +1164,21 @@ void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver)
     osinfo_list_add(OSINFO_LIST(os->priv->device_drivers),
                     OSINFO_ENTITY(driver));
 }
+
+/**
+ * osinfo_os_get_kernel_url_argument:
+ * @os: an operating system
+ *
+ * Gets the argument expected to be passed to the kernel command line when
+ * performing a tree based installation.
+ *
+ * Returns: (transfer none): the kernel url argument, if present. Otherwise,
+ * NULL.
+ */
+const gchar *osinfo_os_get_kernel_url_argument(OsinfoOs *os)
+{
+    g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
+
+    return osinfo_entity_get_param_value(OSINFO_ENTITY(os),
+                                         OSINFO_OS_PROP_KERNEL_URL_ARGUMENT);
+}
diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h
index 7c10475..6207a53 100644
--- a/osinfo/osinfo_os.h
+++ b/osinfo/osinfo_os.h
@@ -62,6 +62,7 @@ typedef struct _OsinfoOsPrivate OsinfoOsPrivate;
 #define OSINFO_OS_PROP_FAMILY                 "family"
 #define OSINFO_OS_PROP_DISTRO                 "distro"
 #define OSINFO_OS_PROP_RELEASE_STATUS         "release-status"
+#define OSINFO_OS_PROP_KERNEL_URL_ARGUMENT    "kernel-url-argument"
 
 /* object */
 struct _OsinfoOs
@@ -142,4 +143,6 @@ void osinfo_os_add_install_script(OsinfoOs *os, OsinfoInstallScript *script);
 OsinfoDeviceDriverList *osinfo_os_get_device_drivers(OsinfoOs *os);
 void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver);
 
+const gchar *osinfo_os_get_kernel_url_argument(OsinfoOs *os);
+
 #endif /* __OSINFO_OS_H__ */
diff --git a/tests/dbdata/os/libosinfo.org/test-os-test1.xml b/tests/dbdata/os/libosinfo.org/test-os-test1.xml
index 8253459..1417a80 100644
--- a/tests/dbdata/os/libosinfo.org/test-os-test1.xml
+++ b/tests/dbdata/os/libosinfo.org/test-os-test1.xml
@@ -7,5 +7,7 @@
     <vendor>libosinfo.org</vendor>
     <family>test</family>
     <release-status>prerelease</release-status>
+
+    <kernel-url-argument>install</kernel-url-argument>
   </os>
 </libosinfo>
diff --git a/tests/test-os.c b/tests/test-os.c
index fe7c2d6..4ffe4f4 100644
--- a/tests/test-os.c
+++ b/tests/test-os.c
@@ -92,6 +92,8 @@ test_loader(void)
     str = osinfo_os_get_family(os);
     g_assert_cmpstr(str, ==, "test");
     g_assert_cmpint(osinfo_os_get_release_status(os), ==, OSINFO_RELEASE_STATUS_PRERELEASE);
+    str = osinfo_os_get_kernel_url_argument(os);
+    g_assert_cmpstr(str, ==, "install");
 
     os = osinfo_db_get_os(db, "http://libosinfo.org/test/os/test2");
     g_assert_nonnull(os);
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:09 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:09 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 00/14] Add missing command line
	info for tree based installations
Message-ID: <20190502145323.29873-1-fidencio@redhat.com>

Tree based installations will need more info from the command line than
what's currently provided by osinfo-db.

Let's add the needed info as part of <os/> and use it to properly
generate the kernel command line.

With those patches, management apps can rely solely in the command line
generated by us for doing tree based installations.

This patch has been built atop of:
https://www.redhat.com/archives/libosinfo/2019-May/msg00013.html

Fabiano Fid?ncio (14):
  schema: Add <kernel-url-argument/> to <os/>
  rhel: Add <kernel-url-argument/>
  centos: Add <kernel-url-argument/>
  fedora: Add <kernel-url-argument/>
  silverblue: Add <kernel-url-argument/>
  opensuse: Add <kernel-url-argument/>
  centos: Adjust command-line for tree based install
  rhel: Adjust command-line for tree based install
  fedora: Fix command-line template identation
  fedora: Prefer user set URL over the default one
  fedora: Adjust command-line for tree based install
  silverblue: Adjust command line for tree based install
  opensuse: Prefer user set URL over the default one
  opensuse: Adjust command line for tree based install

 .../centos-kickstart-desktop.xml.in           |  6 ++
 .../centos.org/centos-kickstart-jeos.xml.in   |  6 ++
 .../fedora-kickstart-desktop.xml.in           | 56 ++++++++++++++-----
 .../fedora-kickstart-jeos.xml.in              | 56 ++++++++++++++-----
 .../silverblue-kickstart-desktop.xml.in       | 17 ++++++
 .../opensuse-autoyast-desktop.xml.in          | 22 +++++++-
 .../opensuse-autoyast-jeos.xml.in             | 22 +++++++-
 .../redhat.com/rhel-kickstart-desktop.xml.in  |  6 ++
 .../redhat.com/rhel-kickstart-jeos.xml.in     |  6 ++
 data/os/centos.org/centos-6.0.xml.in          |  2 +
 data/os/centos.org/centos-6.1.xml.in          |  2 +
 data/os/centos.org/centos-6.10.xml.in         |  2 +
 data/os/centos.org/centos-6.2.xml.in          |  2 +
 data/os/centos.org/centos-6.3.xml.in          |  2 +
 data/os/centos.org/centos-6.4.xml.in          |  2 +
 data/os/centos.org/centos-6.5.xml.in          |  2 +
 data/os/centos.org/centos-6.6.xml.in          |  2 +
 data/os/centos.org/centos-6.7.xml.in          |  2 +
 data/os/centos.org/centos-6.8.xml.in          |  2 +
 data/os/centos.org/centos-6.9.xml.in          |  2 +
 data/os/centos.org/centos-7.0.xml.in          |  2 +
 data/os/fedoraproject.org/fedora-1.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-10.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-11.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-12.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-13.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-14.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-15.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-16.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-17.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-18.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-19.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-2.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-20.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-21.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-22.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-23.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-24.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-25.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-26.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-27.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-28.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-29.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-3.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-30.xml.in    |  2 +
 data/os/fedoraproject.org/fedora-4.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-5.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-6.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-7.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-8.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-9.xml.in     |  2 +
 .../fedoraproject.org/fedora-unknown.xml.in   |  2 +
 .../os/fedoraproject.org/silverblue-28.xml.in |  2 +
 .../os/fedoraproject.org/silverblue-29.xml.in |  2 +
 .../os/fedoraproject.org/silverblue-30.xml.in |  2 +
 data/os/opensuse.org/opensuse-15.0.xml.in     |  2 +
 data/os/opensuse.org/opensuse-42.1.xml.in     |  2 +
 data/os/opensuse.org/opensuse-42.2.xml.in     |  2 +
 data/os/opensuse.org/opensuse-42.3.xml.in     |  2 +
 .../opensuse.org/opensuse-tumbleweed.xml.in   |  2 +
 data/os/redhat.com/rhel-6-unknown.xml.in      |  2 +
 data/os/redhat.com/rhel-6.0.xml.in            |  2 +
 data/os/redhat.com/rhel-6.1.xml.in            |  2 +
 data/os/redhat.com/rhel-6.10.xml.in           |  2 +
 data/os/redhat.com/rhel-6.2.xml.in            |  2 +
 data/os/redhat.com/rhel-6.3.xml.in            |  2 +
 data/os/redhat.com/rhel-6.4.xml.in            |  2 +
 data/os/redhat.com/rhel-6.5.xml.in            |  2 +
 data/os/redhat.com/rhel-6.6.xml.in            |  2 +
 data/os/redhat.com/rhel-6.7.xml.in            |  2 +
 data/os/redhat.com/rhel-6.8.xml.in            |  2 +
 data/os/redhat.com/rhel-6.9.xml.in            |  2 +
 data/os/redhat.com/rhel-7-unknown.xml.in      |  2 +
 data/os/redhat.com/rhel-7.0.xml.in            |  2 +
 data/os/redhat.com/rhel-7.1.xml.in            |  2 +
 data/os/redhat.com/rhel-7.2.xml.in            |  2 +
 data/os/redhat.com/rhel-7.3.xml.in            |  2 +
 data/os/redhat.com/rhel-7.4.xml.in            |  2 +
 data/os/redhat.com/rhel-7.5.xml.in            |  2 +
 data/os/redhat.com/rhel-7.6.xml.in            |  2 +
 data/os/redhat.com/rhel-8-unknown.xml.in      |  2 +
 data/os/redhat.com/rhel-8.0.xml.in            |  2 +
 data/os/redhat.com/rhel-unknown.xml.in        |  2 +
 data/schema/osinfo.rng.in                     |  5 ++
 84 files changed, 322 insertions(+), 28 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:10 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:10 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 01/14] schema: Add
	<kernel-url-argument/> to <os/>
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-2-fidencio@redhat.com>

The <kernel-url-argument/> attribute will be used by management apps to
know what should be passed to the kernel when performing a tree based
installation of an OS.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/schema/osinfo.rng.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in
index b3760d2..0348dd4 100644
--- a/data/schema/osinfo.rng.in
+++ b/data/schema/osinfo.rng.in
@@ -611,6 +611,11 @@
         <zeroOrMore>
           <ref name='driver'/>
         </zeroOrMore>
+        <optional>
+          <element name="kernel-url-argument">
+            <text/>
+          </element>
+        </optional>
       </interleave>
     </element>
   </define>
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:11 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:11 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 02/14] rhel: Add
	<kernel-url-argument/>
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-3-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For rhel < 7, "method" should be used. For rhel >= 7 "inst.repo" should
be used instead.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-6-unknown.xml.in | 2 ++
 data/os/redhat.com/rhel-6.0.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.1.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.10.xml.in      | 2 ++
 data/os/redhat.com/rhel-6.2.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.3.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.4.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.5.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.6.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.7.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.8.xml.in       | 2 ++
 data/os/redhat.com/rhel-6.9.xml.in       | 2 ++
 data/os/redhat.com/rhel-7-unknown.xml.in | 2 ++
 data/os/redhat.com/rhel-7.0.xml.in       | 2 ++
 data/os/redhat.com/rhel-7.1.xml.in       | 2 ++
 data/os/redhat.com/rhel-7.2.xml.in       | 2 ++
 data/os/redhat.com/rhel-7.3.xml.in       | 2 ++
 data/os/redhat.com/rhel-7.4.xml.in       | 2 ++
 data/os/redhat.com/rhel-7.5.xml.in       | 2 ++
 data/os/redhat.com/rhel-7.6.xml.in       | 2 ++
 data/os/redhat.com/rhel-8-unknown.xml.in | 2 ++
 data/os/redhat.com/rhel-8.0.xml.in       | 2 ++
 data/os/redhat.com/rhel-unknown.xml.in   | 2 ++
 23 files changed, 46 insertions(+)

diff --git a/data/os/redhat.com/rhel-6-unknown.xml.in b/data/os/redhat.com/rhel-6-unknown.xml.in
index 4330985..509d1a7 100644
--- a/data/os/redhat.com/rhel-6-unknown.xml.in
+++ b/data/os/redhat.com/rhel-6-unknown.xml.in
@@ -64,6 +64,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in
index 3e2dab1..858e02e 100644
--- a/data/os/redhat.com/rhel-6.0.xml.in
+++ b/data/os/redhat.com/rhel-6.0.xml.in
@@ -93,6 +93,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.1.xml.in b/data/os/redhat.com/rhel-6.1.xml.in
index d633750..b008b9c 100644
--- a/data/os/redhat.com/rhel-6.1.xml.in
+++ b/data/os/redhat.com/rhel-6.1.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.10.xml.in b/data/os/redhat.com/rhel-6.10.xml.in
index 95b88f5..879d59c 100644
--- a/data/os/redhat.com/rhel-6.10.xml.in
+++ b/data/os/redhat.com/rhel-6.10.xml.in
@@ -97,6 +97,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.2.xml.in b/data/os/redhat.com/rhel-6.2.xml.in
index 080a23a..3302457 100644
--- a/data/os/redhat.com/rhel-6.2.xml.in
+++ b/data/os/redhat.com/rhel-6.2.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.3.xml.in b/data/os/redhat.com/rhel-6.3.xml.in
index 40032fc..613393e 100644
--- a/data/os/redhat.com/rhel-6.3.xml.in
+++ b/data/os/redhat.com/rhel-6.3.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.4.xml.in b/data/os/redhat.com/rhel-6.4.xml.in
index cce3a42..7644193 100644
--- a/data/os/redhat.com/rhel-6.4.xml.in
+++ b/data/os/redhat.com/rhel-6.4.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.5.xml.in b/data/os/redhat.com/rhel-6.5.xml.in
index cca5574..d46d4cf 100644
--- a/data/os/redhat.com/rhel-6.5.xml.in
+++ b/data/os/redhat.com/rhel-6.5.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.6.xml.in b/data/os/redhat.com/rhel-6.6.xml.in
index 2e0e26b..7036462 100644
--- a/data/os/redhat.com/rhel-6.6.xml.in
+++ b/data/os/redhat.com/rhel-6.6.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.7.xml.in b/data/os/redhat.com/rhel-6.7.xml.in
index 9823173..06e4d2b 100644
--- a/data/os/redhat.com/rhel-6.7.xml.in
+++ b/data/os/redhat.com/rhel-6.7.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.8.xml.in b/data/os/redhat.com/rhel-6.8.xml.in
index d5bca20..b75750c 100644
--- a/data/os/redhat.com/rhel-6.8.xml.in
+++ b/data/os/redhat.com/rhel-6.8.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-6.9.xml.in b/data/os/redhat.com/rhel-6.9.xml.in
index 6cc80e0..965ee5c 100644
--- a/data/os/redhat.com/rhel-6.9.xml.in
+++ b/data/os/redhat.com/rhel-6.9.xml.in
@@ -81,6 +81,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7-unknown.xml.in b/data/os/redhat.com/rhel-7-unknown.xml.in
index 86da502..766db00 100644
--- a/data/os/redhat.com/rhel-7-unknown.xml.in
+++ b/data/os/redhat.com/rhel-7-unknown.xml.in
@@ -119,6 +119,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index e5f57da..bf72752 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -106,6 +106,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in
index 431e55e..f135b86 100644
--- a/data/os/redhat.com/rhel-7.1.xml.in
+++ b/data/os/redhat.com/rhel-7.1.xml.in
@@ -94,6 +94,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 4296811..087080c 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -135,6 +135,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.3.xml.in b/data/os/redhat.com/rhel-7.3.xml.in
index a7a3fc3..fbd9351 100644
--- a/data/os/redhat.com/rhel-7.3.xml.in
+++ b/data/os/redhat.com/rhel-7.3.xml.in
@@ -121,6 +121,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.4.xml.in b/data/os/redhat.com/rhel-7.4.xml.in
index 33f836f..28c5f4d 100644
--- a/data/os/redhat.com/rhel-7.4.xml.in
+++ b/data/os/redhat.com/rhel-7.4.xml.in
@@ -121,6 +121,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.5.xml.in b/data/os/redhat.com/rhel-7.5.xml.in
index e60f46a..b151341 100644
--- a/data/os/redhat.com/rhel-7.5.xml.in
+++ b/data/os/redhat.com/rhel-7.5.xml.in
@@ -121,6 +121,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in
index bceaa72..6655417 100644
--- a/data/os/redhat.com/rhel-7.6.xml.in
+++ b/data/os/redhat.com/rhel-7.6.xml.in
@@ -121,6 +121,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-8-unknown.xml.in b/data/os/redhat.com/rhel-8-unknown.xml.in
index 23b5bd0..76d9032 100644
--- a/data/os/redhat.com/rhel-8-unknown.xml.in
+++ b/data/os/redhat.com/rhel-8-unknown.xml.in
@@ -103,5 +103,7 @@
         <storage>10737418240</storage>
       </recommended>
     </resources>
+
+    <kernel-url-argument>inst.repo</kernel-url-argument>
   </os>
 </libosinfo>
diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index fe9f489..9a6e4a8 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -140,5 +140,7 @@
         <storage>10737418240</storage>
       </recommended>
     </resources>
+
+    <kernel-url-argument>inst.repo</kernel-url-argument>
   </os>
 </libosinfo>
diff --git a/data/os/redhat.com/rhel-unknown.xml.in b/data/os/redhat.com/rhel-unknown.xml.in
index 180c666..0464edd 100644
--- a/data/os/redhat.com/rhel-unknown.xml.in
+++ b/data/os/redhat.com/rhel-unknown.xml.in
@@ -76,5 +76,7 @@
         <storage>10737418240</storage>
       </recommended>
     </resources>
+
+    <kernel-url-argument>inst.repo</kernel-url-argument>
   </os>
 </libosinfo>
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:12 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 03/14] centos: Add
	<kernel-url-argument/>
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-4-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For centos < 7, "method" should be used. For centos >= 7 "inst.repo"
should be used instead.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/centos.org/centos-6.0.xml.in  | 2 ++
 data/os/centos.org/centos-6.1.xml.in  | 2 ++
 data/os/centos.org/centos-6.10.xml.in | 2 ++
 data/os/centos.org/centos-6.2.xml.in  | 2 ++
 data/os/centos.org/centos-6.3.xml.in  | 2 ++
 data/os/centos.org/centos-6.4.xml.in  | 2 ++
 data/os/centos.org/centos-6.5.xml.in  | 2 ++
 data/os/centos.org/centos-6.6.xml.in  | 2 ++
 data/os/centos.org/centos-6.7.xml.in  | 2 ++
 data/os/centos.org/centos-6.8.xml.in  | 2 ++
 data/os/centos.org/centos-6.9.xml.in  | 2 ++
 data/os/centos.org/centos-7.0.xml.in  | 2 ++
 12 files changed, 24 insertions(+)

diff --git a/data/os/centos.org/centos-6.0.xml.in b/data/os/centos.org/centos-6.0.xml.in
index eb4e847..ba88696 100644
--- a/data/os/centos.org/centos-6.0.xml.in
+++ b/data/os/centos.org/centos-6.0.xml.in
@@ -62,6 +62,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.1.xml.in b/data/os/centos.org/centos-6.1.xml.in
index 1036044..8925307 100644
--- a/data/os/centos.org/centos-6.1.xml.in
+++ b/data/os/centos.org/centos-6.1.xml.in
@@ -61,6 +61,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.10.xml.in b/data/os/centos.org/centos-6.10.xml.in
index 04378a7..6e5b445 100644
--- a/data/os/centos.org/centos-6.10.xml.in
+++ b/data/os/centos.org/centos-6.10.xml.in
@@ -124,6 +124,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.2.xml.in b/data/os/centos.org/centos-6.2.xml.in
index b4c1db9..ff5d85b 100644
--- a/data/os/centos.org/centos-6.2.xml.in
+++ b/data/os/centos.org/centos-6.2.xml.in
@@ -61,6 +61,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in
index 9816d23..b7ad0fe 100644
--- a/data/os/centos.org/centos-6.3.xml.in
+++ b/data/os/centos.org/centos-6.3.xml.in
@@ -69,6 +69,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.4.xml.in b/data/os/centos.org/centos-6.4.xml.in
index 2a0386e..2e8d4f8 100644
--- a/data/os/centos.org/centos-6.4.xml.in
+++ b/data/os/centos.org/centos-6.4.xml.in
@@ -61,6 +61,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.5.xml.in b/data/os/centos.org/centos-6.5.xml.in
index f6a8897..929c422 100644
--- a/data/os/centos.org/centos-6.5.xml.in
+++ b/data/os/centos.org/centos-6.5.xml.in
@@ -61,6 +61,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.6.xml.in b/data/os/centos.org/centos-6.6.xml.in
index 5ba5172..e961b6c 100644
--- a/data/os/centos.org/centos-6.6.xml.in
+++ b/data/os/centos.org/centos-6.6.xml.in
@@ -104,6 +104,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
index d9dc4c0..c550a80 100644
--- a/data/os/centos.org/centos-6.7.xml.in
+++ b/data/os/centos.org/centos-6.7.xml.in
@@ -140,6 +140,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.8.xml.in b/data/os/centos.org/centos-6.8.xml.in
index 284f843..ee3dce4 100644
--- a/data/os/centos.org/centos-6.8.xml.in
+++ b/data/os/centos.org/centos-6.8.xml.in
@@ -142,6 +142,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-6.9.xml.in b/data/os/centos.org/centos-6.9.xml.in
index a586eb6..5f4de8e 100644
--- a/data/os/centos.org/centos-6.9.xml.in
+++ b/data/os/centos.org/centos-6.9.xml.in
@@ -124,6 +124,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index e6d7fe8..ca45ba0 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -84,6 +84,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://centos.org/centos/kickstart/jeos'/>
       <script id='http://centos.org/centos/kickstart/desktop'/>
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:13 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:13 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 04/14] fedora: Add
	<kernel-url-argument/>
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-5-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For fedora < 19, "method" should be used. For fedora >= 19 "inst.repo"
should be used instead.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/fedora-1.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-10.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-11.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-12.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-13.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-14.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-15.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-16.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-17.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-18.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-19.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-2.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-20.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-21.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-22.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-23.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-24.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-25.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-26.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-27.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-28.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-29.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-3.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-30.xml.in      | 2 ++
 data/os/fedoraproject.org/fedora-4.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-5.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-6.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-7.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-8.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-9.xml.in       | 2 ++
 data/os/fedoraproject.org/fedora-unknown.xml.in | 2 ++
 31 files changed, 62 insertions(+)

diff --git a/data/os/fedoraproject.org/fedora-1.xml.in b/data/os/fedoraproject.org/fedora-1.xml.in
index a10152b..609715c 100644
--- a/data/os/fedoraproject.org/fedora-1.xml.in
+++ b/data/os/fedoraproject.org/fedora-1.xml.in
@@ -86,6 +86,8 @@
       <boot-iso>images/boot.iso</boot-iso>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-10.xml.in b/data/os/fedoraproject.org/fedora-10.xml.in
index 49a9109..6f8598b 100644
--- a/data/os/fedoraproject.org/fedora-10.xml.in
+++ b/data/os/fedoraproject.org/fedora-10.xml.in
@@ -350,6 +350,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-11.xml.in b/data/os/fedoraproject.org/fedora-11.xml.in
index cd8f206..5bdf988 100644
--- a/data/os/fedoraproject.org/fedora-11.xml.in
+++ b/data/os/fedoraproject.org/fedora-11.xml.in
@@ -348,6 +348,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-12.xml.in b/data/os/fedoraproject.org/fedora-12.xml.in
index b549fdf..d75bcab 100644
--- a/data/os/fedoraproject.org/fedora-12.xml.in
+++ b/data/os/fedoraproject.org/fedora-12.xml.in
@@ -308,6 +308,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-13.xml.in b/data/os/fedoraproject.org/fedora-13.xml.in
index 535c620..d7c66d4 100644
--- a/data/os/fedoraproject.org/fedora-13.xml.in
+++ b/data/os/fedoraproject.org/fedora-13.xml.in
@@ -224,6 +224,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-14.xml.in b/data/os/fedoraproject.org/fedora-14.xml.in
index 01223fe..b96fb4c 100644
--- a/data/os/fedoraproject.org/fedora-14.xml.in
+++ b/data/os/fedoraproject.org/fedora-14.xml.in
@@ -237,6 +237,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-15.xml.in b/data/os/fedoraproject.org/fedora-15.xml.in
index 1320605..106fc25 100644
--- a/data/os/fedoraproject.org/fedora-15.xml.in
+++ b/data/os/fedoraproject.org/fedora-15.xml.in
@@ -115,6 +115,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-16.xml.in b/data/os/fedoraproject.org/fedora-16.xml.in
index 5872a2a..00619c5 100644
--- a/data/os/fedoraproject.org/fedora-16.xml.in
+++ b/data/os/fedoraproject.org/fedora-16.xml.in
@@ -115,6 +115,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-17.xml.in b/data/os/fedoraproject.org/fedora-17.xml.in
index 6175845..774dd0d 100644
--- a/data/os/fedoraproject.org/fedora-17.xml.in
+++ b/data/os/fedoraproject.org/fedora-17.xml.in
@@ -119,6 +119,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-18.xml.in b/data/os/fedoraproject.org/fedora-18.xml.in
index db8be83..9c94b22 100644
--- a/data/os/fedoraproject.org/fedora-18.xml.in
+++ b/data/os/fedoraproject.org/fedora-18.xml.in
@@ -115,6 +115,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-19.xml.in b/data/os/fedoraproject.org/fedora-19.xml.in
index 5dbcab7..1afeda6 100644
--- a/data/os/fedoraproject.org/fedora-19.xml.in
+++ b/data/os/fedoraproject.org/fedora-19.xml.in
@@ -153,6 +153,8 @@
       </minimum>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-2.xml.in b/data/os/fedoraproject.org/fedora-2.xml.in
index 06847ec..59ff024 100644
--- a/data/os/fedoraproject.org/fedora-2.xml.in
+++ b/data/os/fedoraproject.org/fedora-2.xml.in
@@ -134,6 +134,8 @@
       <boot-iso>images/boot.iso</boot-iso>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
index 0852468..b920946 100644
--- a/data/os/fedoraproject.org/fedora-20.xml.in
+++ b/data/os/fedoraproject.org/fedora-20.xml.in
@@ -138,6 +138,8 @@
       </minimum>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
index 69d5763..9df011a 100644
--- a/data/os/fedoraproject.org/fedora-21.xml.in
+++ b/data/os/fedoraproject.org/fedora-21.xml.in
@@ -188,6 +188,8 @@
       </minimum>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-22.xml.in b/data/os/fedoraproject.org/fedora-22.xml.in
index 6b980a4..716481f 100644
--- a/data/os/fedoraproject.org/fedora-22.xml.in
+++ b/data/os/fedoraproject.org/fedora-22.xml.in
@@ -162,6 +162,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index c8b9e5c..1c7e475 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -178,6 +178,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-24.xml.in b/data/os/fedoraproject.org/fedora-24.xml.in
index c7fc170..2526289 100644
--- a/data/os/fedoraproject.org/fedora-24.xml.in
+++ b/data/os/fedoraproject.org/fedora-24.xml.in
@@ -166,6 +166,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-25.xml.in b/data/os/fedoraproject.org/fedora-25.xml.in
index 41a0544..3343198 100644
--- a/data/os/fedoraproject.org/fedora-25.xml.in
+++ b/data/os/fedoraproject.org/fedora-25.xml.in
@@ -162,6 +162,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-26.xml.in b/data/os/fedoraproject.org/fedora-26.xml.in
index 8f3dad1..7ed649d 100644
--- a/data/os/fedoraproject.org/fedora-26.xml.in
+++ b/data/os/fedoraproject.org/fedora-26.xml.in
@@ -107,6 +107,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in
index 1baa5fa..156aad2 100644
--- a/data/os/fedoraproject.org/fedora-27.xml.in
+++ b/data/os/fedoraproject.org/fedora-27.xml.in
@@ -134,6 +134,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-28.xml.in b/data/os/fedoraproject.org/fedora-28.xml.in
index 6e21a0d..a116055 100644
--- a/data/os/fedoraproject.org/fedora-28.xml.in
+++ b/data/os/fedoraproject.org/fedora-28.xml.in
@@ -123,6 +123,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-29.xml.in b/data/os/fedoraproject.org/fedora-29.xml.in
index aa05d85..8c77def 100644
--- a/data/os/fedoraproject.org/fedora-29.xml.in
+++ b/data/os/fedoraproject.org/fedora-29.xml.in
@@ -154,6 +154,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-3.xml.in b/data/os/fedoraproject.org/fedora-3.xml.in
index 6cfb48b..bd41b10 100644
--- a/data/os/fedoraproject.org/fedora-3.xml.in
+++ b/data/os/fedoraproject.org/fedora-3.xml.in
@@ -134,6 +134,8 @@
       <boot-iso>images/boot.iso</boot-iso>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-30.xml.in b/data/os/fedoraproject.org/fedora-30.xml.in
index c7890ef..940c0d1 100644
--- a/data/os/fedoraproject.org/fedora-30.xml.in
+++ b/data/os/fedoraproject.org/fedora-30.xml.in
@@ -148,6 +148,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
diff --git a/data/os/fedoraproject.org/fedora-4.xml.in b/data/os/fedoraproject.org/fedora-4.xml.in
index f064779..125f0bb 100644
--- a/data/os/fedoraproject.org/fedora-4.xml.in
+++ b/data/os/fedoraproject.org/fedora-4.xml.in
@@ -208,6 +208,8 @@
       <boot-iso>images/boot.iso</boot-iso>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-5.xml.in b/data/os/fedoraproject.org/fedora-5.xml.in
index 2bce9cd..c6cd68a 100644
--- a/data/os/fedoraproject.org/fedora-5.xml.in
+++ b/data/os/fedoraproject.org/fedora-5.xml.in
@@ -218,6 +218,8 @@
       <boot-iso>images/boot.iso</boot-iso>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-6.xml.in b/data/os/fedoraproject.org/fedora-6.xml.in
index c80d8a7..1f847c3 100644
--- a/data/os/fedoraproject.org/fedora-6.xml.in
+++ b/data/os/fedoraproject.org/fedora-6.xml.in
@@ -238,6 +238,8 @@
       <boot-iso>images/boot.iso</boot-iso>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
index d9de6a8..920931d 100644
--- a/data/os/fedoraproject.org/fedora-7.xml.in
+++ b/data/os/fedoraproject.org/fedora-7.xml.in
@@ -111,6 +111,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
index 82a4f37..7c740be 100644
--- a/data/os/fedoraproject.org/fedora-8.xml.in
+++ b/data/os/fedoraproject.org/fedora-8.xml.in
@@ -123,6 +123,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
index 45cfe46..0e0a4a4 100644
--- a/data/os/fedoraproject.org/fedora-9.xml.in
+++ b/data/os/fedoraproject.org/fedora-9.xml.in
@@ -364,6 +364,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index 4cf004e..12df1f9 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -49,5 +49,7 @@
         <storage>21474836480</storage>
       </recommended>
     </resources>
+
+    <kernel-url-argument>inst.repo</kernel-url-argument>
   </os>
 </libosinfo>
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:14 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:14 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 05/14] silverblue: Add
	<kernel-url-argument/>
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-6-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For silverblue "inst.repo" should be used instead.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/silverblue-28.xml.in | 2 ++
 data/os/fedoraproject.org/silverblue-29.xml.in | 2 ++
 data/os/fedoraproject.org/silverblue-30.xml.in | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/data/os/fedoraproject.org/silverblue-28.xml.in b/data/os/fedoraproject.org/silverblue-28.xml.in
index ccaa322..d836b36 100644
--- a/data/os/fedoraproject.org/silverblue-28.xml.in
+++ b/data/os/fedoraproject.org/silverblue-28.xml.in
@@ -40,6 +40,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/silverblue/kickstart/desktop'/>
     </installer>
diff --git a/data/os/fedoraproject.org/silverblue-29.xml.in b/data/os/fedoraproject.org/silverblue-29.xml.in
index 5a6afc4..7245742 100644
--- a/data/os/fedoraproject.org/silverblue-29.xml.in
+++ b/data/os/fedoraproject.org/silverblue-29.xml.in
@@ -51,6 +51,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/silverblue/kickstart/desktop'/>
     </installer>
diff --git a/data/os/fedoraproject.org/silverblue-30.xml.in b/data/os/fedoraproject.org/silverblue-30.xml.in
index 7c4f467..a7bbf1e 100644
--- a/data/os/fedoraproject.org/silverblue-30.xml.in
+++ b/data/os/fedoraproject.org/silverblue-30.xml.in
@@ -50,6 +50,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/silverblue/kickstart/desktop'/>
     </installer>
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:15 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:15 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 06/14] opensuse: Add
	<kernel-url-argument/>
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-7-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For opensuse "install" should be used.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/opensuse.org/opensuse-15.0.xml.in       | 2 ++
 data/os/opensuse.org/opensuse-42.1.xml.in       | 2 ++
 data/os/opensuse.org/opensuse-42.2.xml.in       | 2 ++
 data/os/opensuse.org/opensuse-42.3.xml.in       | 2 ++
 data/os/opensuse.org/opensuse-tumbleweed.xml.in | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/data/os/opensuse.org/opensuse-15.0.xml.in b/data/os/opensuse.org/opensuse-15.0.xml.in
index fd86a45..e0da3fb 100644
--- a/data/os/opensuse.org/opensuse-15.0.xml.in
+++ b/data/os/opensuse.org/opensuse-15.0.xml.in
@@ -51,6 +51,8 @@
       </treeinfo>
     </tree>
 
+    <kernel-url-argument>install</kernel-url-argument>
+
     <installer>
       <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
       <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
diff --git a/data/os/opensuse.org/opensuse-42.1.xml.in b/data/os/opensuse.org/opensuse-42.1.xml.in
index dafd8bc..cef14c0 100644
--- a/data/os/opensuse.org/opensuse-42.1.xml.in
+++ b/data/os/opensuse.org/opensuse-42.1.xml.in
@@ -25,6 +25,8 @@
       <initrd>boot/x86_64/loader/initrd</initrd>
     </media>
 
+    <kernel-url-argument>install</kernel-url-argument>
+
     <installer>
       <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
       <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
diff --git a/data/os/opensuse.org/opensuse-42.2.xml.in b/data/os/opensuse.org/opensuse-42.2.xml.in
index 47c4121..682ebca 100644
--- a/data/os/opensuse.org/opensuse-42.2.xml.in
+++ b/data/os/opensuse.org/opensuse-42.2.xml.in
@@ -40,6 +40,8 @@
       <initrd>boot/x86_64/loader/initrd</initrd>
     </media>
 
+    <kernel-url-argument>install</kernel-url-argument>
+
     <installer>
       <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
       <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
diff --git a/data/os/opensuse.org/opensuse-42.3.xml.in b/data/os/opensuse.org/opensuse-42.3.xml.in
index 5bfee77..04fc8f2 100644
--- a/data/os/opensuse.org/opensuse-42.3.xml.in
+++ b/data/os/opensuse.org/opensuse-42.3.xml.in
@@ -43,6 +43,8 @@
       <initrd>boot/x86_64/loader/initrd</initrd>
     </media>
 
+    <kernel-url-argument>install</kernel-url-argument>
+
     <installer>
       <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
       <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
index 894c9ae..e87206c 100644
--- a/data/os/opensuse.org/opensuse-tumbleweed.xml.in
+++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
@@ -100,6 +100,8 @@
       </recommended>
     </resources>
 
+    <kernel-url-argument>install</kernel-url-argument>
+
     <installer>
       <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
       <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:16 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:16 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 07/14] centos: Adjust command-line
	for tree based install
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-8-fidencio@redhat.com>

Tree based installations will require a kernel-url-argument to be
passed. Let's get this info from the <os/> directly.

Although virt-install automatically appends this to kernel command line
we generate, this is something that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../centos.org/centos-kickstart-desktop.xml.in              | 6 ++++++
 data/install-script/centos.org/centos-kickstart-jeos.xml.in | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
index c215115..4a69b08 100644
--- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
@@ -67,6 +67,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="version">
diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
index 8349928..06a7257 100644
--- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
@@ -59,6 +59,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="version">
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:17 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:17 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 08/14] rhel: Adjust command-line
	for tree based install
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-9-fidencio@redhat.com>

Tree based installations will require a kernel-url-argument to be
passed. Let's get this info from the <os/> directly.

Although virt-install automatically appends this to kernel command line
we generate, this is something that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../install-script/redhat.com/rhel-kickstart-desktop.xml.in | 6 ++++++
 data/install-script/redhat.com/rhel-kickstart-jeos.xml.in   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index 0eb1716..c66ca30 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -78,6 +78,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index e08f67a..3ffd5af 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -70,6 +70,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:18 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:18 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 09/14] fedora: Fix command-line
	template identation
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-10-fidencio@redhat.com>

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../fedora-kickstart-desktop.xml.in           | 24 +++++++++----------
 .../fedora-kickstart-jeos.xml.in              | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index cd2d517..dcdb93f 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -96,18 +96,18 @@
         </xsl:template>
 
         <xsl:template match="/command-line">
-            <xsl:text>ks=</xsl:text>
-            <xsl:choose>
-              <xsl:when test="script/preferred-injection-method = 'initrd'">
-                <xsl:text>file:/</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>hd:</xsl:text>
-                <xsl:call-template name="script-disk"/>
-                <xsl:text>:/</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:value-of select="script/expected-filename"/>
+          <xsl:text>ks=</xsl:text>
+          <xsl:choose>
+            <xsl:when test="script/preferred-injection-method = 'initrd'">
+              <xsl:text>file:/</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>hd:</xsl:text>
+              <xsl:call-template name="script-disk"/>
+              <xsl:text>:/</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 7683b6a..07fc932 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -88,18 +88,18 @@
         </xsl:template>
 
         <xsl:template match="/command-line">
-            <xsl:text>ks=</xsl:text>
-            <xsl:choose>
-              <xsl:when test="script/preferred-injection-method = 'initrd'">
-                <xsl:text>file:/</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>hd:</xsl:text>
-                <xsl:call-template name="script-disk"/>
-                <xsl:text>:/</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:value-of select="script/expected-filename"/>
+          <xsl:text>ks=</xsl:text>
+          <xsl:choose>
+            <xsl:when test="script/preferred-injection-method = 'initrd'">
+              <xsl:text>file:/</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>hd:</xsl:text>
+              <xsl:call-template name="script-disk"/>
+              <xsl:text>:/</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:19 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:19 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 10/14] fedora: Prefer user set URL
	over the default one
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-11-fidencio@redhat.com>

Similarly to what already has been done for CentOS and RHEL, let's
prefer a user set URL (or the URL set for the tree) whenever those are
available.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../fedora-kickstart-desktop.xml.in           | 26 ++++++++++++++++++-
 .../fedora-kickstart-jeos.xml.in              | 26 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index dcdb93f..f918938 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -110,6 +110,30 @@
           <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="url-or-mirrorlist">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != '' or tree/url != ''">
+              <xsl:text> --url</xsl:text>
+              <xsl:call-template name="installation-url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text> --mirrorlist=</xsl:text>
+              <xsl:text>https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template match="/install-script-config">
 # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
 <xsl:if test="script/installation-source = 'media' and (count(media/variant) = 0 or not(contains(media/variant, 'netinst')))">
@@ -143,7 +167,7 @@ reboot
 <xsl:if test="script/installation-source = 'network' or contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
+url <xsl:call-template name="url-or-mirrorlist"/>
 </xsl:if>
 
 %packages
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 07fc932..5b5fe8e 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -102,6 +102,30 @@
           <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="url-or-mirrorlist">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != '' or tree/url != ''">
+              <xsl:text> --url</xsl:text>
+              <xsl:call-template name="installation-url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text> --mirrorlist=</xsl:text>
+              <xsl:text>https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template match="/install-script-config">
 # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
 <xsl:if test="script/installation-source='media' and (count(media/variant) = 0 or not(contains(media/variant, 'netinst')))">
@@ -153,7 +177,7 @@ reboot
 <xsl:if test="script/installation-source='network' or contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
+url <xsl:call-template name="url-or-mirrorlist"/>
 </xsl:if>
 
 %packages
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:20 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:20 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 11/14] fedora: Adjust command-line
	for tree based install
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-12-fidencio@redhat.com>

Tree based installations will require a kernel-url-argument to be
passed. Let's get this info from the <os/> directly.

Although virt-install automatically appends this to the command line we
generate, this is someething that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../fedoraproject.org/fedora-kickstart-desktop.xml.in       | 6 ++++++
 .../fedoraproject.org/fedora-kickstart-jeos.xml.in          | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index f918938..946e784 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -108,6 +108,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="installation-url">
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 5b5fe8e..4d1e94b 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -100,6 +100,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="installation-url">
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:21 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:21 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 12/14] silverblue: Adjust command
	line for tree based install
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-13-fidencio@redhat.com>

Tree based installations will require a kernel-url-argument to be
passed. Let's get this info from the <os/> directly.

Although virt-install automatically appends this to the command line we
generate, this is someething that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../silverblue-kickstart-desktop.xml.in         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
index ba8a8a3..de029a6 100644
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -45,6 +45,23 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
+        </xsl:template>
+
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+          </xsl:choose>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:22 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:22 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 13/14] opensuse: Prefer user set
	URL over the default one
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-14-fidencio@redhat.com>

Similary toi what already has been done for CentOS, RHEL, and Fedora,
let's prefer a user set URL (or the URL set for the tree) whenever those
are available.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../opensuse-autoyast-desktop.xml.in             | 16 +++++++++++++++-
 .../opensuse.org/opensuse-autoyast-jeos.xml.in   | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
index 7913850..5c30292 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
@@ -67,6 +67,20 @@
           </xsl:choose>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="repo-oss"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template name="repo-oss">
           <xsl:text> </xsl:text>
           <xsl:text>http://download.opensuse.org/</xsl:text>
@@ -250,7 +264,7 @@ Icon=/var/lib/AccountsService/icons/<xsl:value-of select="config/user-login"/>
 fi
 
 # Enable default OpenSUSE repos
-zypper ar -f <xsl:call-template name="repo-oss"/> repo-oss
+zypper ar -f <xsl:call-template name="installation-url"/> repo-oss
 zypper ar -f <xsl:call-template name="repo-non-oss"/> repo-non-oss
 zypper ar -f <xsl:call-template name="repo-update-oss"/> repo-update-oss
 <xsl:if test="not(contains(os/version, 'tumbleweed'))">
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
index 23f59dd..8b64d96 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
@@ -58,6 +58,20 @@
           </xsl:choose>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="repo-oss"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template name="repo-oss">
           <xsl:text> </xsl:text>
           <xsl:text>http://download.opensuse.org/</xsl:text>
@@ -215,7 +229,7 @@
                   <chrooted config:type="boolean">true</chrooted>
                   <source>
 # Enable default OpenSUSE repos
-zypper ar -f <xsl:call-template name="repo-oss"/> repo-oss
+zypper ar -f <xsl:call-template name="installation-url"/> repo-oss
 zypper ar -f <xsl:call-template name="repo-non-oss"/> repo-non-oss
 zypper ar -f <xsl:call-template name="repo-update-oss"/> repo-update-oss
 <xsl:if test="not(contains(os/version, 'tumbleweed'))">
-- 
2.21.0



From fidencio at redhat.com  Thu May  2 14:53:23 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu,  2 May 2019 16:53:23 +0200
Subject: [Libosinfo] [osinfo-db PATCH v2 14/14] opensuse: Adjust command
	line for tree based install
In-Reply-To: <20190502145323.29873-1-fidencio@redhat.com>
References: <20190502145323.29873-1-fidencio@redhat.com>
Message-ID: <20190502145323.29873-15-fidencio@redhat.com>

Tree based installations will require a kernel-url-argument to be
passed. Let's get this info from the <os/> directly.

Although virt-install automatically appends this to the command line we
generate, this is someething that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../opensuse.org/opensuse-autoyast-desktop.xml.in           | 6 ++++++
 .../opensuse.org/opensuse-autoyast-jeos.xml.in              | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
index 5c30292..f4dad30 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
@@ -129,6 +129,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
index 8b64d96..c1f1db1 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
@@ -120,6 +120,12 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="os/kernel-url-argument"/>
+            <xsl:text>=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 11:01:46 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 13:01:46 +0200
Subject: [Libosinfo] [libosinfo PATCH] Revert "osinfo-detect: print os
	variants info for env format"
Message-ID: <20190503110146.10528-1-fidencio@redhat.com>

This reverts commit 44cab89243220223b0ac6312237c08a514055664, as the
commit was mistakenly pushed.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tools/osinfo-detect.c | 47 +++++++++----------------------------------
 1 file changed, 10 insertions(+), 37 deletions(-)

diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c
index 626df7d..c21e694 100644
--- a/tools/osinfo-detect.c
+++ b/tools/osinfo-detect.c
@@ -120,16 +120,11 @@ static void print_bootable(gboolean bootable)
 static void print_media(OsinfoMedia *media)
 {
     OsinfoOs *os;
-    OsinfoOsVariantList *variants;
-    gsize num_variants;
 
     g_object_get(G_OBJECT(media), "os", &os, NULL);
     if (os == NULL)
         return;
 
-    variants = osinfo_media_get_os_variants(media);
-    num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
-
     if (format == OUTPUT_FORMAT_ENV) {
         const gchar *id = osinfo_entity_get_id(OSINFO_ENTITY(os));
 
@@ -139,22 +134,13 @@ static void print_media(OsinfoMedia *media)
             g_print("OSINFO_LIVE=%s\n", id);
         g_print("OSINFO_MEDIA=%s\n",
                 osinfo_entity_get_id(OSINFO_ENTITY(media)));
-        if (num_variants > 0) {
-            gsize i;
-
-            g_print("OSINFO_MEDIA_VARIANTS=");
-            for (i = 0; i < num_variants; i++) {
-                OsinfoEntity *variant;
-
-                variant = osinfo_list_get_nth(OSINFO_LIST(variants), i);
-                g_print("%s", osinfo_os_variant_get_name(OSINFO_OS_VARIANT(variant)));
-                g_print("%s", i < num_variants - 1 ? ", " : "\n");
-            }
-        }
-
     } else {
+        OsinfoOsVariantList *variants;
         const gchar *name;
+        guint num_variants;
 
+        variants = osinfo_media_get_os_variants(media);
+        num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
         if (num_variants == 1) {
             OsinfoEntity *variant;
 
@@ -170,7 +156,7 @@ static void print_media(OsinfoMedia *media)
             g_print(_("Media is live media for OS '%s'\n"), name);
 
         if (num_variants > 1) {
-            gsize i;
+            guint i;
 
             g_print(_("Available OS variants on media:\n"));
             for (i = 0; i < num_variants; i++) {
@@ -189,17 +175,10 @@ static void print_media(OsinfoMedia *media)
 
 static void print_os_tree(OsinfoOs *os, OsinfoTree *tree, OsinfoTree *matched_tree)
 {
-    OsinfoOsVariantList *variants;
-    gsize num_variants;
-
     if (os == NULL)
         return;
 
-    variants = osinfo_tree_get_os_variants(matched_tree);
-    num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
-
     if (format == OUTPUT_FORMAT_ENV) {
-        gsize i;
         const gchar *id = osinfo_entity_get_id(OSINFO_ENTITY(os));
         const gchar *kernel = osinfo_tree_get_kernel_path(tree);
         const gchar *initrd = osinfo_tree_get_initrd_path(tree);
@@ -221,19 +200,13 @@ static void print_os_tree(OsinfoOs *os, OsinfoTree *tree, OsinfoTree *matched_tr
             g_print("OSINFO_TREE_INITRD=%s\n", initrd);
         if (bootiso)
             g_print("OSINFO_TREE_BOOT_ISO=%s\n", bootiso);
-        if (num_variants > 0) {
-            g_print("OSINFO_TREE_VARIANTS=");
-            for (i = 0; i < num_variants; i++) {
-                OsinfoEntity *variant;
-
-                variant = osinfo_list_get_nth(OSINFO_LIST(variants), i);
-                g_print("%s", osinfo_os_variant_get_name(OSINFO_OS_VARIANT(variant)));
-                g_print("%s", i < num_variants - 1 ? ", " : "\n");
-            }
-        }
     } else {
+        OsinfoOsVariantList *variants;
         const gchar *name;
+        guint num_variants;
 
+        variants = osinfo_tree_get_os_variants(matched_tree);
+        num_variants = osinfo_list_get_length(OSINFO_LIST(variants));
         if (num_variants == 1) {
             OsinfoEntity *variant;
 
@@ -246,7 +219,7 @@ static void print_os_tree(OsinfoOs *os, OsinfoTree *tree, OsinfoTree *matched_tr
         g_print(_("Tree is an installer for OS '%s'\n"), name);
 
         if (num_variants > 1) {
-            gsize i;
+            guint i;
 
             g_print(_("Available OS variants on tree:\n"));
             for (i = 0; i < num_variants; i++) {
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 11:07:24 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 3 May 2019 13:07:24 +0200
Subject: [Libosinfo] [libosinfo PATCH] os: Add kernel-url-argument API
In-Reply-To: <20190502143910.28228-1-fidencio@redhat.com>
References: <20190502143910.28228-1-fidencio@redhat.com>
Message-ID: <CAAY6XseDVqFWhYoFwX=vD4yM_UwWC4QK9rNh=DZnqri8oEAwtg@mail.gmail.com>

On Thu, May 2, 2019 at 4:39 PM Fabiano Fid?ncio <fidencio at redhat.com> wrote:
>
> Tree based installations will require a kernel-url-argument to be
> assed. Let's provide an API to the apps to get this info from OsinfoOS.
>
> https://gitlab.com/libosinfo/osinfo-db/issues/28
>
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>

I've discusses this with Cole off-list and we've decided that going
for an "inheritance" (pero no mucho) way would be better.
I'll change the implementation for something towards the line of:
current.kernel_url_argument = current.kernel_url_argument or
derived_from.kernel_url_argument

With that we'll be able to keep kernel_url_argument as a single one
and just replace it in case a new one is added (which will be needed
for Fedora >= 19, for instance).

A v3 (of the whole thing) will be submitted.



From fidencio at redhat.com  Fri May  3 12:56:36 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Fri, 03 May 2019 14:56:36 +0200
Subject: [Libosinfo] [libosinfo PATCH] os: Add kernel-url-argument API
In-Reply-To: <CAAY6XseDVqFWhYoFwX=vD4yM_UwWC4QK9rNh=DZnqri8oEAwtg@mail.gmail.com>
References: <20190502143910.28228-1-fidencio@redhat.com>
	<CAAY6XseDVqFWhYoFwX=vD4yM_UwWC4QK9rNh=DZnqri8oEAwtg@mail.gmail.com>
Message-ID: <f13e53a1e21c59d9a1bacd9b754aff1bf0eeec15.camel@redhat.com>

On Fri, 2019-05-03 at 13:07 +0200, Fabiano Fid?ncio wrote:
> On Thu, May 2, 2019 at 4:39 PM Fabiano Fid?ncio <fidencio at redhat.com>
> wrote:
> > Tree based installations will require a kernel-url-argument to be
> > assed. Let's provide an API to the apps to get this info from
> > OsinfoOS.
> > 
> > https://gitlab.com/libosinfo/osinfo-db/issues/28
> > 
> > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> 
> I've discusses this with Cole off-list and we've decided that going
> for an "inheritance" (pero no mucho) way would be better.
> I'll change the implementation for something towards the line of:
> current.kernel_url_argument = current.kernel_url_argument or
> derived_from.kernel_url_argument
> 
> With that we'll be able to keep kernel_url_argument as a single one
> and just replace it in case a new one is added (which will be needed
> for Fedora >= 19, for instance).
> 
> A v3 (of the whole thing) will be submitted.

Okay, I have this work done but before submit the v3, I'd like to raise
one possible issue and confirm that having this kind of duplication is
fine.

In the v2, I've been using as part of the scripts something like:
<xsl:value-if select="os/kernel-url-argument"/>

Once we start inheriting kernel-url-argument, the kind of call shown
above wouldn't be possible anymore, leading us to have, as part of the
scripts, something like (for RHEL):
<xsl:choose>
  <xsl:when test="os/version &lt; 7">
    <xsl:text> method</xsl:text>
  </xsl:when>
  <xsl:otherwise>
    <xsl:text> inst.repo</xsl:text>
  </xsl:otherwise>
</xsl:choose>

This is duplication of info will be needed because not all the <os/>
entris will have the <kernel-url-argument/> attribute.

IMO it still looks better in this way (please, check v1[0]) than having
to have the entry added in all OSes.

Cole, what do you think?

If you're okay with this, I'll just submit the v3.

[0]: https://www.redhat.com/archives/libosinfo/2019-April/msg00188.html

Best Regards,
-- 
Fabiano Fid?ncio




From fidencio at redhat.com  Fri May  3 14:24:44 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Fri, 03 May 2019 16:24:44 +0200
Subject: [Libosinfo] Libosinfo tools,
 could you help me to have a better understanding of those?
Message-ID: <70fd5a879d35dafdf853804076790df7f0b645d6.camel@redhat.com>

People,

As part of libosinfo, we have a few tools: osinfo-detect, osinfo-
install-script, and osinfo-query.

About osinfo-detect, it seems clear that the intetion of the tools is
to detect whether we're able to recognise a media or tree. It's output
is something like:
```
fidencio at laerte ~ $ osinfo-detect ~/Downloads/Fedora-Workstation-
netinst-x86_64-29-1.2.iso
Media is bootable.
Media is an installer for OS 'Fedora 29 Workstation'

fidencio at laerte ~ $ osinfo-detect --format env ~/Downloads/Fedora-
Workstation-netinst-x86_64-29-1.2.iso
OSINFO_BOOTABLE=1
OSINFO_INSTALLER=http://fedoraproject.org/fedora/29
OSINFO_MEDIA=http://fedoraproject.org/fedora/29:1
```
Now, the questions that come to my mind are:
- What kind of information should we return when a media is recognised?
- How the information would be used? By whom?
- Do we still care about --format env?

Cole already filed an issue about osinfo-detect failing to recognise
s390 medias as bootlable and, in the past, I've already fixed detection
of PPC medias. So, apart from the questions raised above, there's a
clear need of improving our detection methods and it'll be done in the
future (as in, I'm aware of and have plans to work on this).
I've also filed some issues about osinfo-detect that would help Cockpit
usage of the tools. However, this doesn't apply anymore for Cockpit as
they're now using our APIs directly (but the may still apply for other
cosumers of the tools).

About osinfo-install-script, it seems clear that the intention of the
tool is to generate an install script for a supported distro. However,
it doesn't generate any command line to be used together with the
script. In any case, I'm really interested to know:
- How those scripts are supposed to be consumed?
- What was the idea behind the tool when it was created?
- What do we want to achieve with this tool? (As in, who should be
consuming the generated script and how?)

Knowing those, I'll start filing some issues and improving the tool
accodingly.

About osinfo-query, it seems to be created in order to check whether an
OS supports/has info about something or not. But, then, similar
questions come to my mind:
- Who should be using this tool and how?
- What kind of output shall we provide?
- What kind of info is really required to be there?

Again, knowing those answers I'll start filing some issues and
improving the tool accordingly.

Last but not least, two general questions that involves all the tools
we have and that may end up being answered by the questions raised
above:

- Are those tools intended to be used together? As in:
  - detect whether a media is recognised or not via osinfo-detect;
  - use osinfo-detect output (or part of it) and pass it osinfo-query
in order to get its id
  - use the parsed output of osinfo-query and pass it to osinfo-
install-script in order to generate an install script

  The example above may be a dummy one, but I'd really like to
understand  how those tools can be connect and how ... or whether that
was not the intention at all (and then we should document it properly).

- What to be tested on those tools in order to ensure we're not
introducing any regression on them?
  - I'm asking this because I'd like to start adding test for those in
the very same way I've added tests for osinfo-db-tools.

Best Regards,
-- 
Fabiano Fid?ncio



From crobinso at redhat.com  Fri May  3 15:40:34 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 3 May 2019 11:40:34 -0400
Subject: [Libosinfo] [libosinfo PATCH] os: Add kernel-url-argument API
In-Reply-To: <f13e53a1e21c59d9a1bacd9b754aff1bf0eeec15.camel@redhat.com>
References: <20190502143910.28228-1-fidencio@redhat.com>
	<CAAY6XseDVqFWhYoFwX=vD4yM_UwWC4QK9rNh=DZnqri8oEAwtg@mail.gmail.com>
	<f13e53a1e21c59d9a1bacd9b754aff1bf0eeec15.camel@redhat.com>
Message-ID: <32381430-b7e8-5860-4e1b-0bb3433f42b0@redhat.com>

On 5/3/19 8:56 AM, Fabiano Fid?ncio wrote:
> On Fri, 2019-05-03 at 13:07 +0200, Fabiano Fid?ncio wrote:
>> On Thu, May 2, 2019 at 4:39 PM Fabiano Fid?ncio <fidencio at redhat.com>
>> wrote:
>>> Tree based installations will require a kernel-url-argument to be
>>> assed. Let's provide an API to the apps to get this info from
>>> OsinfoOS.
>>>
>>> https://gitlab.com/libosinfo/osinfo-db/issues/28
>>>
>>> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
>>
>> I've discusses this with Cole off-list and we've decided that going
>> for an "inheritance" (pero no mucho) way would be better.
>> I'll change the implementation for something towards the line of:
>> current.kernel_url_argument = current.kernel_url_argument or
>> derived_from.kernel_url_argument
>>
>> With that we'll be able to keep kernel_url_argument as a single one
>> and just replace it in case a new one is added (which will be needed
>> for Fedora >= 19, for instance).
>>
>> A v3 (of the whole thing) will be submitted.
> 
> Okay, I have this work done but before submit the v3, I'd like to raise
> one possible issue and confirm that having this kind of duplication is
> fine.
> 
> In the v2, I've been using as part of the scripts something like:
> <xsl:value-if select="os/kernel-url-argument"/>
> 
> Once we start inheriting kernel-url-argument, the kind of call shown
> above wouldn't be possible anymore, leading us to have, as part of the
> scripts, something like (for RHEL):
> <xsl:choose>
>   <xsl:when test="os/version &lt; 7">
>     <xsl:text> method</xsl:text>
>   </xsl:when>
>   <xsl:otherwise>
>     <xsl:text> inst.repo</xsl:text>
>   </xsl:otherwise>
> </xsl:choose>
> 
> This is duplication of info will be needed because not all the <os/>
> entris will have the <kernel-url-argument/> attribute.
> 
> IMO it still looks better in this way (please, check v1[0]) than having
> to have the entry added in all OSes.
> 
> Cole, what do you think?
> 

Hmm yeah that's a bit unfortunate, but I think it's nicer than the
kernel-url-argument duplication, so thumbs up from me

Thanks,
Cole



From fidencio at redhat.com  Fri May  3 15:53:24 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:53:24 +0200
Subject: [Libosinfo] [libosinfo PATCH v2] os: Add kernel-url-argument API
Message-ID: <20190503155324.20790-1-fidencio@redhat.com>

Tree based installations will require a kernel-url-argument to be
assed. Let's provide an API to the apps to get this info from OsinfoOS.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/libosinfo.syms                         |  2 +
 osinfo/osinfo_loader.c                        |  1 +
 osinfo/osinfo_os.c                            | 67 +++++++++++++++++++
 osinfo/osinfo_os.h                            |  3 +
 .../libosinfo.org/test-os-kernel-url-arg1.xml | 13 ++++
 .../libosinfo.org/test-os-kernel-url-arg2.xml | 12 ++++
 .../libosinfo.org/test-os-kernel-url-arg3.xml | 14 ++++
 tests/test-os.c                               | 36 ++++++++++
 8 files changed, 148 insertions(+)
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg1.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg2.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg3.xml

diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index 853acf5..f8b56a7 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -577,6 +577,8 @@ LIBOSINFO_1.5.0 {
 	osinfo_install_config_get_installation_url;
 	osinfo_install_config_set_installation_url;
 
+	osinfo_os_get_kernel_url_argument;
+
 	osinfo_product_get_short_id_list;
 
 	osinfo_tree_get_os;
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index 522162f..7735357 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -1563,6 +1563,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
         { OSINFO_OS_PROP_FAMILY, G_TYPE_STRING },
         { OSINFO_OS_PROP_DISTRO, G_TYPE_STRING },
         { OSINFO_OS_PROP_RELEASE_STATUS, G_TYPE_STRING },
+        { OSINFO_OS_PROP_KERNEL_URL_ARGUMENT, G_TYPE_STRING },
         { NULL, G_TYPE_INVALID }
     };
 
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index e458a45..08faf4f 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -75,6 +75,7 @@ enum {
 
     PROP_FAMILY,
     PROP_DISTRO,
+    PROP_KERNEL_URL_ARGUMENT,
 };
 
 static void osinfo_os_finalize(GObject *object);
@@ -99,6 +100,11 @@ osinfo_os_get_property(GObject    *object,
                                 osinfo_entity_get_param_value(entity,
                                                                "distro"));
             break;
+        case PROP_KERNEL_URL_ARGUMENT:
+            g_value_set_string(value,
+                               osinfo_entity_get_param_value(entity,
+                                                             OSINFO_OS_PROP_KERNEL_URL_ARGUMENT));
+            break;
         default:
             /* We don't have any other property... */
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
@@ -172,6 +178,22 @@ osinfo_os_class_init(OsinfoOsClass *klass)
     g_object_class_install_property(g_klass,
                                     PROP_DISTRO,
                                     pspec);
+
+    /**
+     * OsinfoOs:kernel-url-argument:
+     *
+     * The argument to be passed to kernel command line when performing a
+     * tree based installation of this OS.
+     */
+    pspec = g_param_spec_string("kernel-url-argument",
+                                "KernelURLArgument",
+                                _("Kernel URL Argument"),
+                                NULL /* default value */,
+                                G_PARAM_READABLE |
+                                G_PARAM_STATIC_STRINGS);
+    g_object_class_install_property(g_klass,
+                                    PROP_KERNEL_URL_ARGUMENT,
+                                    pspec);
 }
 
 static void
@@ -1142,3 +1164,48 @@ void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver)
     osinfo_list_add(OSINFO_LIST(os->priv->device_drivers),
                     OSINFO_ENTITY(driver));
 }
+
+struct GetKernelURLArgumentData {
+    const gchar *kernel_url_arg;
+};
+
+static void get_kernel_url_argument_cb(OsinfoProduct *product, gpointer user_data)
+{
+    OsinfoOs *os = OSINFO_OS(product);
+    struct GetKernelURLArgumentData *foreach_data = user_data;
+
+    g_return_if_fail(OSINFO_IS_OS(os));
+
+    if (foreach_data->kernel_url_arg != NULL)
+        return;
+
+    foreach_data->kernel_url_arg =
+            osinfo_entity_get_param_value(OSINFO_ENTITY(os),
+                                          OSINFO_OS_PROP_KERNEL_URL_ARGUMENT);
+}
+
+/**
+ * osinfo_os_get_kernel_url_argument:
+ * @os: an operating system
+ *
+ * Gets the argument expected to be passed to the kernel command line when
+ * performing a tree based installation.
+ *
+ * Returns: (transfer none): the kernel url argument, if present. Otherwise,
+ * NULL.
+ */
+const gchar *osinfo_os_get_kernel_url_argument(OsinfoOs *os)
+{
+    struct GetKernelURLArgumentData foreach_data = {
+        .kernel_url_arg = NULL
+    };
+    g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
+
+    osinfo_product_foreach_related(OSINFO_PRODUCT(os),
+                                   OSINFO_PRODUCT_FOREACH_FLAG_DERIVES_FROM |
+                                   OSINFO_PRODUCT_FOREACH_FLAG_CLONES,
+                                   get_kernel_url_argument_cb,
+                                   &foreach_data);
+
+    return foreach_data.kernel_url_arg;
+}
diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h
index 7c10475..6207a53 100644
--- a/osinfo/osinfo_os.h
+++ b/osinfo/osinfo_os.h
@@ -62,6 +62,7 @@ typedef struct _OsinfoOsPrivate OsinfoOsPrivate;
 #define OSINFO_OS_PROP_FAMILY                 "family"
 #define OSINFO_OS_PROP_DISTRO                 "distro"
 #define OSINFO_OS_PROP_RELEASE_STATUS         "release-status"
+#define OSINFO_OS_PROP_KERNEL_URL_ARGUMENT    "kernel-url-argument"
 
 /* object */
 struct _OsinfoOs
@@ -142,4 +143,6 @@ void osinfo_os_add_install_script(OsinfoOs *os, OsinfoInstallScript *script);
 OsinfoDeviceDriverList *osinfo_os_get_device_drivers(OsinfoOs *os);
 void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver);
 
+const gchar *osinfo_os_get_kernel_url_argument(OsinfoOs *os);
+
 #endif /* __OSINFO_OS_H__ */
diff --git a/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg1.xml b/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg1.xml
new file mode 100644
index 0000000..f3ea3ae
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/kernel-url-arg1">
+    <short-id>kernel-url-arg1</short-id>
+    <name>Kernel URL Arg 1</name>
+    <version>unknown</version>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <release-status>prerelease</release-status>
+
+    <kernel-url-argument>install</kernel-url-argument>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg2.xml b/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg2.xml
new file mode 100644
index 0000000..d97c2d8
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/kernel-url-arg2">
+    <short-id>kernel-url-arg2</short-id>
+    <name>Kernel URL Arg 2</name>
+    <version>unknown</version>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <release-status>prerelease</release-status>
+    <derives-from id="http://libosinfo.org/test/os/kernel-url-arg1"/>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg3.xml b/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg3.xml
new file mode 100644
index 0000000..932eb77
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-kernel-url-arg3.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/kernel-url-arg3">
+    <short-id>kernel-url-arg3</short-id>
+    <name>Kernel URL Arg 3</name>
+    <version>unknown</version>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <release-status>prerelease</release-status>
+    <derives-from id="http://libosinfo.org/test/os/kernel-url-arg2"/>
+
+    <kernel-url-argument>new.install</kernel-url-argument>
+  </os>
+</libosinfo>
diff --git a/tests/test-os.c b/tests/test-os.c
index fe7c2d6..84d838e 100644
--- a/tests/test-os.c
+++ b/tests/test-os.c
@@ -651,6 +651,41 @@ test_multiple_short_ids(void)
     g_object_unref(db);
 }
 
+static void
+test_kernel_url_arg(void)
+{
+    OsinfoLoader *loader;
+    OsinfoDb *db;
+    OsinfoOs *os;
+    GError *error = NULL;
+    const char *str;
+
+    loader = osinfo_loader_new();
+    osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error);
+    g_assert_no_error(error);
+    db = osinfo_loader_get_db(loader);
+
+    g_debug("Testing http://libosinfo.org/test/os/kernel-url-arg1\n");
+    os = osinfo_db_get_os(db, "http://libosinfo.org/test/os/kernel-url-arg1");
+    g_assert_nonnull(os);
+    str = osinfo_os_get_kernel_url_argument(os);
+    g_assert_cmpstr(str, ==, "install");
+
+    g_debug("Testing http://libosinfo.org/test/os/kernel-url-arg2\n");
+    os = osinfo_db_get_os(db, "http://libosinfo.org/test/os/kernel-url-arg2");
+    g_assert_nonnull(os);
+    str = osinfo_os_get_kernel_url_argument(os);
+    g_assert_cmpstr(str, ==, "install");
+
+    g_debug("Testing http://libosinfo.org/test/os/kernel-url-arg3\n");
+    os = osinfo_db_get_os(db, "http://libosinfo.org/test/os/kernel-url-arg3");
+    g_assert_nonnull(os);
+    str = osinfo_os_get_kernel_url_argument(os);
+    g_assert_cmpstr(str, ==, "new.install");
+
+    g_object_unref(loader);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -670,6 +705,7 @@ main(int argc, char *argv[])
     g_test_add_func("/os/resources/inheritance", test_resources_inheritance);
     g_test_add_func("/os/find_install_script", test_find_install_script);
     g_test_add_func("/os/mulitple_short_ids", test_multiple_short_ids);
+    g_test_add_func("/os/kernel_url_arg", test_kernel_url_arg);
 
     /* Upfront so we don't confuse valgrind */
     osinfo_platform_get_type();
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:40 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:40 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 00/13] Add missing command line
	info for tree based installations
Message-ID: <20190503155553.21445-1-fidencio@redhat.com>

Tree based installations will need more info from the command line than
what's currently provided by osinfo-db.

Let's add the needed info as part of <os/> and also to the command line
geenerated to passed to the kernel.

The reason of the duplication is because ther entry in <os/> takes
advantage of inheritance, making the new <kernel-url-argument/>
attribute not present for all OSes.

With those patches, management apps can rely solely in the command line
generated by us for doing tree based installations.

This patch has been built atop of:
https://www.redhat.com/archives/libosinfo/2019-May/msg00013.html

Fabiano Fid?ncio (13):
  schema: Add <kernel-url-argument/> to <os/>
  rhel: Add <kernel-url-argument/>
  fedora: Add <kernel-url-argument/>
  silverblue: Add <kernel-url-argument/>
  opensuse: Add <kernel-url-argument/>
  centos: Adjust command-line for tree based install
  rhel: Adjust command-line for tree based install
  fedora: Fix command-line template identation
  fedora: Prefer user set URL over the default one
  fedora: Adjust command-line for tree based install
  silverblue: Adjust command line for tree based install
  opensuse: Prefer user set URL over the default one
  opensuse: Adjust command line for tree based install

 .../centos-kickstart-desktop.xml.in           | 11 ++++
 .../centos.org/centos-kickstart-jeos.xml.in   | 11 ++++
 .../fedora-kickstart-desktop.xml.in           | 51 ++++++++++++++++---
 .../fedora-kickstart-jeos.xml.in              | 51 ++++++++++++++++---
 .../silverblue-kickstart-desktop.xml.in       | 15 ++++++
 .../opensuse-autoyast-desktop.xml.in          | 20 +++++++-
 .../opensuse-autoyast-jeos.xml.in             | 20 +++++++-
 .../redhat.com/rhel-kickstart-desktop.xml.in  | 11 ++++
 .../redhat.com/rhel-kickstart-jeos.xml.in     | 11 ++++
 data/os/fedoraproject.org/fedora-1.xml.in     |  2 +
 data/os/fedoraproject.org/fedora-19.xml.in    |  2 +
 .../os/fedoraproject.org/silverblue-28.xml.in |  2 +
 data/os/opensuse.org/opensuse-42.1.xml.in     |  2 +
 data/os/redhat.com/rhel-5.0.xml.in            |  2 +
 data/os/redhat.com/rhel-6.0.xml.in            |  2 +
 data/os/redhat.com/rhel-7.0.xml.in            |  2 +
 data/os/redhat.com/rhel-8.0.xml.in            |  2 +
 data/schema/osinfo.rng.in                     |  5 ++
 18 files changed, 204 insertions(+), 18 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:41 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:41 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 01/13] schema: Add
	<kernel-url-argument/> to <os/>
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-2-fidencio@redhat.com>

The <kernel-url-argument/> attribute will be used by management apps to
know what should be passed to the kernel when performing a tree based
installation of an OS.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/schema/osinfo.rng.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in
index b3760d2..0348dd4 100644
--- a/data/schema/osinfo.rng.in
+++ b/data/schema/osinfo.rng.in
@@ -611,6 +611,11 @@
         <zeroOrMore>
           <ref name='driver'/>
         </zeroOrMore>
+        <optional>
+          <element name="kernel-url-argument">
+            <text/>
+          </element>
+        </optional>
       </interleave>
     </element>
   </define>
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:42 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:42 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 02/13] rhel: Add
	<kernel-url-argument/>
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-3-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For rhel < 7, "method" should be used. For rhel >= 7 "inst.repo" should
be used instead.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-5.0.xml.in | 2 ++
 data/os/redhat.com/rhel-6.0.xml.in | 2 ++
 data/os/redhat.com/rhel-7.0.xml.in | 2 ++
 data/os/redhat.com/rhel-8.0.xml.in | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/data/os/redhat.com/rhel-5.0.xml.in b/data/os/redhat.com/rhel-5.0.xml.in
index d6dc846..c1eb51e 100644
--- a/data/os/redhat.com/rhel-5.0.xml.in
+++ b/data/os/redhat.com/rhel-5.0.xml.in
@@ -12,5 +12,7 @@
 
     <release-date>2007-03-14</release-date>
     <eol-date>2020-03-31</eol-date>
+
+    <kernel-url-argument>method</kernel-url-argument>
   </os>
 </libosinfo>
diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in
index 3e2dab1..858e02e 100644
--- a/data/os/redhat.com/rhel-6.0.xml.in
+++ b/data/os/redhat.com/rhel-6.0.xml.in
@@ -93,6 +93,8 @@
       </maximum>
     </resources>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index e5f57da..bf72752 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -106,6 +106,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://redhat.com/rhel/kickstart/jeos'/>
       <script id='http://redhat.com/rhel/kickstart/desktop'/>
diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index fe9f489..9a6e4a8 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -140,5 +140,7 @@
         <storage>10737418240</storage>
       </recommended>
     </resources>
+
+    <kernel-url-argument>inst.repo</kernel-url-argument>
   </os>
 </libosinfo>
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:43 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:43 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 03/13] fedora: Add
	<kernel-url-argument/>
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-4-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For fedora < 19, "method" should be used. For fedora >= 19 "inst.repo"
should be used instead.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/fedora-1.xml.in  | 2 ++
 data/os/fedoraproject.org/fedora-19.xml.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/data/os/fedoraproject.org/fedora-1.xml.in b/data/os/fedoraproject.org/fedora-1.xml.in
index a10152b..609715c 100644
--- a/data/os/fedoraproject.org/fedora-1.xml.in
+++ b/data/os/fedoraproject.org/fedora-1.xml.in
@@ -86,6 +86,8 @@
       <boot-iso>images/boot.iso</boot-iso>
     </tree>
 
+    <kernel-url-argument>method</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
     </installer>
diff --git a/data/os/fedoraproject.org/fedora-19.xml.in b/data/os/fedoraproject.org/fedora-19.xml.in
index 5dbcab7..1afeda6 100644
--- a/data/os/fedoraproject.org/fedora-19.xml.in
+++ b/data/os/fedoraproject.org/fedora-19.xml.in
@@ -153,6 +153,8 @@
       </minimum>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/fedora/kickstart/jeos'/>
       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:44 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:44 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 04/13] silverblue: Add
	<kernel-url-argument/>
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-5-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For silverblue "inst.repo" should be used instead.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/silverblue-28.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/os/fedoraproject.org/silverblue-28.xml.in b/data/os/fedoraproject.org/silverblue-28.xml.in
index ccaa322..d836b36 100644
--- a/data/os/fedoraproject.org/silverblue-28.xml.in
+++ b/data/os/fedoraproject.org/silverblue-28.xml.in
@@ -40,6 +40,8 @@
       </network-install>
     </resources>
 
+    <kernel-url-argument>inst.repo</kernel-url-argument>
+
     <installer>
       <script id='http://fedoraproject.org/silverblue/kickstart/desktop'/>
     </installer>
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:45 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:45 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 05/13] opensuse: Add
	<kernel-url-argument/>
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-6-fidencio@redhat.com>

The <kernel-url-argument/> attribute is what has to be passed to kernel
whenever performing a tree based installation.

For opensuse "install" should be used.

https://gitlab.com/libosinfo/osinfo-db/issues/28

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/opensuse.org/opensuse-42.1.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/os/opensuse.org/opensuse-42.1.xml.in b/data/os/opensuse.org/opensuse-42.1.xml.in
index dafd8bc..cef14c0 100644
--- a/data/os/opensuse.org/opensuse-42.1.xml.in
+++ b/data/os/opensuse.org/opensuse-42.1.xml.in
@@ -25,6 +25,8 @@
       <initrd>boot/x86_64/loader/initrd</initrd>
     </media>
 
+    <kernel-url-argument>install</kernel-url-argument>
+
     <installer>
       <script id='http://opensuse.org/opensuse/autoyast/jeos'/>
       <script id='http://opensuse.org/opensuse/autoyast/desktop'/>
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:46 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:46 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 06/13] centos: Adjust command-line
	for tree based install
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-7-fidencio@redhat.com>

tree based installations will require either a "method=URL" (for EL < 7)
or "inst.repo=URL" (for EL >= 7) to be passed to the kernel command line.

Although virt-install automatically appends this to kernel command line
we generate, this is something that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../centos.org/centos-kickstart-desktop.xml.in        | 11 +++++++++++
 .../centos.org/centos-kickstart-jeos.xml.in           | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
index c215115..db4a785 100644
--- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
@@ -67,6 +67,17 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:choose>
+              <xsl:when test="os/version &lt; 7">
+                <xsl:text> method=</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> inst.repo=</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="version">
diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
index 8349928..d872800 100644
--- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
@@ -59,6 +59,17 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:choose>
+              <xsl:when test="os/version &lt; 7">
+                <xsl:text> method=</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> inst.repo=</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="version">
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:47 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:47 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 07/13] rhel: Adjust command-line
	for tree based install
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-8-fidencio@redhat.com>

tree based installations will require either a "method=URL" (for EL < 7)
or "inst.repo=URL" (for EL >= 7) to be passed to the kernel command line.

Although virt-install automatically appends this to kernel command line
we generate, this is something that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../redhat.com/rhel-kickstart-desktop.xml.in          | 11 +++++++++++
 .../redhat.com/rhel-kickstart-jeos.xml.in             | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index 0eb1716..286c92c 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -78,6 +78,17 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:choose>
+              <xsl:when test="os/version &lt; 7">
+                <xsl:text> method=</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> inst.repo=</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index e08f67a..6e60d03 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -70,6 +70,17 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:choose>
+              <xsl:when test="os/version &lt; 7">
+                <xsl:text> method=</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> inst.repo=</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:48 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:48 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 08/13] fedora: Fix command-line
	template identation
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-9-fidencio@redhat.com>

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../fedora-kickstart-desktop.xml.in           | 24 +++++++++----------
 .../fedora-kickstart-jeos.xml.in              | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index cd2d517..dcdb93f 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -96,18 +96,18 @@
         </xsl:template>
 
         <xsl:template match="/command-line">
-            <xsl:text>ks=</xsl:text>
-            <xsl:choose>
-              <xsl:when test="script/preferred-injection-method = 'initrd'">
-                <xsl:text>file:/</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>hd:</xsl:text>
-                <xsl:call-template name="script-disk"/>
-                <xsl:text>:/</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:value-of select="script/expected-filename"/>
+          <xsl:text>ks=</xsl:text>
+          <xsl:choose>
+            <xsl:when test="script/preferred-injection-method = 'initrd'">
+              <xsl:text>file:/</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>hd:</xsl:text>
+              <xsl:call-template name="script-disk"/>
+              <xsl:text>:/</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 7683b6a..07fc932 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -88,18 +88,18 @@
         </xsl:template>
 
         <xsl:template match="/command-line">
-            <xsl:text>ks=</xsl:text>
-            <xsl:choose>
-              <xsl:when test="script/preferred-injection-method = 'initrd'">
-                <xsl:text>file:/</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>hd:</xsl:text>
-                <xsl:call-template name="script-disk"/>
-                <xsl:text>:/</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:value-of select="script/expected-filename"/>
+          <xsl:text>ks=</xsl:text>
+          <xsl:choose>
+            <xsl:when test="script/preferred-injection-method = 'initrd'">
+              <xsl:text>file:/</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>hd:</xsl:text>
+              <xsl:call-template name="script-disk"/>
+              <xsl:text>:/</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:49 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:49 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 09/13] fedora: Prefer user set URL
	over the default one
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-10-fidencio@redhat.com>

Similarly to what already has been done for CentOS and RHEL, let's
prefer a user set URL (or the URL set for the tree) whenever those are
available.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../fedora-kickstart-desktop.xml.in           | 26 ++++++++++++++++++-
 .../fedora-kickstart-jeos.xml.in              | 26 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index dcdb93f..f918938 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -110,6 +110,30 @@
           <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="url-or-mirrorlist">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != '' or tree/url != ''">
+              <xsl:text> --url</xsl:text>
+              <xsl:call-template name="installation-url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text> --mirrorlist=</xsl:text>
+              <xsl:text>https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template match="/install-script-config">
 # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
 <xsl:if test="script/installation-source = 'media' and (count(media/variant) = 0 or not(contains(media/variant, 'netinst')))">
@@ -143,7 +167,7 @@ reboot
 <xsl:if test="script/installation-source = 'network' or contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
+url <xsl:call-template name="url-or-mirrorlist"/>
 </xsl:if>
 
 %packages
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 07fc932..5b5fe8e 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -102,6 +102,30 @@
           <xsl:value-of select="script/expected-filename"/>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="url-or-mirrorlist">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != '' or tree/url != ''">
+              <xsl:text> --url</xsl:text>
+              <xsl:call-template name="installation-url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text> --mirrorlist=</xsl:text>
+              <xsl:text>https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template match="/install-script-config">
 # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
 <xsl:if test="script/installation-source='media' and (count(media/variant) = 0 or not(contains(media/variant, 'netinst')))">
@@ -153,7 +177,7 @@ reboot
 <xsl:if test="script/installation-source='network' or contains(media/variant, 'netinst')">
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
+url <xsl:call-template name="url-or-mirrorlist"/>
 </xsl:if>
 
 %packages
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:50 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:50 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 10/13] fedora: Adjust command-line
	for tree based install
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-11-fidencio@redhat.com>

tree based installations will require either a "method=URL" (Fedora <
19) or "inst.repo=URL" (Fedora 19+) to be passed to the kernel command
line.

Although virt-install automatically appends this to the command line we
generate, this is someething that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../fedoraproject.org/fedora-kickstart-desktop.xml.in | 11 +++++++++++
 .../fedoraproject.org/fedora-kickstart-jeos.xml.in    | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index f918938..eebdbb5 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -108,6 +108,17 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:choose>
+              <xsl:when test="os/version &lt; 19">
+                <xsl:text> method=</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> inst.repo=</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="installation-url">
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index 5b5fe8e..fe5f27b 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -100,6 +100,17 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:choose>
+              <xsl:when test="os/version &lt; 19">
+                <xsl:text> method=</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text> inst.repo=</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template name="installation-url">
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:51 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:51 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 11/13] silverblue: Adjust command
	line for tree based install
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-12-fidencio@redhat.com>

tree based installations will require either a "inst.repo=URL" to be
passed to the kernel command line.

Although virt-install automatically appends this to the command line we
generate, this is someething that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../silverblue-kickstart-desktop.xml.in           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
index ba8a8a3..fd7971e 100644
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -45,6 +45,21 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> inst.repo=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
+        </xsl:template>
+
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+          </xsl:choose>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:52 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:52 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 12/13] opensuse: Prefer user set
	URL over the default one
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-13-fidencio@redhat.com>

Similary toi what already has been done for CentOS, RHEL, and Fedora,
let's prefer a user set URL (or the URL set for the tree) whenever those
are available.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../opensuse-autoyast-desktop.xml.in             | 16 +++++++++++++++-
 .../opensuse.org/opensuse-autoyast-jeos.xml.in   | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
index 7913850..5c30292 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
@@ -67,6 +67,20 @@
           </xsl:choose>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="repo-oss"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template name="repo-oss">
           <xsl:text> </xsl:text>
           <xsl:text>http://download.opensuse.org/</xsl:text>
@@ -250,7 +264,7 @@ Icon=/var/lib/AccountsService/icons/<xsl:value-of select="config/user-login"/>
 fi
 
 # Enable default OpenSUSE repos
-zypper ar -f <xsl:call-template name="repo-oss"/> repo-oss
+zypper ar -f <xsl:call-template name="installation-url"/> repo-oss
 zypper ar -f <xsl:call-template name="repo-non-oss"/> repo-non-oss
 zypper ar -f <xsl:call-template name="repo-update-oss"/> repo-update-oss
 <xsl:if test="not(contains(os/version, 'tumbleweed'))">
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
index 23f59dd..8b64d96 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
@@ -58,6 +58,20 @@
           </xsl:choose>
         </xsl:template>
 
+        <xsl:template name="installation-url">
+          <xsl:choose>
+            <xsl:when test="config/installation-url != ''">
+              <xsl:value-of select="config/installation-url"/>
+            </xsl:when>
+            <xsl:when test="tree/url != ''">
+              <xsl:value-of select="tree/url"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="repo-oss"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
         <xsl:template name="repo-oss">
           <xsl:text> </xsl:text>
           <xsl:text>http://download.opensuse.org/</xsl:text>
@@ -215,7 +229,7 @@
                   <chrooted config:type="boolean">true</chrooted>
                   <source>
 # Enable default OpenSUSE repos
-zypper ar -f <xsl:call-template name="repo-oss"/> repo-oss
+zypper ar -f <xsl:call-template name="installation-url"/> repo-oss
 zypper ar -f <xsl:call-template name="repo-non-oss"/> repo-non-oss
 zypper ar -f <xsl:call-template name="repo-update-oss"/> repo-update-oss
 <xsl:if test="not(contains(os/version, 'tumbleweed'))">
-- 
2.21.0



From fidencio at redhat.com  Fri May  3 15:55:53 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri,  3 May 2019 17:55:53 +0200
Subject: [Libosinfo] [osinfo-db PATCH v3 13/13] opensuse: Adjust command
	line for tree based install
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <20190503155553.21445-14-fidencio@redhat.com>

tree based installations will require a "install=URL" to be passed to the
kernel command line.

Although virt-install automatically appends this to the command line we
generate, this is someething that should be properly generated by us.

https://gitlab.com/libosinfo/osinfo-db/issues/26

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../opensuse.org/opensuse-autoyast-desktop.xml.in             | 4 ++++
 .../install-script/opensuse.org/opensuse-autoyast-jeos.xml.in | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
index 5c30292..07261aa 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
@@ -129,6 +129,10 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> install=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
diff --git a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
index 8b64d96..74d1977 100644
--- a/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
+++ b/data/install-script/opensuse.org/opensuse-autoyast-jeos.xml.in
@@ -120,6 +120,10 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="script/expected-filename"/>
+          <xsl:if test="script/installation-source = 'network'">
+            <xsl:text> install=</xsl:text>
+            <xsl:call-template name="installation-url"/>
+          </xsl:if>
         </xsl:template>
 
         <xsl:template match="/install-script-config">
-- 
2.21.0



From crobinso at redhat.com  Fri May  3 16:23:23 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 3 May 2019 12:23:23 -0400
Subject: [Libosinfo] Libosinfo tools,
 could you help me to have a better understanding of those?
In-Reply-To: <70fd5a879d35dafdf853804076790df7f0b645d6.camel@redhat.com>
References: <70fd5a879d35dafdf853804076790df7f0b645d6.camel@redhat.com>
Message-ID: <21538189-0378-7374-2e9d-b5a0b095de67@redhat.com>

On 5/3/19 10:24 AM, Fabiano Fid?ncio wrote:
> People,
> 
> As part of libosinfo, we have a few tools: osinfo-detect, osinfo-
> install-script, and osinfo-query.
> 
> About osinfo-detect, it seems clear that the intetion of the tools is
> to detect whether we're able to recognise a media or tree. It's output
> is something like:
> ```
> fidencio at laerte ~ $ osinfo-detect ~/Downloads/Fedora-Workstation-
> netinst-x86_64-29-1.2.iso
> Media is bootable.
> Media is an installer for OS 'Fedora 29 Workstation'
> 
> fidencio at laerte ~ $ osinfo-detect --format env ~/Downloads/Fedora-
> Workstation-netinst-x86_64-29-1.2.iso
> OSINFO_BOOTABLE=1
> OSINFO_INSTALLER=http://fedoraproject.org/fedora/29
> OSINFO_MEDIA=http://fedoraproject.org/fedora/29:1
> ```
> Now, the questions that come to my mind are:
> - What kind of information should we return when a media is recognised?
> - How the information would be used? By whom?
> - Do we still care about --format env?
> 
> Cole already filed an issue about osinfo-detect failing to recognise
> s390 medias as bootlable and, in the past, I've already fixed detection
> of PPC medias. So, apart from the questions raised above, there's a
> clear need of improving our detection methods and it'll be done in the
> future (as in, I'm aware of and have plans to work on this).
> I've also filed some issues about osinfo-detect that would help Cockpit
> usage of the tools. However, this doesn't apply anymore for Cockpit as
> they're now using our APIs directly (but the may still apply for other
> cosumers of the tools).
> 

I suggest we only extend it if there's a clear use case for doing so.
It's definitely useful as a quick 'can libosinfo even detect this media'
tool, for devs and occasionally in bug reports.

It was once specifically used for outputting some data to be tagged into
udev db so boxes could tell the OS of the media in /dev/cdrom, but
that's been solved alternately for a while now AFAICT

If cockpit isn't dependent on it anymore, then I say let the tool lie
until we have another compelling use case for extending it. Maybe
spitting out an OS ID and then something like the osinfo-dump tool could
be enough for shell scripts or apps that don't want to code directly to
the API, but I don't think we need to be proactive about trying to cover
those usecases.

> About osinfo-install-script, it seems clear that the intention of the
> tool is to generate an install script for a supported distro. However,
> it doesn't generate any command line to be used together with the
> script. In any case, I'm really interested to know:
> - How those scripts are supposed to be consumed?
> - What was the idea behind the tool when it was created?
> - What do we want to achieve with this tool? (As in, who should be
> consuming the generated script and how?)
> 

Here's the cover letter when danpb added it:
https://www.redhat.com/archives/virt-tools-list/2012-February/msg00236.html

In the absence of proof that anyone is actually using the tool
effectively, I'd say come up with some test case to make sure it isn't
completely broken, and then not worry about it beyond that. For the
kernel command line thing I'd just ignore it, there's already pieces of
the unattended install process we leave up to apps like making the
script available to the VM, let that tool just focus on generating a script.

> Knowing those, I'll start filing some issues and improving the tool
> accodingly.
> 
> About osinfo-query, it seems to be created in order to check whether an
> OS supports/has info about something or not. But, then, similar
> questions come to my mind:
> - Who should be using this tool and how?
> - What kind of output shall we provide?
> - What kind of info is really required to be there?
> 

The tool is useful for listing all os that osinfo-db knows about. That's
all I've every really used it for and at present all I can really think
it's practically useful for, besides testing the libosinfo API.

> Again, knowing those answers I'll start filing some issues and
> improving the tool accordingly.
> 
> Last but not least, two general questions that involves all the tools
> we have and that may end up being answered by the questions raised
> above:
> 
> - Are those tools intended to be used together? As in:
>   - detect whether a media is recognised or not via osinfo-detect;
>   - use osinfo-detect output (or part of it) and pass it osinfo-query
> in order to get its id
>   - use the parsed output of osinfo-query and pass it to osinfo-
> install-script in order to generate an install script
> 
>   The example above may be a dummy one, but I'd really like to
> understand  how those tools can be connect and how ... or whether that
> was not the intention at all (and then we should document it properly).
>

I don't think there was any grand intention for all of these to fit
together as some sort of shell libosinfo API. It's easy to imagine ways
to improve the tools and hypothetical use cases for doing so, but until
there's an actual user with a compelling reason why they can't use the
API and need more features from the shell tools, IMO dev time is better
spent elsewhere.

> - What to be tested on those tools in order to ensure we're not
> introducing any regression on them?
>   - I'm asking this because I'd like to start adding test for those in
> the very same way I've added tests for osinfo-db-tools.

Yes this is important regardless, we should keep the current state
working, or at least not obviously failing like crashing etc

Thanks,
Cole



From berrange at redhat.com  Fri May  3 16:35:16 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 3 May 2019 17:35:16 +0100
Subject: [Libosinfo] Libosinfo tools,
 could you help me to have a better understanding of those?
In-Reply-To: <70fd5a879d35dafdf853804076790df7f0b645d6.camel@redhat.com>
References: <70fd5a879d35dafdf853804076790df7f0b645d6.camel@redhat.com>
Message-ID: <20190503163516.GK17905@redhat.com>

On Fri, May 03, 2019 at 04:24:44PM +0200, Fabiano Fid?ncio wrote:
> People,
> 
> As part of libosinfo, we have a few tools: osinfo-detect, osinfo-
> install-script, and osinfo-query.
> 
> About osinfo-detect, it seems clear that the intetion of the tools is
> to detect whether we're able to recognise a media or tree. It's output
> is something like:
> ```
> fidencio at laerte ~ $ osinfo-detect ~/Downloads/Fedora-Workstation-
> netinst-x86_64-29-1.2.iso
> Media is bootable.
> Media is an installer for OS 'Fedora 29 Workstation'
> 
> fidencio at laerte ~ $ osinfo-detect --format env ~/Downloads/Fedora-
> Workstation-netinst-x86_64-29-1.2.iso
> OSINFO_BOOTABLE=1
> OSINFO_INSTALLER=http://fedoraproject.org/fedora/29
> OSINFO_MEDIA=http://fedoraproject.org/fedora/29:1
> ```
> Now, the questions that come to my mind are:
> - What kind of information should we return when a media is recognised?
> - How the information would be used? By whom?
> - Do we still care about --format env?

--format env was intended for udev scripts which was dropped in

  commit 16cf1f797728dff9e361033937faea9f38ffbe49
  Author: Zeeshan Ali (Khattak) <zeeshanak at gnome.org>
  Date:   Fri Feb 15 19:00:37 2013 +0200

    Ditch udev rule

What I find particularly horrible about --format env vs plain is
that they output different pieces of information.

I'd probably drop "env" and make a property JSON based format
for machine readability, while ensuring we report equivalent
set of info in all formts.

> About osinfo-install-script, it seems clear that the intention of the
> tool is to generate an install script for a supported distro. However,
> it doesn't generate any command line to be used together with the
> script. In any case, I'm really interested to know:
> - How those scripts are supposed to be consumed?
> - What was the idea behind the tool when it was created?
> - What do we want to achieve with this tool? (As in, who should be
> consuming the generated script and how?)

Mostly I intended it for people who are customizing the install
scripts to provide an easy way to see the expanded XSLT template.
ie an end user would take the template we provide, modify it some
and this is useful to see the results.

I also intended that users could take the output and use it with
the --initrd-inject arg to virt-install. Obviously they'd have
to also give the right --extra-args to go with it.

It would be useful if there was a flag to make it print the
extra args

Of course virt-install has native integration now, but I think
the general concept is still applicable / useful. For example
somone could use it to generate  kickstart that it then uploaded
to a tool like oVirt or OpenStack to automate an install.

> Last but not least, two general questions that involves all the tools
> we have and that may end up being answered by the questions raised
> above:
> 
> - Are those tools intended to be used together? As in:
>   - detect whether a media is recognised or not via osinfo-detect;
>   - use osinfo-detect output (or part of it) and pass it osinfo-query
> in order to get its id
>   - use the parsed output of osinfo-query and pass it to osinfo-
> install-script in order to generate an install script

There's no real grand unified vision like that, but obviously it
would be useful if the tools provide/accept the right kind of info
that lets them be used together.

osinfo-detect is particularly bad at this as it doesn't output
enough info todo reliable matching to osinfo-query

> - What to be tested on those tools in order to ensure we're not
> introducing any regression on them?

Whatever you think it useful. Any testing is better than the testing
we have today (none)

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



From fidencio at redhat.com  Mon May  6 10:02:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:02:12 +0200
Subject: [Libosinfo] [libosinfo PATCH 0/6] A bunch of trivial fixes to our
	docs
Message-ID: <20190506100218.5538-1-fidencio@redhat.com>

This patch series fixes a bunch of trivial fixes in our docs &
annotations.

Fabiano Fid?ncio (6):
  install_config: Fix _get_installation_url docs
  media: Document OSINFO_MEDIA_ERROR_NO_DIRECTORY_RECORD_EXTENT
  media: Use the same parameters' name for .c and .h
  install_script: Document OsinfoInstallScriptInstallationSource
  install_script: Use the same parameter's name in .c and .h
  docs: Add missing docs links from main docs page

 docs/reference/Libosinfo-docs.xml | 2 ++
 osinfo/osinfo_install_config.c    | 2 +-
 osinfo/osinfo_install_script.h    | 9 ++++++++-
 osinfo/osinfo_media.h             | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:02:13 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:02:13 +0200
Subject: [Libosinfo] [libosinfo PATCH 1/6] install_config: Fix
	_get_installation_url docs
In-Reply-To: <20190506100218.5538-1-fidencio@redhat.com>
References: <20190506100218.5538-1-fidencio@redhat.com>
Message-ID: <20190506100218.5538-2-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_install_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index 5a27943..4a01a81 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -706,7 +706,7 @@ void osinfo_install_config_set_installation_url(OsinfoInstallConfig *config,
 
 /**
  * osinfo_install_config_get_installation_url:
- * @config
+ * @config: the install config
  *
  * Returns the URL the script will use to perform the installation.
  */
-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:02:14 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:02:14 +0200
Subject: [Libosinfo] [libosinfo PATCH 2/6] media: Document
	OSINFO_MEDIA_ERROR_NO_DIRECTORY_RECORD_EXTENT
In-Reply-To: <20190506100218.5538-1-fidencio@redhat.com>
References: <20190506100218.5538-1-fidencio@redhat.com>
Message-ID: <20190506100218.5538-3-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_media.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h
index 0c3ee26..0aa4a47 100644
--- a/osinfo/osinfo_media.h
+++ b/osinfo/osinfo_media.h
@@ -43,6 +43,8 @@ osinfo_media_error_quark (void) G_GNUC_CONST;
  * @OSINFO_MEDIA_ERROR_NOT_BOOTABLE: Install media not bootable.
  * @OSINFO_MEDIA_ERROR_NO_PVD: No Primary volume descriptor.
  * @OSINFO_MEDIA_ERROR_NO_SVD: No supplementary volume descriptor.
+ * @OSINFO_MEDIA_ERROR_NO_DIRECTORY_RECORD_EXTENT: No directory record extent
+ * found.
  *
  * #GError codes used for errors in the #OSINFO_MEDIA_ERROR domain, during
  * reading of data from install media location.
-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:02:15 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:02:15 +0200
Subject: [Libosinfo] [libosinfo PATCH 3/6] media: Use the same parameters'
	name for .c and .h
In-Reply-To: <20190506100218.5538-1-fidencio@redhat.com>
References: <20190506100218.5538-1-fidencio@redhat.com>
Message-ID: <20190506100218.5538-4-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_media.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h
index 0aa4a47..eb5ba67 100644
--- a/osinfo/osinfo_media.h
+++ b/osinfo/osinfo_media.h
@@ -147,7 +147,7 @@ gint osinfo_media_get_installer_reboots(OsinfoMedia *media);
 gint64 osinfo_media_get_volume_size(OsinfoMedia *media);
 gboolean osinfo_media_get_eject_after_install(OsinfoMedia *media);
 gboolean osinfo_media_supports_installer_script(OsinfoMedia *media);
-void osinfo_media_add_install_script(OsinfoMedia *media, OsinfoInstallScript *install_script);
+void osinfo_media_add_install_script(OsinfoMedia *media, OsinfoInstallScript *script);
 OsinfoInstallScriptList *osinfo_media_get_install_script_list(OsinfoMedia *media);
 
 #endif /* __OSINFO_MEDIA_H__ */
-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:02:16 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:02:16 +0200
Subject: [Libosinfo] [libosinfo PATCH 4/6] install_script: Document
	OsinfoInstallScriptInstallationSource
In-Reply-To: <20190506100218.5538-1-fidencio@redhat.com>
References: <20190506100218.5538-1-fidencio@redhat.com>
Message-ID: <20190506100218.5538-5-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_install_script.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index c722518..dd90ca5 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -136,6 +136,13 @@ typedef enum {
     OSINFO_INSTALL_SCRIPT_INJECTION_METHOD_WEB    = 1 << 4,
 } OsinfoInstallScriptInjectionMethod;
 
+/**
+ * OsinfoInstallScriptInstallationSource:
+ * @OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_MEDIA: A media will be used as
+ * the installation source.
+ * @OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_NETWORK: A network method will
+ * be used as installation source.
+ */
 typedef enum {
     OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_MEDIA,
     OSINFO_INSTALL_SCRIPT_INSTALLATION_SOURCE_NETWORK
-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:02:17 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:02:17 +0200
Subject: [Libosinfo] [libosinfo PATCH 5/6] install_script: Use the same
	parameter's name in .c and .h
In-Reply-To: <20190506100218.5538-1-fidencio@redhat.com>
References: <20190506100218.5538-1-fidencio@redhat.com>
Message-ID: <20190506100218.5538-6-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_install_script.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index dd90ca5..e8abe25 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -274,7 +274,7 @@ void osinfo_install_script_set_preferred_injection_method(OsinfoInstallScript *s
 OsinfoInstallScriptInjectionMethod osinfo_install_script_get_preferred_injection_method(OsinfoInstallScript *script);
 
 void osinfo_install_script_set_installation_source(OsinfoInstallScript *script,
-                                                   OsinfoInstallScriptInstallationSource installer);
+                                                   OsinfoInstallScriptInstallationSource source);
 OsinfoInstallScriptInstallationSource osinfo_install_script_get_installation_source(OsinfoInstallScript *script);
 
 #endif /* __OSINFO_INSTALL_SCRIPT_H__ */
-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:02:18 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:02:18 +0200
Subject: [Libosinfo] [libosinfo PATCH 6/6] docs: Add missing docs links from
	main docs page
In-Reply-To: <20190506100218.5538-1-fidencio@redhat.com>
References: <20190506100218.5538-1-fidencio@redhat.com>
Message-ID: <20190506100218.5538-7-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 docs/reference/Libosinfo-docs.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/reference/Libosinfo-docs.xml b/docs/reference/Libosinfo-docs.xml
index 1a239a9..c21efc5 100644
--- a/docs/reference/Libosinfo-docs.xml
+++ b/docs/reference/Libosinfo-docs.xml
@@ -31,6 +31,8 @@
     <xi:include href="xml/osinfo_entity.xml"/>
     <xi:include href="xml/osinfo_enum_types.xml"/>
     <xi:include href="xml/osinfo_filter.xml"/>
+    <xi:include href="xml/osinfo_image.xml"/>
+    <xi:include href="xml/osinfo_imagelist.xml"/>
     <xi:include href="xml/osinfo_install_config.xml"/>
     <xi:include href="xml/osinfo_install_config_param.xml"/>
     <xi:include href="xml/osinfo_install_config_paramlist.xml"/>
-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:07:55 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:07:55 +0200
Subject: [Libosinfo] [libosinfo PATCH 0/1] NEWS for 1.5.0 release
Message-ID: <20190506100756.6003-1-fidencio@redhat.com>

I'm planning to roll out 1.5.0 in the next few days and I'd like to ask
for a feedback on the NEWS.

Apart from this patch, these other two series should also be merged
before the release:
https://www.redhat.com/archives/libosinfo/2019-May/msg00029.html
https://www.redhat.com/archives/libosinfo/2019-May/msg00051.html

Fabiano Fid?ncio (1):
  Update NEWS for 1.5.0 release

 NEWS | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:07:56 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:07:56 +0200
Subject: [Libosinfo] [libosinfo PATCH 1/1] Update NEWS for 1.5.0 release
In-Reply-To: <20190506100756.6003-1-fidencio@redhat.com>
References: <20190506100756.6003-1-fidencio@redhat.com>
Message-ID: <20190506100756.6003-2-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 NEWS | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/NEWS b/NEWS
index 003b697..85211f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,31 @@
                libosinfo News
 	       ==============
 
+1.5.0 - May 06, 2019
+====================
+- Refreshed translations from Zanata
+- Improvements to the documentation and annotations
+- Add API to get all short-ids from an OsinfoProduct
+- Improve OsinfoLoader in order to fully support multiple short-ids values on
+  an OsinfoProduct
+- Explicitly set GVFS as a requirement in the project spec file
+- Improve osinfo-detect tool's help wording
+- Add API to get an OS from OsinfoTrees & OsinfoMedias
+- Add API to set an OS to OsinfoTrees & OsinfoMedias
+- Improve osinfo-detect tool, making it aware of OsinfoTree's OS variants
+- Fix the loading of the architecture value of OsinfoImages
+- Fix usage of application id on media detection
+- Accept "all" as a valid fallback architecture for OsinfoTrees & OsinfoMedias
+- Improve treeinfo check by check for both ".treeinfo" and "treeinfo" files
+- Add API to get the OS variants from OsinfoTrees & OsinfoImages
+- Add a git-publish configuration file
+- Remove osinfo-db related tests
+- Remove emacs "Local variables" annotations
+- Add a toplevel .dir-local.el
+- Improvements to the project spec file
+- Add API to set the installation URL to a OsinfiInstallConfig
+
+
 1.4.0 - Mar 01, 2019
 ====================
 
-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:27:00 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:27:00 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH 0/1] NEWS for 1.5.0 release
Message-ID: <20190506102701.31158-1-fidencio@redhat.com>

I'm planning to roll out 1.5.0 in the next few days and I'd like to ask
for a feedback on the NEWS.

Fabiano Fid?ncio (1):
  Update NEWS for 1.5.0 release

 NEWS | 9 +++++++++
 1 file changed, 9 insertions(+)

-- 
2.21.0



From fidencio at redhat.com  Mon May  6 10:27:01 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon,  6 May 2019 12:27:01 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH 1/1] Update NEWS for 1.5.0
	release
In-Reply-To: <20190506102701.31158-1-fidencio@redhat.com>
References: <20190506102701.31158-1-fidencio@redhat.com>
Message-ID: <20190506102701.31158-2-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 NEWS | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 4beb1a4..1a4add3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+1.5.0
+=====
+
+- Refreshed translations from Zanata
+- Add a test suit covering all the tools
+- Improve usage of --root by not requiring its argument to end with '/'
+- Fix memory leak on osinfo-db-validate
+- Fix wording of osinfo-db-export --help
+
 1.4.0
 =====
 
-- 
2.21.0



From vincent.dao at asianux.com  Mon May  6 14:34:44 2019
From: vincent.dao at asianux.com (Vincent Dao)
Date: Mon,  6 May 2019 21:34:44 +0700
Subject: [Libosinfo]  [osinfo-db PATCH v1 0/2] asianux: Add asianux7.3
Message-ID: <20190506143446.19338-1-vincent.dao@asianux.com>

In this series I would like to submit Asianux Server 7.3 info.

Thank you for your review.
Have a nice day. 

Vincent Dao (2):
  asianux: Add asianux7.3 info
  asianux: Add asianux7.3 isodata

 asianux7.3/asianux-7.3.iso.txt             | 30 ++++++++++++++++
 data/os/asianux.com/asianux-7.3.xml.in     | 41 ++++++++++++++++++++++
 data/os/asianux.com/asianux-unknown.xml.in |  2 +-
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 asianux7.3/asianux-7.3.iso.txt
 create mode 100644 data/os/asianux.com/asianux-7.3.xml.in

-- 
2.21.0



From vincent.dao at asianux.com  Mon May  6 14:34:45 2019
From: vincent.dao at asianux.com (Vincent Dao)
Date: Mon,  6 May 2019 21:34:45 +0700
Subject: [Libosinfo] [osinfo-db PATCH v1 1/2] asianux: Add asianux7.3 info
In-Reply-To: <20190506143446.19338-1-vincent.dao@asianux.com>
References: <20190506143446.19338-1-vincent.dao@asianux.com>
Message-ID: <20190506143446.19338-2-vincent.dao@asianux.com>

diff --git a/data/os/asianux.com/asianux-7.3.xml.in b/data/os/asianux.com/asianux-7.3.xml.in
new file mode 100644
index 0000000..a2e39ea
--- /dev/null
+++ b/data/os/asianux.com/asianux-7.3.xml.in
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+
+  <os id="http://asianux.com/asianux/7.3">
+    <short-id>asianux7.3</short-id>
+    <name>Asianux Server 7 SP3</name>
+    <version>7.3</version>
+    <vendor>Asianux Project</vendor>
+    <family>linux</family>
+    <distro>asianux</distro>
+    <codename>Lotus</codename>
+    <upgrades id="http://asianux.com/asianux/7.2"/>
+
+    <release-date>2019-02-26</release-date>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>Asianux Server 7 SP3 x86_64</volume-id>
+      </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>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </recommended>
+    </resources>
+
+  </os>
+</libosinfo>
diff --git a/data/os/asianux.com/asianux-unknown.xml.in b/data/os/asianux.com/asianux-unknown.xml.in
index 95d9508..dd82873 100644
--- a/data/os/asianux.com/asianux-unknown.xml.in
+++ b/data/os/asianux.com/asianux-unknown.xml.in
@@ -13,7 +13,7 @@
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>Asianux Server (7 (?!SP[12])|(4 ?!SP[67])).+</volume-id>
+        <volume-id>Asianux Server(?!( 7 SP[123])|( 4 SP[67])).+</volume-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
-- 
2.21.0



From vincent.dao at asianux.com  Mon May  6 14:34:46 2019
From: vincent.dao at asianux.com (Vincent Dao)
Date: Mon,  6 May 2019 21:34:46 +0700
Subject: [Libosinfo] [libosinfo PATCH v1 2/2] asianux: Add asianux7.3 isodata
In-Reply-To: <20190506143446.19338-1-vincent.dao@asianux.com>
References: <20190506143446.19338-1-vincent.dao@asianux.com>
Message-ID: <20190506143446.19338-3-vincent.dao@asianux.com>

diff --git a/asianux7.3/asianux-7.3.iso.txt b/asianux7.3/asianux-7.3.iso.txt
new file mode 100644
index 0000000..5f087a3
--- /dev/null
+++ b/asianux7.3/asianux-7.3.iso.txt
@@ -0,0 +1,30 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Asianux Server 7 SP3 x86_64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, LIBISOFS-1.4.8, LIBBURN-1.4.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: 2265732
+El Torito VD version 1 found, boot catalog is in sector 1005
+CD-ROM uses ISO 9660:1999 relaxed format
+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 1D1D46 1908038
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 07:14:27 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 07 May 2019 09:14:27 +0200
Subject: [Libosinfo] [osinfo-db PATCH v1 1/2] asianux: Add asianux7.3
 info
In-Reply-To: <20190506143446.19338-2-vincent.dao@asianux.com>
References: <20190506143446.19338-1-vincent.dao@asianux.com>
	<20190506143446.19338-2-vincent.dao@asianux.com>
Message-ID: <a8c339c2b9d7c334b740f6b7acf9094b1daed9ac.camel@redhat.com>

Vicent,

On Mon, 2019-05-06 at 21:34 +0700, Vincent Dao wrote:
> diff --git a/data/os/asianux.com/asianux-7.3.xml.in
> b/data/os/asianux.com/asianux-7.3.xml.in
> new file mode 100644
> index 0000000..a2e39ea
> --- /dev/null
> +++ b/data/os/asianux.com/asianux-7.3.xml.in
> @@ -0,0 +1,41 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<libosinfo version="0.0.1">
> +
> +  <os id="http://asianux.com/asianux/7.3">
> +    <short-id>asianux7.3</short-id>
> +    <name>Asianux Server 7 SP3</name>
> +    <version>7.3</version>
> +    <vendor>Asianux Project</vendor>
> +    <family>linux</family>
> +    <distro>asianux</distro>
> +    <codename>Lotus</codename>
> +    <upgrades id="http://asianux.com/asianux/7.2"/>
> +
> +    <release-date>2019-02-26</release-date>
> +
> +    <media arch="x86_64">
> +      <iso>
> +        <system-id>LINUX</system-id>
> +        <volume-id>Asianux Server 7 SP3 x86_64</volume-id>
> +      </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>1000000000</cpu>
> +        <ram>1073741824</ram>
> +        <storage>10737418240</storage>
> +      </recommended>
> +    </resources>
> +
> +  </os>
> +</libosinfo>
> diff --git a/data/os/asianux.com/asianux-unknown.xml.in
> b/data/os/asianux.com/asianux-unknown.xml.in
> index 95d9508..dd82873 100644
> --- a/data/os/asianux.com/asianux-unknown.xml.in
> +++ b/data/os/asianux.com/asianux-unknown.xml.in
> @@ -13,7 +13,7 @@
>      <media arch="x86_64">
>        <iso>
>          <system-id>LINUX</system-id>
> -        <volume-id>Asianux Server (7 (?!SP[12])|(4
> ?!SP[67])).+</volume-id>
> +        <volume-id>Asianux Server(?!( 7 SP[123])|( 4
> SP[67])).+</volume-id>

This change will break our test suit as asianux-7.0 would be matched as
unknown.

With the following patch, it just work as expected:
```
fidencio at laerte ~/src/upstream/osinfo-db $ git diff
diff --git a/data/os/asianux.com/asianux-unknown.xml.in
b/data/os/asianux.com/asianux-unknown.xml.in
index dd82873..e58524f 100644
--- a/data/os/asianux.com/asianux-unknown.xml.in
+++ b/data/os/asianux.com/asianux-unknown.xml.in
@@ -13,7 +13,7 @@
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>Asianux Server(?!( 7 SP[123])|( 4
SP[67])).+</volume-id>
+        <volume-id>Asianux Server (7 (?!SP[123])|(4
?!SP[67])).+</volume-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
```

There's no need to submit a v2, I just would like to have your Ack on
the proposed change.

>        </iso>
>        <kernel>isolinux/vmlinuz</kernel>
>        <initrd>isolinux/initrd.img</initrd>

Best Regards,
-- 
Fabiano Fid?ncio



From fidencio at redhat.com  Tue May  7 07:16:09 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 07 May 2019 09:16:09 +0200
Subject: [Libosinfo] [osinfo-db PATCH v1 1/2] asianux: Add asianux7.3
 info
In-Reply-To: <a8c339c2b9d7c334b740f6b7acf9094b1daed9ac.camel@redhat.com>
References: <20190506143446.19338-1-vincent.dao@asianux.com>
	<20190506143446.19338-2-vincent.dao@asianux.com>
	<a8c339c2b9d7c334b740f6b7acf9094b1daed9ac.camel@redhat.com>
Message-ID: <0ff588c229c4820aacf15c82173282c695b3128f.camel@redhat.com>

On Tue, 2019-05-07 at 09:14 +0200, Fabiano Fid?ncio wrote:
> Vicent,

** Vincent! :-)
Sorry for the typo

> 
> On Mon, 2019-05-06 at 21:34 +0700, Vincent Dao wrote:
> > diff --git a/data/os/asianux.com/asianux-7.3.xml.in
> > b/data/os/asianux.com/asianux-7.3.xml.in
> > new file mode 100644
> > index 0000000..a2e39ea
> > --- /dev/null
> > +++ b/data/os/asianux.com/asianux-7.3.xml.in
> > @@ -0,0 +1,41 @@
> > +<?xml version="1.0" encoding="UTF-8"?>
> > +<libosinfo version="0.0.1">
> > +
> > +  <os id="http://asianux.com/asianux/7.3">
> > +    <short-id>asianux7.3</short-id>
> > +    <name>Asianux Server 7 SP3</name>
> > +    <version>7.3</version>
> > +    <vendor>Asianux Project</vendor>
> > +    <family>linux</family>
> > +    <distro>asianux</distro>
> > +    <codename>Lotus</codename>
> > +    <upgrades id="http://asianux.com/asianux/7.2"/>
> > +
> > +    <release-date>2019-02-26</release-date>
> > +
> > +    <media arch="x86_64">
> > +      <iso>
> > +        <system-id>LINUX</system-id>
> > +        <volume-id>Asianux Server 7 SP3 x86_64</volume-id>
> > +      </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>1000000000</cpu>
> > +        <ram>1073741824</ram>
> > +        <storage>10737418240</storage>
> > +      </recommended>
> > +    </resources>
> > +
> > +  </os>
> > +</libosinfo>
> > diff --git a/data/os/asianux.com/asianux-unknown.xml.in
> > b/data/os/asianux.com/asianux-unknown.xml.in
> > index 95d9508..dd82873 100644
> > --- a/data/os/asianux.com/asianux-unknown.xml.in
> > +++ b/data/os/asianux.com/asianux-unknown.xml.in
> > @@ -13,7 +13,7 @@
> >      <media arch="x86_64">
> >        <iso>
> >          <system-id>LINUX</system-id>
> > -        <volume-id>Asianux Server (7 (?!SP[12])|(4
> > ?!SP[67])).+</volume-id>
> > +        <volume-id>Asianux Server(?!( 7 SP[123])|( 4
> > SP[67])).+</volume-id>
> 
> This change will break our test suit as asianux-7.0 would be matched
> as
> unknown.
> 
> With the following patch, it just work as expected:
> ```
> fidencio at laerte ~/src/upstream/osinfo-db $ git diff
> diff --git a/data/os/asianux.com/asianux-unknown.xml.in
> b/data/os/asianux.com/asianux-unknown.xml.in
> index dd82873..e58524f 100644
> --- a/data/os/asianux.com/asianux-unknown.xml.in
> +++ b/data/os/asianux.com/asianux-unknown.xml.in
> @@ -13,7 +13,7 @@
>      <media arch="x86_64">
>        <iso>
>          <system-id>LINUX</system-id>
> -        <volume-id>Asianux Server(?!( 7 SP[123])|( 4
> SP[67])).+</volume-id>
> +        <volume-id>Asianux Server (7 (?!SP[123])|(4
> ?!SP[67])).+</volume-id>
>        </iso>
>        <kernel>isolinux/vmlinuz</kernel>
>        <initrd>isolinux/initrd.img</initrd>
> ```
> 
> There's no need to submit a v2, I just would like to have your Ack on
> the proposed change.
> 
> >        </iso>
> >        <kernel>isolinux/vmlinuz</kernel>
> >        <initrd>isolinux/initrd.img</initrd>
> 
> Best Regards,

And now with Vincent in copy.
Best Regards,
-- 
Fabiano Fid?ncio



From fidencio at redhat.com  Tue May  7 07:18:30 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 07 May 2019 09:18:30 +0200
Subject: [Libosinfo] [libosinfo PATCH v1 2/2] asianux: Add asianux7.3
 isodata
In-Reply-To: <20190506143446.19338-3-vincent.dao@asianux.com>
References: <20190506143446.19338-1-vincent.dao@asianux.com>
	<20190506143446.19338-3-vincent.dao@asianux.com>
Message-ID: <4c64d4be2b2c4130fc3d3928f096889d29b36160.camel@redhat.com>

Vincent,

On Mon, 2019-05-06 at 21:34 +0700, Vincent Dao wrote:
> diff --git a/asianux7.3/asianux-7.3.iso.txt b/asianux7.3/asianux-
> 7.3.iso.txt
> new file mode 100644
> index 0000000..5f087a3
> --- /dev/null
> +++ b/asianux7.3/asianux-7.3.iso.txt
> @@ -0,0 +1,30 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Asianux Server 7 SP3 x86_64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.4.8 2017.09.12.143001, LIBISOBURN-1.4.8, 
> LIBISOFS-1.4.8, LIBBURN-1.4.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: 2265732
> +El Torito VD version 1 found, boot catalog is in sector 1005
> +CD-ROM uses ISO 9660:1999 relaxed format
> +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 1D1D46 1908038


isodata files are not part of libosinfo anymore. Nowadays they're part
of osinfo-db/test/isodata.

It's been done ir order to avoid testing osinfo-db together wih
libosinfo tests. Now we have all the tests done (via make check) as
part of osinfo-db itself.

I've adapted the patch for osinfo-db. So, no need to submit a v2.

Best Regards,
-- 
Fabiano Fid?ncio



From fidencio at redhat.com  Tue May  7 07:19:52 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 07 May 2019 09:19:52 +0200
Subject: [Libosinfo] [osinfo-db PATCH v1 0/2] asianux: Add asianux7.3
In-Reply-To: <20190506143446.19338-1-vincent.dao@asianux.com>
References: <20190506143446.19338-1-vincent.dao@asianux.com>
Message-ID: <e4b08c263a6d66cb6a2bf6c4e5c8fce8121510e1.camel@redhat.com>

Vincent,

On Mon, 2019-05-06 at 21:34 +0700, Vincent Dao wrote:
> In this series I would like to submit Asianux Server 7.3 info.
> 
> Thank you for your review.
> Have a nice day. 
> 
> Vincent Dao (2):
>   asianux: Add asianux7.3 info
>   asianux: Add asianux7.3 isodata
> 
>  asianux7.3/asianux-7.3.iso.txt             | 30 ++++++++++++++++
>  data/os/asianux.com/asianux-7.3.xml.in     | 41
> ++++++++++++++++++++++
>  data/os/asianux.com/asianux-unknown.xml.in |  2 +-
>  3 files changed, 72 insertions(+), 1 deletion(-)
>  create mode 100644 asianux7.3/asianux-7.3.iso.txt
>  create mode 100644 data/os/asianux.com/asianux-7.3.xml.in
> 

I've made some comments on both patches. There's no need to submit a
v2, but I'd like to have your ack on the changes proposed in the patch
adding the xml.in for 7.3.

Also, I'll squash both patches before pushing.

Thanks for the contribution!

Best Regards,
-- 
Fabiano Fid?ncio



From vincent.dao at asianux.com  Tue May  7 10:16:58 2019
From: vincent.dao at asianux.com (Vincent Dao)
Date: Tue,  7 May 2019 17:16:58 +0700
Subject: [Libosinfo] [osinfo-db PATCH v1 1/2] asianux: Add asianux7.3
	info
Message-ID: <20190507101658.15501-1-vincent.dao@asianux.com>

Your changes Look Good to me.

>diff --git a/data/os/asianux.com/asianux-unknown.xml.in
>b/data/os/asianux.com/asianux-unknown.xml.in
>index dd82873..e58524f 100644
>--- a/data/os/asianux.com/asianux-unknown.xml.in
>+++ b/data/os/asianux.com/asianux-unknown.xml.in
>@@ -13,7 +13,7 @@
>     <media arch="x86_64">
>       <iso>
>         <system-id>LINUX</system-id>
>-        <volume-id>Asianux Server(?!( 7 SP[123])|( 4
>SP[67])).+</volume-id>
>+        <volume-id>Asianux Server (7 (?!SP[123])|(4
>?!SP[67])).+</volume-id>
>       </iso>
>       <kernel>isolinux/vmlinuz</kernel>
>       <initrd>isolinux/initrd.img</initrd>

ACK

Best Regards
-- 
2.21.0



From vincent.dao at asianux.com  Tue May  7 10:24:28 2019
From: vincent.dao at asianux.com (Vincent Dao)
Date: Tue,  7 May 2019 17:24:28 +0700
Subject: [Libosinfo]  [osinfo-db PATCH v1 0/2] asianux: Add asianux7.3
Message-ID: <20190507102428.4921-1-vincent.dao@asianux.com>

I'm sorry that I'm messing the nested mail threads, :D.
Thank you for your work!

Vincent

>Vincent,
>
>On Mon, 2019-05-06 at 21:34 +0700, Vincent Dao wrote:
>> In this series I would like to submit Asianux Server 7.3 info.
>> 
>> Thank you for your review.
>> Have a nice day. 
>> 
>> Vincent Dao (2):
>>   asianux: Add asianux7.3 info
>>   asianux: Add asianux7.3 isodata
>> 
>>  asianux7.3/asianux-7.3.iso.txt             | 30 ++++++++++++++++
>>  data/os/asianux.com/asianux-7.3.xml.in     | 41
>> ++++++++++++++++++++++
>>  data/os/asianux.com/asianux-unknown.xml.in |  2 +-
>>  3 files changed, 72 insertions(+), 1 deletion(-)
>>  create mode 100644 asianux7.3/asianux-7.3.iso.txt
>>  create mode 100644 data/os/asianux.com/asianux-7.3.xml.in
>> 
>
>I've made some comments on both patches. There's no need to submit a
>v2, but I'd like to have your ack on the changes proposed in the patch
>adding the xml.in for 7.3.
>
>Also, I'll squash both patches before pushing.
>
>Thanks for the contribution!
>
>Best Regards,

-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:06:17 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:06:17 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/4] osinfo-db: Add firmware support
	to <os/>
Message-ID: <20190507130621.9525-1-fidencio@redhat.com>

This patch set adds support to advertising the firmware types an OS
supports and follows the same naming used by libvirt.

For now, I've decided to not yet start decorating all x86_64/i686 OSes
we have in osinfo-db with <firmware arch="x86_64|i686" type="bios"/>,
but it may be needed in the future.

Also, this patch set only adds info about UEFI support for Fedora and
RHEL (well, Silverblue and CentOS will get it for free). So, it'll have
to be expanded later on.

Fabiano Fid?ncio (4):
  schema: Add firmware support to <os/>
  test: Add firmware related tests
  fedora: Add info about UEFI support
  rhel: Add info about UEFI support

 data/os/fedoraproject.org/fedora-19.xml.in |  3 +++
 data/os/redhat.com/rhel-6.9.xml.in         |  3 +++
 data/os/redhat.com/rhel-7.0.xml.in         |  2 ++
 data/os/redhat.com/rhel-8.0.xml.in         |  2 ++
 data/schema/osinfo.rng.in                  | 26 +++++++++++++++++++++
 tests/osinfo.py                            | 17 ++++++++++++++
 tests/test_firmwares.py                    | 27 ++++++++++++++++++++++
 tests/util.py                              | 11 ++++++++-
 8 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_firmwares.py

-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:06:18 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:06:18 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/4] schema: Add firmware support to
	<os/>
In-Reply-To: <20190507130621.9525-1-fidencio@redhat.com>
References: <20190507130621.9525-1-fidencio@redhat.com>
Message-ID: <20190507130621.9525-2-fidencio@redhat.com>

Let's add the <firmware/> attribute to <os/> so OSes can express whether
they support efi, bios and for which architecture those are supported.

The XML will look like:
<os>
  <firmware arch='all|x86_64|armv7l' type='bios|efi' supported='true|false'/>
</os>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/schema/osinfo.rng.in | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in
index b3760d2..58c9289 100644
--- a/data/schema/osinfo.rng.in
+++ b/data/schema/osinfo.rng.in
@@ -577,6 +577,22 @@
     </element>
   </define>
 
+  <define name='firmware'>
+    <element name='firmware'>
+      <attribute name='arch'>
+        <ref name='archnames'/>
+      </attribute>
+      <attribute name='type'>
+        <ref name='firmware-types'/>
+      </attribute>
+      <optional>
+        <attribute name='supported'>
+          <ref name='bool'/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+
   <define name='os'>
     <element name='os'>
       <interleave>
@@ -611,6 +627,9 @@
         <zeroOrMore>
           <ref name='driver'/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name='firmware'/>
+        </zeroOrMore>
       </interleave>
     </element>
   </define>
@@ -896,4 +915,11 @@
       </data>
     </element>
   </define>
+
+  <define name='firmware-types'>
+    <choice>
+      <value>bios</value>
+      <value>efi</value>
+    </choice>
+  </define>
 </grammar>
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:06:19 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:06:19 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/4] test: Add firmware related tests
In-Reply-To: <20190507130621.9525-1-fidencio@redhat.com>
References: <20190507130621.9525-1-fidencio@redhat.com>
Message-ID: <20190507130621.9525-3-fidencio@redhat.com>

For now, similarly to what's done for devices, let's ensure an OS
doesn't have the same firmware entry already listed in the parent.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tests/osinfo.py         | 17 +++++++++++++++++
 tests/test_firmwares.py | 27 +++++++++++++++++++++++++++
 tests/util.py           | 11 ++++++++++-
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_firmwares.py

diff --git a/tests/osinfo.py b/tests/osinfo.py
index 3585f44..8a94ef3 100644
--- a/tests/osinfo.py
+++ b/tests/osinfo.py
@@ -137,6 +137,13 @@ class Os(_XMLBase):
     def get_network_install_resources(self, node):
         return self._get_resources(node, 'network-install')
 
+    @_cache_property
+    def firmwares(self):
+        firmwares = []
+        firmwarelist = self._root.findall('firmware')
+        for firmware in firmwarelist:
+            firmwares.append(Firmware(firmware))
+        return firmwares
 
 class Resources(_XMLBase):
     @_cache_property
@@ -156,6 +163,16 @@ class Resources(_XMLBase):
         return self._get_int('storage')
 
 
+class Firmware(_XMLBase):
+    @_cache_property
+    def arch(self):
+        return self._root.attrib["arch"]
+
+    @_cache_property
+    def firmware_type(self):
+        return self._root.attrib["type"]
+
+
 class Image(_XMLBase):
     @_cache_property
     def url(self):
diff --git a/tests/test_firmwares.py b/tests/test_firmwares.py
new file mode 100644
index 0000000..4dad7d4
--- /dev/null
+++ b/tests/test_firmwares.py
@@ -0,0 +1,27 @@
+# This work is licensed under the GNU GPLv2 or later.
+# See the COPYING file in the top-level directory.
+
+import re
+
+from . import util
+
+
+def _check_duplicate_firmwares(osxml):
+    """
+    Ensure an OS doesn't list a firmware that's defined in the parent
+    """
+    broken = []
+    related = util.DataFiles.getosxml_related(osxml)
+    for osxml2 in related:
+        if osxml2.firmwares is not None:
+            for firmware2 in osxml2.firmwares:
+                for firmware in osxml.firmwares:
+                    if firmware.arch == firmware2.arch and \
+                       firmware.firmware_type == firmware2.firmware_type:
+                        broken.append([firmware.firmware_type, firmware.arch])
+    assert broken == []
+
+
+ at util.os_parametrize('osxml', filter_firmwares=True)
+def test_firmwares_duplication(osxml):
+    _check_duplicate_firmwares(osxml)
diff --git a/tests/util.py b/tests/util.py
index f60ef9b..726ae05 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -35,6 +35,7 @@ class _Files():
         self._all_xml_cache = []
         self._oses_cache = []
         self._devices_cache = []
+        self._firmwares_cache = []
         self._os_related_cache = defaultdict(list)
         self._files_format = files_format
 
@@ -62,7 +63,7 @@ class _Files():
                 p.startswith(os.path.join(self.datadir, dirname))]
 
     def oses(self, filter_media=False, filter_trees=False, filter_images=False,
-            filter_devices=False, filter_resources=False):
+            filter_devices=False, filter_resources=False, filter_firmwares=False):
         """
         Return a list of osinfo.Os objects
 
@@ -84,6 +85,8 @@ class _Files():
             oses = [o for o in oses if o.devices]
         if filter_resources:
             oses = [o for o in oses if o.resources_list]
+        if filter_firmwares:
+            oses = [o for o in oses if o.firmwares]
         return oses
 
     def getosxml_related(self, osxml):
@@ -118,6 +121,12 @@ class _Files():
                 self._devices_cache.append(osinfo.Device(path))
         return self._devices_cache
 
+    def firmwares(self):
+        if not self._firmwares_cache:
+            for path in self._filter_xml('firmware'):
+                self._firmwares_cache.append(osinfo.Firmware(path))
+        return self._firmwares_cache
+
     def xmls(self):
         return self._get_all_xml()
 
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:06:20 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:06:20 +0200
Subject: [Libosinfo] [osinfo-db PATCH 3/4] fedora: Add info about UEFI
	support
In-Reply-To: <20190507130621.9525-1-fidencio@redhat.com>
References: <20190507130621.9525-1-fidencio@redhat.com>
Message-ID: <20190507130621.9525-4-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/fedora-19.xml.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/os/fedoraproject.org/fedora-19.xml.in b/data/os/fedoraproject.org/fedora-19.xml.in
index 5dbcab7..8bdaa65 100644
--- a/data/os/fedoraproject.org/fedora-19.xml.in
+++ b/data/os/fedoraproject.org/fedora-19.xml.in
@@ -15,6 +15,9 @@
     <release-date>2013-07-02</release-date>
     <eol-date>2015-01-06</eol-date>
 
+    <firmware arch="x86_64" type="efi"/>
+    <firmware arch="i686" type="efi"/>
+
     <devices>
       <device id="http://pcisig.com/pci/1033/0194"/> <!-- nec-xhci -->
       <device id="http://pcisig.com/pci/1b36/0004"/> <!-- qemu-xhci -->
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:06:21 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:06:21 +0200
Subject: [Libosinfo] [osinfo-db PATCH 4/4] rhel: Add info about UEFI support
In-Reply-To: <20190507130621.9525-1-fidencio@redhat.com>
References: <20190507130621.9525-1-fidencio@redhat.com>
Message-ID: <20190507130621.9525-5-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-6.9.xml.in | 3 +++
 data/os/redhat.com/rhel-7.0.xml.in | 2 ++
 data/os/redhat.com/rhel-8.0.xml.in | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/data/os/redhat.com/rhel-6.9.xml.in b/data/os/redhat.com/rhel-6.9.xml.in
index 6cc80e0..5a15726 100644
--- a/data/os/redhat.com/rhel-6.9.xml.in
+++ b/data/os/redhat.com/rhel-6.9.xml.in
@@ -15,6 +15,9 @@
     <release-date>2017-03-21</release-date>
     <eol-date>2023-11-30</eol-date>
 
+    <firmware arch="x86_64" type="efi"/>
+    <firmware arch="i686" type="efi"/>
+
     <media arch="i686">
       <iso>
         <system-id>LINUX</system-id>
diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in
index e5f57da..d68fffd 100644
--- a/data/os/redhat.com/rhel-7.0.xml.in
+++ b/data/os/redhat.com/rhel-7.0.xml.in
@@ -13,6 +13,8 @@
 
     <release-date>2014-06-10</release-date>
 
+    <firmware arch="x86_64" type="efi"/>
+
     <devices>
       <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
       <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index fe9f489..93f8652 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -12,6 +12,8 @@
 
     <release-status>prerelease</release-status>
 
+    <firmware arch="x86_64" type="efi"/>
+
     <devices>
       <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
       <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:46 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:46 +0200
Subject: [Libosinfo] [libosinfo PATCH 0/7] libosinfo: Add firmware support
Message-ID: <20190507131653.23867-1-fidencio@redhat.com>

This series contains the machinery needed for loading, adding, and
retrieving information about firmware support of a specific OS.

The osinfo-db part of the series can be seen here:
https://www.redhat.com/archives/libosinfo/2019-May/msg00071.html

Fabiano Fid?ncio (7):
  firmware: Add OsinfoFirmware
  tests: Add test-firmware
  firmwarelist: Add OsinfoFirmwareList
  tests: Add test-firmwarelist
  os: Add support to Firmware
  loader: Load Firmwares to OSes
  test-firmware: Add tests

 .gitignore                                    |   2 +
 docs/reference/Libosinfo-docs.xml             |   2 +
 osinfo/Makefile.am                            |   4 +
 osinfo/libosinfo.syms                         |  10 +
 osinfo/osinfo.h                               |   2 +
 osinfo/osinfo_firmware.c                      | 202 +++++++++++++++++
 osinfo/osinfo_firmware.h                      |  73 ++++++
 osinfo/osinfo_firmwarelist.c                  |  79 +++++++
 osinfo/osinfo_firmwarelist.h                  |  67 ++++++
 osinfo/osinfo_loader.c                        |  45 ++++
 osinfo/osinfo_os.c                            |  96 ++++++++
 osinfo/osinfo_os.h                            |   3 +
 po/POTFILES.in                                |   1 +
 tests/Makefile.am                             |  10 +
 .../os/libosinfo.org/test-db-firmware.xml     |  16 ++
 .../test-os-firmwares-inheritance-1.xml       |  12 +
 .../test-os-firmwares-inheritance-2.xml       |  10 +
 .../test-os-firmwares-inheritance-3.xml       |  12 +
 .../test-os-firmwares-inheritance-4.xml       |  10 +
 .../test-os-firmwares-inheritance-5.xml       |  12 +
 .../test-os-firmwares-inheritance-6.xml       |  10 +
 tests/test-firmware.c                         |  88 ++++++++
 tests/test-firmwarelist.c                     | 209 ++++++++++++++++++
 tests/test-os.c                               | 118 ++++++++++
 24 files changed, 1093 insertions(+)
 create mode 100644 osinfo/osinfo_firmware.c
 create mode 100644 osinfo/osinfo_firmware.h
 create mode 100644 osinfo/osinfo_firmwarelist.c
 create mode 100644 osinfo/osinfo_firmwarelist.h
 create mode 100644 tests/dbdata/os/libosinfo.org/test-db-firmware.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-1.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-2.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-3.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-4.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-5.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-6.xml
 create mode 100644 tests/test-firmware.c
 create mode 100644 tests/test-firmwarelist.c

-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:47 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:47 +0200
Subject: [Libosinfo] [libosinfo PATCH 1/7] firmware: Add OsinfoFirmware
In-Reply-To: <20190507131653.23867-1-fidencio@redhat.com>
References: <20190507131653.23867-1-fidencio@redhat.com>
Message-ID: <20190507131653.23867-2-fidencio@redhat.com>

OsinfoFirmware has been created in order to represent the firmware types
supported by an OS.

The schema representation of this object is:
<firmware arch="arch name" type="bios|efi"/>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 docs/reference/Libosinfo-docs.xml |   1 +
 osinfo/Makefile.am                |   2 +
 osinfo/libosinfo.syms             |   4 +
 osinfo/osinfo.h                   |   1 +
 osinfo/osinfo_firmware.c          | 202 ++++++++++++++++++++++++++++++
 osinfo/osinfo_firmware.h          |  73 +++++++++++
 po/POTFILES.in                    |   1 +
 7 files changed, 284 insertions(+)
 create mode 100644 osinfo/osinfo_firmware.c
 create mode 100644 osinfo/osinfo_firmware.h

diff --git a/docs/reference/Libosinfo-docs.xml b/docs/reference/Libosinfo-docs.xml
index c21efc5..df8dd36 100644
--- a/docs/reference/Libosinfo-docs.xml
+++ b/docs/reference/Libosinfo-docs.xml
@@ -31,6 +31,7 @@
     <xi:include href="xml/osinfo_entity.xml"/>
     <xi:include href="xml/osinfo_enum_types.xml"/>
     <xi:include href="xml/osinfo_filter.xml"/>
+    <xi:include href="xml/osinfo_firmware.xml"/>
     <xi:include href="xml/osinfo_image.xml"/>
     <xi:include href="xml/osinfo_imagelist.xml"/>
     <xi:include href="xml/osinfo_install_config.xml"/>
diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
index cb1df8f..c722757 100644
--- a/osinfo/Makefile.am
+++ b/osinfo/Makefile.am
@@ -81,6 +81,7 @@ libosinfo_impl_include_HEADERS =		\
   osinfo_device_driverlist.h		\
   osinfo_entity.h			\
   osinfo_filter.h			\
+  osinfo_firmware.h			\
   osinfo_install_config.h		\
   osinfo_install_config_param.h		\
   osinfo_install_config_paramlist.h	\
@@ -119,6 +120,7 @@ libosinfo_c_files =		\
   osinfo_datamaplist.c			\
   osinfo_entity.c			\
   osinfo_filter.c			\
+  osinfo_firmware.c			\
   osinfo_list.c				\
   osinfo_device.c			\
   osinfo_devicelink.c			\
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index 853acf5..cacaf71 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -570,6 +570,10 @@ LIBOSINFO_1.4.0 {
 
 LIBOSINFO_1.5.0 {
     global:
+	osinfo_firmware_get_architecture;
+	osinfo_firmware_get_firmware_type;
+	osinfo_firmware_get_type;
+
 	osinfo_image_get_os;
 	osinfo_image_get_os_variants;
 	osinfo_image_set_os;
diff --git a/osinfo/osinfo.h b/osinfo/osinfo.h
index 20a8f3a..2063c73 100644
--- a/osinfo/osinfo.h
+++ b/osinfo/osinfo.h
@@ -40,6 +40,7 @@
 #include <osinfo/osinfo_devicelist.h>
 #include <osinfo/osinfo_devicelinklist.h>
 #include <osinfo/osinfo_devicelinkfilter.h>
+#include <osinfo/osinfo_firmware.h>
 #include <osinfo/osinfo_install_config.h>
 #include <osinfo/osinfo_install_config_param.h>
 #include <osinfo/osinfo_install_config_paramlist.h>
diff --git a/osinfo/osinfo_firmware.c b/osinfo/osinfo_firmware.c
new file mode 100644
index 0000000..c0476c4
--- /dev/null
+++ b/osinfo/osinfo_firmware.c
@@ -0,0 +1,202 @@
+/*
+ * libosinfo: A firmware representation for a (guest) OS
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <osinfo/osinfo.h>
+#include <gio/gio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+
+G_DEFINE_TYPE(OsinfoFirmware, osinfo_firmware, OSINFO_TYPE_ENTITY);
+
+#define OSINFO_FIRMWARE_GET_PRIVATE(obj)                    \
+    (G_TYPE_INSTANCE_GET_PRIVATE((obj),                \
+                                  OSINFO_TYPE_FIRMWARE,     \
+                                  OsinfoFirmwarePrivate))
+
+/**
+ * SECTION:osinfo_firmware
+ * @short_description: A firmware representation for a (guest) OS
+ * @see_also: #OsinfoOs
+ *
+ * #OsinfoFirmware is an entity representing a firmware used to boot
+ * a (guest) operating system.
+ */
+
+struct _OsinfoFirmwarePrivate
+{
+    gboolean unused;
+};
+
+enum {
+    PROP_0,
+
+    PROP_ARCHITECTURE,
+    PROP_FIRMWARE_TYPE,
+};
+
+static void
+osinfo_firmware_get_property(GObject *object,
+                             guint property_id,
+                             GValue *value,
+                             GParamSpec *pspec)
+{
+    OsinfoFirmware *firmware = OSINFO_FIRMWARE(object);
+
+    switch (property_id) {
+    case PROP_ARCHITECTURE:
+        g_value_set_string(value, osinfo_firmware_get_architecture(firmware));
+        break;
+
+    case PROP_FIRMWARE_TYPE:
+        g_value_set_string(value, osinfo_firmware_get_firmware_type(firmware));
+        break;
+
+    default:
+        /* We don't have any other property... */
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+        break;
+    }
+}
+
+static void
+osinfo_firmware_set_property(GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+    OsinfoFirmware *firmware = OSINFO_FIRMWARE(object);
+
+    switch (property_id) {
+    case PROP_ARCHITECTURE:
+        osinfo_entity_set_param(OSINFO_ENTITY(firmware),
+                                OSINFO_FIRMWARE_PROP_ARCHITECTURE,
+                                g_value_get_string(value));
+        break;
+
+    case PROP_FIRMWARE_TYPE:
+        osinfo_entity_set_param(OSINFO_ENTITY(firmware),
+                                OSINFO_FIRMWARE_PROP_TYPE,
+                                g_value_get_string(value));
+        break;
+
+    default:
+        /* We don't have any other property... */
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+        break;
+    }
+}
+
+static void
+osinfo_firmware_finalize(GObject *object)
+{
+    /* Chain up to the parent class */
+    G_OBJECT_CLASS(osinfo_firmware_parent_class)->finalize(object);
+}
+
+/* Init functions */
+static void
+osinfo_firmware_class_init(OsinfoFirmwareClass *klass)
+{
+    GObjectClass *g_klass = G_OBJECT_CLASS(klass);
+    GParamSpec *pspec;
+
+    g_klass->finalize = osinfo_firmware_finalize;
+    g_klass->get_property = osinfo_firmware_get_property;
+    g_klass->set_property = osinfo_firmware_set_property;
+    g_type_class_add_private(klass, sizeof(OsinfoFirmwarePrivate));
+
+    /**
+     * OsinfoFirmware:architecture:
+     *
+     * The target hardware architecture of this firmware.
+     */
+    pspec = g_param_spec_string("architecture",
+                                "ARCHITECTURE",
+                                _("CPU Architecture"),
+                                NULL /* default value */,
+                                G_PARAM_READWRITE |
+                                G_PARAM_STATIC_STRINGS);
+    g_object_class_install_property(g_klass, PROP_ARCHITECTURE, pspec);
+
+    /**
+     * OsinfoFirmware:firmware-type:
+     *
+     * The firmware type.
+     */
+    pspec = g_param_spec_string("type",
+                                "TYPE",
+                                _("The firmware type"),
+                                NULL /* default value */,
+                                G_PARAM_READWRITE |
+                                G_PARAM_STATIC_STRINGS);
+    g_object_class_install_property(g_klass, PROP_FIRMWARE_TYPE, pspec);
+}
+
+static void
+osinfo_firmware_init(OsinfoFirmware *firmware)
+{
+    firmware->priv = OSINFO_FIRMWARE_GET_PRIVATE(firmware);
+}
+
+OsinfoFirmware *osinfo_firmware_new(const gchar *id,
+                                    const gchar *architecture,
+                                    const gchar *type)
+{
+    OsinfoFirmware *firmware;
+
+    firmware = g_object_new(OSINFO_TYPE_FIRMWARE,
+                            "id", id,
+                            OSINFO_FIRMWARE_PROP_ARCHITECTURE, architecture,
+                            OSINFO_FIRMWARE_PROP_TYPE, type,
+                            NULL);
+
+    return firmware;
+}
+
+/**
+ * osinfo_firmware_get_architecture:
+ * @firmware: an #OsinfoFirmware instance
+ *
+ * Retrieves the target hardware architecture of the OS @firmware provides.
+ *
+ * Returns: (transfer none): the hardware architecture, or NULL
+ */
+const gchar *osinfo_firmware_get_architecture(OsinfoFirmware *firmware)
+{
+    return osinfo_entity_get_param_value(OSINFO_ENTITY(firmware),
+                                         OSINFO_FIRMWARE_PROP_ARCHITECTURE);
+}
+
+/**
+ * osinfo_firmware_get_format:
+ * @firmware: an #OsinfoFirmware instance
+ *
+ * The format of the @firmware
+ *
+ * Returns: (transfer none): the format, or NULL
+ */
+const gchar *osinfo_firmware_get_firmware_type(OsinfoFirmware *firmware)
+{
+    return osinfo_entity_get_param_value(OSINFO_ENTITY(firmware),
+                                         OSINFO_FIRMWARE_PROP_TYPE);
+}
diff --git a/osinfo/osinfo_firmware.h b/osinfo/osinfo_firmware.h
new file mode 100644
index 0000000..c085e22
--- /dev/null
+++ b/osinfo/osinfo_firmware.h
@@ -0,0 +1,73 @@
+/*
+ * libosinfo: A firmware representation for a (guest) OS
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <osinfo/osinfo_entity.h>
+
+#ifndef __OSINFO_FIRMWARE_H__
+#define __OSINFO_FIRMWARE_H__
+
+/*
+ * Type macros.
+ */
+#define OSINFO_TYPE_FIRMWARE                  (osinfo_firmware_get_type ())
+#define OSINFO_FIRMWARE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), OSINFO_TYPE_FIRMWARE, OsinfoFirmware))
+#define OSINFO_IS_FIRMWARE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OSINFO_TYPE_FIRMWARE))
+#define OSINFO_FIRMWARE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), OSINFO_TYPE_FIRMWARE, OsinfoFirmwareClass))
+#define OSINFO_IS_FIRMWARE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), OSINFO_TYPE_FIRMWARE))
+#define OSINFO_FIRMWARE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), OSINFO_TYPE_FIRMWARE, OsinfoFirmwareClass))
+
+#define OSINFO_FIRMWARE_PROP_ARCHITECTURE   "architecture"
+#define OSINFO_FIRMWARE_PROP_TYPE           "type"
+#define OSINFO_FIRMWARE_PROP_SUPPORTED      "supported"
+
+typedef struct _OsinfoFirmware          OsinfoFirmware;
+typedef struct _OsinfoFirmwareClass     OsinfoFirmwareClass;
+typedef struct _OsinfoFirmwarePrivate   OsinfoFirmwarePrivate;
+
+/* object */
+struct _OsinfoFirmware
+{
+    OsinfoEntity parent_instance;
+
+    /* public */
+
+    /* private */
+    OsinfoFirmwarePrivate *priv;
+};
+
+/* class */
+struct _OsinfoFirmwareClass
+{
+    /*< private >*/
+    OsinfoEntityClass parent_class;
+
+    /* class members */
+};
+
+GType osinfo_firmware_get_type(void);
+
+OsinfoFirmware *osinfo_firmware_new(const gchar *id, const gchar *architecture, const gchar *type);
+const gchar *osinfo_firmware_get_architecture(OsinfoFirmware *firmware);
+const gchar *osinfo_firmware_get_firmware_type(OsinfoFirmware *firmware);
+gboolean osinfo_firmware_is_supported(OsinfoFirmware *firmware);
+
+#endif /* __OSINFO_FIRMWARE_H__ */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2a714df..3d9660e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@ osinfo/osinfo_deployment.c
 osinfo/osinfo_devicelink.c
 osinfo/osinfo_devicelinkfilter.c
 osinfo/osinfo_entity.c
+osinfo/osinfo_firmware.c
 osinfo/osinfo_image.c
 osinfo/osinfo_install_config_param.c
 osinfo/osinfo_install_script.c
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:48 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:48 +0200
Subject: [Libosinfo] [libosinfo PATCH 2/7] tests: Add test-firmware
In-Reply-To: <20190507131653.23867-1-fidencio@redhat.com>
References: <20190507131653.23867-1-fidencio@redhat.com>
Message-ID: <20190507131653.23867-3-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .gitignore            |  1 +
 tests/Makefile.am     |  5 +++++
 tests/test-firmware.c | 48 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 tests/test-firmware.c

diff --git a/.gitignore b/.gitignore
index 553e83d..d6300b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ tests/test-db
 tests/test-devicelist
 tests/test-devicelinklist
 tests/test-filter
+tests/test-firmware
 tests/test-install-script
 tests/test-image
 tests/test-imagelist
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bdd68d3..06be48d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,7 @@ check_PROGRAMS = \
 	test-devicelist \
 	test-devicelinklist \
 	test-filter \
+	test-firmware \
 	test-media \
 	test-product \
 	test-os \
@@ -50,6 +51,10 @@ test_filter_LDADD = $(COMMON_LDADD)
 test_filter_CFLAGS = $(COMMON_CFLAGS)
 test_filter_SOURCES = test-filter.c
 
+test_firmware_LDADD = $(COMMON_LDADD)
+test_firmware_CFLAGS = $(COMMON_CFLAGS)
+test_firmware_SOURCES = test-firmware.c
+
 test_product_LDADD = $(COMMON_LDADD)
 test_product_CFLAGS = $(COMMON_CFLAGS)
 test_product_SOURCES = test-product.c
diff --git a/tests/test-firmware.c b/tests/test-firmware.c
new file mode 100644
index 0000000..a78758a
--- /dev/null
+++ b/tests/test-firmware.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include <config.h>
+
+#include <osinfo/osinfo.h>
+
+#define ID "foo:0"
+#define ARCH "x86_64"
+#define TYPE "efi"
+
+static void
+test_basic(void)
+{
+    OsinfoFirmware *firmware = osinfo_firmware_new(ID, ARCH, TYPE);
+
+    g_assert_true(OSINFO_IS_FIRMWARE(firmware));
+    g_assert_cmpstr(osinfo_entity_get_id(OSINFO_ENTITY(firmware)), ==, ID);
+    g_assert_cmpstr(osinfo_firmware_get_architecture(firmware), ==, ARCH);
+    g_assert_cmpstr(osinfo_firmware_get_firmware_type(firmware), ==, TYPE);
+}
+
+int
+main(int argc, char *argv[])
+{
+    g_test_init(&argc, &argv, NULL);
+
+    g_test_add_func("/firmware/basic", test_basic);
+
+    /* Upfront so we don't confuse valgrind */
+    osinfo_firmware_get_type();
+
+    return g_test_run();
+}
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:49 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:49 +0200
Subject: [Libosinfo] [libosinfo PATCH 3/7] firmwarelist: Add
	OsinfoFirmwareList
In-Reply-To: <20190507131653.23867-1-fidencio@redhat.com>
References: <20190507131653.23867-1-fidencio@redhat.com>
Message-ID: <20190507131653.23867-4-fidencio@redhat.com>

OsinfoFirmwareList has been created in order to represent a list of
firmwares supported by an OS, as an OS may support various firmwares
without any issue.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 docs/reference/Libosinfo-docs.xml |  1 +
 osinfo/Makefile.am                |  2 +
 osinfo/libosinfo.syms             |  3 ++
 osinfo/osinfo.h                   |  1 +
 osinfo/osinfo_firmwarelist.c      | 79 +++++++++++++++++++++++++++++++
 osinfo/osinfo_firmwarelist.h      | 67 ++++++++++++++++++++++++++
 6 files changed, 153 insertions(+)
 create mode 100644 osinfo/osinfo_firmwarelist.c
 create mode 100644 osinfo/osinfo_firmwarelist.h

diff --git a/docs/reference/Libosinfo-docs.xml b/docs/reference/Libosinfo-docs.xml
index df8dd36..8e503e1 100644
--- a/docs/reference/Libosinfo-docs.xml
+++ b/docs/reference/Libosinfo-docs.xml
@@ -32,6 +32,7 @@
     <xi:include href="xml/osinfo_enum_types.xml"/>
     <xi:include href="xml/osinfo_filter.xml"/>
     <xi:include href="xml/osinfo_firmware.xml"/>
+    <xi:include href="xml/osinfo_firmwarelist.xml"/>
     <xi:include href="xml/osinfo_image.xml"/>
     <xi:include href="xml/osinfo_imagelist.xml"/>
     <xi:include href="xml/osinfo_install_config.xml"/>
diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
index c722757..67a972e 100644
--- a/osinfo/Makefile.am
+++ b/osinfo/Makefile.am
@@ -82,6 +82,7 @@ libosinfo_impl_include_HEADERS =		\
   osinfo_entity.h			\
   osinfo_filter.h			\
   osinfo_firmware.h			\
+  osinfo_firmwarelist.h			\
   osinfo_install_config.h		\
   osinfo_install_config_param.h		\
   osinfo_install_config_paramlist.h	\
@@ -121,6 +122,7 @@ libosinfo_c_files =		\
   osinfo_entity.c			\
   osinfo_filter.c			\
   osinfo_firmware.c			\
+  osinfo_firmwarelist.c			\
   osinfo_list.c				\
   osinfo_device.c			\
   osinfo_devicelink.c			\
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index cacaf71..7f6dd65 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -574,6 +574,9 @@ LIBOSINFO_1.5.0 {
 	osinfo_firmware_get_firmware_type;
 	osinfo_firmware_get_type;
 
+	osinfo_firmwarelist_get_type;
+	osinfo_firmwarelist_new;
+
 	osinfo_image_get_os;
 	osinfo_image_get_os_variants;
 	osinfo_image_set_os;
diff --git a/osinfo/osinfo.h b/osinfo/osinfo.h
index 2063c73..36c4986 100644
--- a/osinfo/osinfo.h
+++ b/osinfo/osinfo.h
@@ -41,6 +41,7 @@
 #include <osinfo/osinfo_devicelinklist.h>
 #include <osinfo/osinfo_devicelinkfilter.h>
 #include <osinfo/osinfo_firmware.h>
+#include <osinfo/osinfo_firmwarelist.h>
 #include <osinfo/osinfo_install_config.h>
 #include <osinfo/osinfo_install_config_param.h>
 #include <osinfo/osinfo_install_config_paramlist.h>
diff --git a/osinfo/osinfo_firmwarelist.c b/osinfo/osinfo_firmwarelist.c
new file mode 100644
index 0000000..e29222a
--- /dev/null
+++ b/osinfo/osinfo_firmwarelist.c
@@ -0,0 +1,79 @@
+/*
+ * libosinfo: a list of firmwares
+ *
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <osinfo/osinfo.h>
+#include <glib/gi18n-lib.h>
+
+G_DEFINE_TYPE(OsinfoFirmwareList, osinfo_firmwarelist, OSINFO_TYPE_LIST);
+
+#define OSINFO_FIRMWARELIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_FIRMWARELIST, OsinfoFirmwareListPrivate))
+
+/**
+ * SECTION:osinfo_firmwarelist
+ * @short_description: A list of firmwares
+ * @see_also: #OsinfoList, #OsinfoFirmware
+ *
+ * #OsinfoFirmwareList is a list specialization that stores
+ * only #OsinfoFirmware objects.
+ */
+
+struct _OsinfoFirmwareListPrivate
+{
+    gboolean unused;
+};
+
+static void
+osinfo_firmwarelist_finalize(GObject *object)
+{
+    /* Chain up to the parent class */
+    G_OBJECT_CLASS(osinfo_firmwarelist_parent_class)->finalize(object);
+}
+
+/* Init functions */
+static void
+osinfo_firmwarelist_class_init(OsinfoFirmwareListClass *klass)
+{
+    GObjectClass *g_klass = G_OBJECT_CLASS(klass);
+
+    g_klass->finalize = osinfo_firmwarelist_finalize;
+    g_type_class_add_private(klass, sizeof(OsinfoFirmwareListPrivate));
+}
+
+static void
+osinfo_firmwarelist_init(OsinfoFirmwareList *list)
+{
+    list->priv = OSINFO_FIRMWARELIST_GET_PRIVATE(list);
+}
+
+/**
+ * osinfo_firmwarelist_new:
+ *
+ * Construct a new firmware list that is initially empty.
+ *
+ * Returns: (transfer full): an empty firmware list
+ */
+OsinfoFirmwareList *osinfo_firmwarelist_new(void)
+{
+    return g_object_new(OSINFO_TYPE_FIRMWARELIST,
+                        "element-type", OSINFO_TYPE_FIRMWARE,
+                        NULL);
+}
diff --git a/osinfo/osinfo_firmwarelist.h b/osinfo/osinfo_firmwarelist.h
new file mode 100644
index 0000000..6355398
--- /dev/null
+++ b/osinfo/osinfo_firmwarelist.h
@@ -0,0 +1,67 @@
+/*
+ * libosinfo: a list of firmwares
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib-object.h>
+#include <osinfo/osinfo_list.h>
+
+#ifndef __OSINFO_FIRMWARELIST_H__
+#define __OSINFO_FIRMWARELIST_H__
+
+/*
+ * Type macros.
+ */
+#define OSINFO_TYPE_FIRMWARELIST                  (osinfo_firmwarelist_get_type ())
+#define OSINFO_FIRMWARELIST(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), OSINFO_TYPE_FIRMWARELIST, OsinfoFirmwareList))
+#define OSINFO_IS_FIRMWARELIST(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OSINFO_TYPE_FIRMWARELIST))
+#define OSINFO_FIRMWARELIST_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), OSINFO_TYPE_FIRMWARELIST, OsinfoFirmwareListClass))
+#define OSINFO_IS_FIRMWARELIST_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), OSINFO_TYPE_FIRMWARELIST))
+#define OSINFO_FIRMWARELIST_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), OSINFO_TYPE_FIRMWARELIST, OsinfoFirmwareListClass))
+
+typedef struct _OsinfoFirmwareList        OsinfoFirmwareList;
+
+typedef struct _OsinfoFirmwareListClass   OsinfoFirmwareListClass;
+
+typedef struct _OsinfoFirmwareListPrivate OsinfoFirmwareListPrivate;
+
+/* object */
+struct _OsinfoFirmwareList
+{
+    OsinfoList parent_instance;
+
+    /* public */
+
+    /* private */
+    OsinfoFirmwareListPrivate *priv;
+};
+
+/* class */
+struct _OsinfoFirmwareListClass
+{
+    /*< private >*/
+    OsinfoListClass parent_class;
+
+    /* class members */
+};
+
+GType osinfo_firmwarelist_get_type(void);
+
+OsinfoFirmwareList *osinfo_firmwarelist_new(void);
+
+#endif /* __OSINFO_FIRMWARELIST_H__ */
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:50 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:50 +0200
Subject: [Libosinfo] [libosinfo PATCH 4/7] tests: Add test-firmwarelist
In-Reply-To: <20190507131653.23867-1-fidencio@redhat.com>
References: <20190507131653.23867-1-fidencio@redhat.com>
Message-ID: <20190507131653.23867-5-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .gitignore                |   1 +
 tests/Makefile.am         |   5 +
 tests/test-firmwarelist.c | 209 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 215 insertions(+)
 create mode 100644 tests/test-firmwarelist.c

diff --git a/.gitignore b/.gitignore
index d6300b3..b591a04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ tests/test-devicelist
 tests/test-devicelinklist
 tests/test-filter
 tests/test-firmware
+tests/test-firmwarelist
 tests/test-install-script
 tests/test-image
 tests/test-imagelist
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 06be48d..5d00b37 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,7 @@ check_PROGRAMS = \
 	test-devicelinklist \
 	test-filter \
 	test-firmware \
+	test-firmwarelist \
 	test-media \
 	test-product \
 	test-os \
@@ -55,6 +56,10 @@ test_firmware_LDADD = $(COMMON_LDADD)
 test_firmware_CFLAGS = $(COMMON_CFLAGS)
 test_firmware_SOURCES = test-firmware.c
 
+test_firmwarelist_LDADD = $(COMMON_LDADD)
+test_firmwarelist_CFLAGS = $(COMMON_CFLAGS)
+test_firmwarelist_SOURCES = test-firmwarelist.c
+
 test_product_LDADD = $(COMMON_LDADD)
 test_product_CFLAGS = $(COMMON_CFLAGS)
 test_product_SOURCES = test-product.c
diff --git a/tests/test-firmwarelist.c b/tests/test-firmwarelist.c
new file mode 100644
index 0000000..a5532c6
--- /dev/null
+++ b/tests/test-firmwarelist.c
@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include <config.h>
+
+#include <osinfo/osinfo.h>
+
+static void
+test_union(void)
+{
+    OsinfoFirmwareList *list1 = osinfo_firmwarelist_new();
+    OsinfoFirmwareList *list2 = osinfo_firmwarelist_new();
+    OsinfoFirmwareList *list3;
+    OsinfoFirmware *ent1 = osinfo_firmware_new("foo1", "x86_64", "efi");
+    OsinfoFirmware *ent2 = osinfo_firmware_new("foo2", "x86_64", "bios");
+    OsinfoFirmware *ent3 = osinfo_firmware_new("foo3", "i686", "bios");
+    OsinfoFirmware *ent4 = osinfo_firmware_new("foo4", "i686", "efi");
+
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent1));
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent2));
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent3));
+
+    osinfo_list_add(OSINFO_LIST(list2), OSINFO_ENTITY(ent1));
+    osinfo_list_add(OSINFO_LIST(list2), OSINFO_ENTITY(ent4));
+
+    list3 = OSINFO_FIRMWARELIST(osinfo_list_new_union(OSINFO_LIST(list1), OSINFO_LIST(list2)));
+
+    g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(list3)), ==, 4);
+
+    gboolean has1 = FALSE;
+    gboolean has2 = FALSE;
+    gboolean has3 = FALSE;
+    gboolean has4 = FALSE;
+    gboolean hasBad = FALSE;
+    int i;
+    for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(list3)); i++) {
+        OsinfoFirmware *ent = OSINFO_FIRMWARE(osinfo_list_get_nth(OSINFO_LIST(list3), i));
+        if (ent == ent1)
+            has1 = TRUE;
+        else if (ent == ent2)
+            has2 = TRUE;
+        else if (ent == ent3)
+            has3 = TRUE;
+        else if (ent == ent4)
+            has4 = TRUE;
+        else
+            hasBad = TRUE;
+    }
+    g_assert_true(has1);
+    g_assert_true(has2);
+    g_assert_true(has3);
+    g_assert_true(has4);
+    g_assert_false(hasBad);
+
+    g_object_unref(ent1);
+    g_object_unref(ent2);
+    g_object_unref(ent3);
+    g_object_unref(ent4);
+    g_object_unref(list1);
+    g_object_unref(list2);
+    g_object_unref(list3);
+}
+
+static void
+test_intersect(void)
+{
+    OsinfoFirmwareList *list1 = osinfo_firmwarelist_new();
+    OsinfoFirmwareList *list2 = osinfo_firmwarelist_new();
+    OsinfoFirmwareList *list3;
+    OsinfoFirmware *ent1 = osinfo_firmware_new("foo1", "x86_64", "efi");
+    OsinfoFirmware *ent2 = osinfo_firmware_new("foo2", "x86_64", "bios");
+    OsinfoFirmware *ent3 = osinfo_firmware_new("foo3", "i686", "bios");
+    OsinfoFirmware *ent4 = osinfo_firmware_new("foo4", "i686", "efi");
+
+
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent1));
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent2));
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent3));
+
+    osinfo_list_add(OSINFO_LIST(list2), OSINFO_ENTITY(ent1));
+    osinfo_list_add(OSINFO_LIST(list2), OSINFO_ENTITY(ent3));
+    osinfo_list_add(OSINFO_LIST(list2), OSINFO_ENTITY(ent4));
+
+    list3 = OSINFO_FIRMWARELIST(osinfo_list_new_intersection(OSINFO_LIST(list1), OSINFO_LIST(list2)));
+
+    g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(list3)), ==, 2);
+
+    gboolean has1 = FALSE;
+    gboolean has2 = FALSE;
+    gboolean has3 = FALSE;
+    gboolean has4 = FALSE;
+    gboolean hasBad = FALSE;
+    int i;
+    for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(list3)); i++) {
+        OsinfoFirmware *ent = OSINFO_FIRMWARE(osinfo_list_get_nth(OSINFO_LIST(list3), i));
+        if (ent == ent1)
+            has1 = TRUE;
+        else if (ent == ent2)
+            has2 = TRUE;
+        else if (ent == ent3)
+            has3 = TRUE;
+        else if (ent == ent4)
+            has4 = TRUE;
+        else
+            hasBad = TRUE;
+    }
+    g_assert_true(has1);
+    g_assert_false(has2);
+    g_assert_true(has3);
+    g_assert_false(has4);
+    g_assert_false(hasBad);
+
+    g_object_unref(ent1);
+    g_object_unref(ent2);
+    g_object_unref(ent3);
+    g_object_unref(ent4);
+    g_object_unref(list1);
+    g_object_unref(list2);
+    g_object_unref(list3);
+}
+
+static void
+test_filter(void)
+{
+    OsinfoFirmwareList *list1 = osinfo_firmwarelist_new();
+    OsinfoFirmwareList *list2;
+    OsinfoFilter *filter = osinfo_filter_new();
+    OsinfoFirmware *ent1 = osinfo_firmware_new("foo1", "x86_64", "efi");
+    OsinfoFirmware *ent2 = osinfo_firmware_new("foo2", "x86_64", "bios");
+    OsinfoFirmware *ent3 = osinfo_firmware_new("foo3", "i686", "bios");
+    OsinfoFirmware *ent4 = osinfo_firmware_new("foo4", "i686", "efi");
+
+    osinfo_filter_add_constraint(filter, OSINFO_FIRMWARE_PROP_TYPE, "efi");
+
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent1));
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent2));
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent3));
+    osinfo_list_add(OSINFO_LIST(list1), OSINFO_ENTITY(ent4));
+
+    list2 = OSINFO_FIRMWARELIST(osinfo_list_new_filtered(OSINFO_LIST(list1), filter));
+
+    g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(list2)), ==, 2);
+
+    gboolean has1 = FALSE;
+    gboolean has2 = FALSE;
+    gboolean has3 = FALSE;
+    gboolean has4 = FALSE;
+    gboolean hasBad = FALSE;
+    int i;
+    for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(list2)); i++) {
+        OsinfoFirmware *ent = OSINFO_FIRMWARE(osinfo_list_get_nth(OSINFO_LIST(list2), i));
+        if (ent == ent1)
+            has1 = TRUE;
+        else if (ent == ent2)
+            has2 = TRUE;
+        else if (ent == ent3)
+            has3 = TRUE;
+        else if (ent == ent4)
+            has4 = TRUE;
+        else
+            hasBad = TRUE;
+    }
+    g_assert_true(has1);
+    g_assert_false(has2);
+    g_assert_false(has3);
+    g_assert_true(has4);
+    g_assert_false(hasBad);
+
+    g_object_unref(ent1);
+    g_object_unref(ent2);
+    g_object_unref(ent3);
+    g_object_unref(ent4);
+    g_object_unref(filter);
+    g_object_unref(list1);
+    g_object_unref(list2);
+}
+
+int
+main(int argc, char *argv[])
+{
+    g_test_init(&argc, &argv, NULL);
+
+    g_test_add_func("/firmwarelist/union", test_union);
+    g_test_add_func("/firmwarelist/intersect", test_intersect);
+    g_test_add_func("/firmwarelist/filter", test_filter);
+
+    /* Upfront so we don't confuse valgrind */
+    osinfo_entity_get_type();
+    osinfo_firmware_get_type();
+    osinfo_firmwarelist_get_type();
+    osinfo_filter_get_type();
+    osinfo_list_get_type();
+
+    return g_test_run();
+}
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:51 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:51 +0200
Subject: [Libosinfo] [libosinfo PATCH 5/7] os: Add support to Firmware
In-Reply-To: <20190507131653.23867-1-fidencio@redhat.com>
References: <20190507131653.23867-1-fidencio@redhat.com>
Message-ID: <20190507131653.23867-6-fidencio@redhat.com>

Let's add APIs for both adding a firmware to or retrieving the list of
firmwares from an OS.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/libosinfo.syms |  3 ++
 osinfo/osinfo_os.c    | 96 +++++++++++++++++++++++++++++++++++++++++++
 osinfo/osinfo_os.h    |  3 ++
 3 files changed, 102 insertions(+)

diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index 7f6dd65..c00bb35 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -584,6 +584,9 @@ LIBOSINFO_1.5.0 {
 	osinfo_install_config_get_installation_url;
 	osinfo_install_config_set_installation_url;
 
+	osinfo_os_add_firmware;
+	osinfo_os_get_firmware_list;
+
 	osinfo_product_get_short_id_list;
 
 	osinfo_tree_get_os;
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index e458a45..fb4c3f7 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -51,6 +51,7 @@ struct _OsinfoOsPrivate
     // Value: List of device_link structs
     GList *deviceLinks;
 
+    OsinfoFirmwareList *firmwares;
     OsinfoMediaList *medias;
     OsinfoTreeList *trees;
     OsinfoImageList *images;
@@ -112,6 +113,7 @@ osinfo_os_finalize(GObject *object)
     OsinfoOs *os = OSINFO_OS(object);
 
     g_list_free_full(os->priv->deviceLinks, g_object_unref);
+    g_object_unref(os->priv->firmwares);
     g_object_unref(os->priv->medias);
     g_object_unref(os->priv->trees);
     g_object_unref(os->priv->images);
@@ -180,6 +182,7 @@ osinfo_os_init(OsinfoOs *os)
     os->priv = OSINFO_OS_GET_PRIVATE(os);
 
     os->priv->deviceLinks = NULL;
+    os->priv->firmwares = osinfo_firmwarelist_new();
     os->priv->medias = osinfo_medialist_new();
     os->priv->trees = osinfo_treelist_new();
     os->priv->images = osinfo_imagelist_new();
@@ -1142,3 +1145,96 @@ void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver)
     osinfo_list_add(OSINFO_LIST(os->priv->device_drivers),
                     OSINFO_ENTITY(driver));
 }
+
+struct GetAllFirmwaresData {
+    OsinfoFilter *filter;
+    OsinfoFilter *unsupported_filter;
+    OsinfoFirmwareList *firmwares;
+    OsinfoFirmwareList *unsupported_firmwares;
+};
+
+static void get_all_firmwares_cb(OsinfoProduct *product, gpointer user_data)
+{
+    OsinfoList *tmp_list;
+    OsinfoList *tmp_union_list;
+    OsinfoOs *os = OSINFO_OS(product);
+    gsize len, i;
+    gsize unsupported_len, j;
+    struct GetAllFirmwaresData *foreach_data = user_data;
+
+    g_return_if_fail(OSINFO_IS_OS(os));
+
+    tmp_list = osinfo_list_new_filtered(OSINFO_LIST(os->priv->firmwares),
+                                        foreach_data->unsupported_filter);
+    tmp_union_list = osinfo_list_new_union(tmp_list,
+                                           OSINFO_LIST(foreach_data->unsupported_firmwares));
+    g_object_unref(tmp_list);
+    g_object_unref(foreach_data->unsupported_firmwares);
+    foreach_data->unsupported_firmwares = OSINFO_FIRMWARELIST(tmp_union_list);
+
+    len = osinfo_list_get_length(OSINFO_LIST(os->priv->firmwares));
+    unsupported_len = osinfo_list_get_length(OSINFO_LIST(foreach_data->unsupported_firmwares));
+    for (i = 0; i < len; i++) {
+        OsinfoFirmware *firmware = OSINFO_FIRMWARE(osinfo_list_get_nth(OSINFO_LIST(os->priv->firmwares), i));
+        const gchar *arch = osinfo_firmware_get_architecture(firmware);
+        const gchar *type = osinfo_firmware_get_firmware_type(firmware);
+        gboolean add = TRUE;
+
+        if (foreach_data->filter && !osinfo_filter_matches(foreach_data->filter, OSINFO_ENTITY(firmware)))
+            add = FALSE;
+
+        if (add) {
+            for (j = 0; j < unsupported_len; j++) {
+                OsinfoFirmware *unsupported = OSINFO_FIRMWARE(osinfo_list_get_nth(OSINFO_LIST(foreach_data->unsupported_firmwares), j));
+                const gchar *unsupported_arch = osinfo_firmware_get_architecture(unsupported);
+                const gchar *unsupported_type = osinfo_firmware_get_firmware_type(unsupported);
+
+                if (g_str_equal(arch, unsupported_arch) &&
+                    g_str_equal(type, unsupported_type)) {
+                    add = FALSE;
+                    break;
+                }
+            }
+        }
+
+        if (add)
+            osinfo_list_add(OSINFO_LIST(foreach_data->firmwares), OSINFO_ENTITY(firmware));
+    }
+}
+
+OsinfoFirmwareList *osinfo_os_get_firmware_list(OsinfoOs *os, OsinfoFilter *filter)
+{
+    g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
+    g_return_val_if_fail(!filter || OSINFO_IS_FILTER(filter), NULL);
+
+    struct GetAllFirmwaresData foreach_data = {
+        .filter = filter,
+        .unsupported_filter = NULL,
+        .firmwares = osinfo_firmwarelist_new(),
+        .unsupported_firmwares = osinfo_firmwarelist_new()
+    };
+
+    foreach_data.unsupported_filter = osinfo_filter_new();
+    osinfo_filter_add_constraint(foreach_data.unsupported_filter,
+                                 OSINFO_FIRMWARE_PROP_SUPPORTED,
+                                 "false");
+
+    osinfo_product_foreach_related(OSINFO_PRODUCT(os),
+                                   OSINFO_PRODUCT_FOREACH_FLAG_DERIVES_FROM |
+                                   OSINFO_PRODUCT_FOREACH_FLAG_CLONES,
+                                   get_all_firmwares_cb,
+                                   &foreach_data);
+
+    g_object_unref(foreach_data.unsupported_filter);
+    g_object_unref(foreach_data.unsupported_firmwares);
+
+    return foreach_data.firmwares;
+}
+
+void osinfo_os_add_firmware(OsinfoOs *os, OsinfoFirmware *firmware)
+{
+    g_return_if_fail(OSINFO_IS_OS(os));
+    g_return_if_fail(OSINFO_IS_FIRMWARE(firmware));
+
+    osinfo_list_add(OSINFO_LIST(os->priv->firmwares), OSINFO_ENTITY(firmware));
+}
diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h
index 7c10475..ed9c5c9 100644
--- a/osinfo/osinfo_os.h
+++ b/osinfo/osinfo_os.h
@@ -142,4 +142,7 @@ void osinfo_os_add_install_script(OsinfoOs *os, OsinfoInstallScript *script);
 OsinfoDeviceDriverList *osinfo_os_get_device_drivers(OsinfoOs *os);
 void osinfo_os_add_device_driver(OsinfoOs *os, OsinfoDeviceDriver *driver);
 
+OsinfoFirmwareList *osinfo_os_get_firmware_list(OsinfoOs *os, OsinfoFilter *filter);
+void osinfo_os_add_firmware(OsinfoOs *os, OsinfoFirmware *firmware);
+
 #endif /* __OSINFO_OS_H__ */
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:52 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:52 +0200
Subject: [Libosinfo] [libosinfo PATCH 6/7] loader: Load Firmwares to OSes
In-Reply-To: <20190507131653.23867-1-fidencio@redhat.com>
References: <20190507131653.23867-1-fidencio@redhat.com>
Message-ID: <20190507131653.23867-7-fidencio@redhat.com>

Let's read the <firmware> attribute from the XMLs and store this into
our OS representation.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_loader.c | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index 522162f..9d2aa77 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -1312,6 +1312,33 @@ static OsinfoTree *osinfo_loader_tree(OsinfoLoader *loader,
     return tree;
 }
 
+static OsinfoFirmware *osinfo_loader_firmware(OsinfoLoader *loader,
+                                              xmlXPathContextPtr ctxt,
+                                              xmlNodePtr root,
+                                              const gchar *id,
+                                              GError **err)
+{
+    gchar *arch = (gchar *)xmlGetProp(root, BAD_CAST "arch");
+    gchar *type = (gchar *)xmlGetProp(root, BAD_CAST "type");
+    gchar *supported = (gchar *)xmlGetProp(root, BAD_CAST "supported");
+    gboolean is_supported = TRUE;
+
+    OsinfoFirmware *firmware = osinfo_firmware_new(id, arch, type);
+    xmlFree(arch);
+    xmlFree(type);
+
+    if (supported != NULL) {
+        is_supported = g_str_equal(supported, "true");
+        xmlFree(supported);
+    }
+
+    osinfo_entity_set_param_boolean(OSINFO_ENTITY(firmware),
+                                    OSINFO_FIRMWARE_PROP_SUPPORTED,
+                                    is_supported);
+
+    return firmware;
+}
+
 static OsinfoImage *osinfo_loader_image(OsinfoLoader *loader,
                                         xmlXPathContextPtr ctxt,
                                         xmlNodePtr root,
@@ -1591,6 +1618,24 @@ static void osinfo_loader_os(OsinfoLoader *loader,
     if (error_is_set(err))
         goto cleanup;
 
+    nnodes = osinfo_loader_nodeset("./firmware", loader, ctxt, &nodes, err);
+    if (error_is_set(err))
+        goto cleanup;
+
+    for (i = 0; i < nnodes; i++) {
+        xmlNodePtr saved = ctxt->node;
+        ctxt->node = nodes[i];
+        gchar *firmware_id = g_strdup_printf("%s:%u", id, i);
+        OsinfoFirmware *firmware = osinfo_loader_firmware(loader, ctxt, nodes[i], firmware_id, err);
+        g_free(firmware_id);
+        ctxt->node = saved;
+        if (error_is_set(err))
+            goto cleanup;
+
+        osinfo_os_add_firmware(os, firmware);
+        g_object_unref(firmware);
+    }
+
     nnodes = osinfo_loader_nodeset("./media", loader, ctxt, &nodes, err);
     if (error_is_set(err))
         goto cleanup;
-- 
2.21.0



From fidencio at redhat.com  Tue May  7 13:16:53 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue,  7 May 2019 15:16:53 +0200
Subject: [Libosinfo] [libosinfo PATCH 7/7] test-firmware: Add tests
In-Reply-To: <20190507131653.23867-1-fidencio@redhat.com>
References: <20190507131653.23867-1-fidencio@redhat.com>
Message-ID: <20190507131653.23867-8-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../os/libosinfo.org/test-db-firmware.xml     |  16 +++
 .../test-os-firmwares-inheritance-1.xml       |  12 ++
 .../test-os-firmwares-inheritance-2.xml       |  10 ++
 .../test-os-firmwares-inheritance-3.xml       |  12 ++
 .../test-os-firmwares-inheritance-4.xml       |  10 ++
 .../test-os-firmwares-inheritance-5.xml       |  12 ++
 .../test-os-firmwares-inheritance-6.xml       |  10 ++
 tests/test-firmware.c                         |  40 ++++++
 tests/test-os.c                               | 118 ++++++++++++++++++
 9 files changed, 240 insertions(+)
 create mode 100644 tests/dbdata/os/libosinfo.org/test-db-firmware.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-1.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-2.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-3.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-4.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-5.xml
 create mode 100644 tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-6.xml

diff --git a/tests/dbdata/os/libosinfo.org/test-db-firmware.xml b/tests/dbdata/os/libosinfo.org/test-db-firmware.xml
new file mode 100644
index 0000000..6872d63
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-db-firmware.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/db/firmware">
+    <short-id>db-firmware</short-id>
+    <name>DB Firmware</name>
+    <version>unknown</version>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+
+    <firmware arch="x86_64" type="efi"/>
+    <firmware arch="x86_64" type="bios"/>
+
+    <firmware arch="i686" type="efi" supported="false"/>
+    <firmware arch="i686" type="bios"/>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-1.xml b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-1.xml
new file mode 100644
index 0000000..59a0770
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/firmwares/inheritance/1">
+    <short-id>firmwaresinheritance1</short-id>
+    <name>Firmwares Inheritance 1</name>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+
+    <firmware arch="x86_64" type="bios"/>
+    <firmware arch="x86_64" type="efi"/>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-2.xml b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-2.xml
new file mode 100644
index 0000000..a252936
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/firmwares/inheritance/2">
+    <short-id>firmwaresinheritance2</short-id>
+    <name>Firmwares Inheritance 2</name>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <derives-from id="http://libosinfo.org/test/os/firmwares/inheritance/1"/>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-3.xml b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-3.xml
new file mode 100644
index 0000000..795cbf1
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/firmwares/inheritance/3">
+    <short-id>firmwaresinheritance3</short-id>
+    <name>Firmwares Inheritance 3</name>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <derives-from id="http://libosinfo.org/test/os/firmwares/inheritance/2"/>
+
+    <firmware arch="x86_64" type="bios" supported="false"/>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-4.xml b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-4.xml
new file mode 100644
index 0000000..3ebc182
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/firmwares/inheritance/4">
+    <short-id>firmwaresinheritance4</short-id>
+    <name>Firmwares Inheritance 4</name>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <derives-from id="http://libosinfo.org/test/os/firmwares/inheritance/3"/>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-5.xml b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-5.xml
new file mode 100644
index 0000000..139a79e
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-5.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/firmwares/inheritance/5">
+    <short-id>firmwaresinheritance5</short-id>
+    <name>Firmwares Inheritance 5</name>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <derives-from id="http://libosinfo.org/test/os/firmwares/inheritance/4"/>
+
+    <firmware arch="x86_64" type="bios"/>
+  </os>
+</libosinfo>
diff --git a/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-6.xml b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-6.xml
new file mode 100644
index 0000000..de774fa
--- /dev/null
+++ b/tests/dbdata/os/libosinfo.org/test-os-firmwares-inheritance-6.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+  <os id="http://libosinfo.org/test/os/firmwares/inheritance/6">
+    <short-id>firmwaresinheritance6</short-id>
+    <name>Firmwares Inheritance 6</name>
+    <vendor>libosinfo.org</vendor>
+    <family>test</family>
+    <derives-from id="http://libosinfo.org/test/os/firmwares/inheritance/5"/>
+  </os>
+</libosinfo>
diff --git a/tests/test-firmware.c b/tests/test-firmware.c
index a78758a..53b1ae4 100644
--- a/tests/test-firmware.c
+++ b/tests/test-firmware.c
@@ -34,15 +34,55 @@ test_basic(void)
     g_assert_cmpstr(osinfo_firmware_get_firmware_type(firmware), ==, TYPE);
 }
 
+static void
+test_loaded(void)
+{
+    OsinfoLoader *loader = osinfo_loader_new();
+    OsinfoDb *db;
+    OsinfoOs *os;
+    OsinfoFilter *filter;
+    OsinfoFirmwareList *list;
+    gint list_len;
+    GError *error = NULL;
+
+    osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error);
+    g_assert_no_error(error);
+    db = osinfo_loader_get_db(loader);
+
+    os = osinfo_db_get_os(db, "http://libosinfo.org/test/db/firmware");
+
+    list = osinfo_os_get_firmware_list(os, NULL);
+    list_len = osinfo_list_get_length(OSINFO_LIST(list));
+    g_assert_cmpint(list_len, ==, 3);
+    g_object_unref(list);
+
+    filter = osinfo_filter_new();
+    osinfo_filter_add_constraint(filter,
+                                 OSINFO_FIRMWARE_PROP_ARCHITECTURE, "i686");
+    list = osinfo_os_get_firmware_list(os, filter);
+    list_len = osinfo_list_get_length(OSINFO_LIST(list));
+    g_assert_cmpint(list_len, ==, 1);
+    g_object_unref(list);
+
+    g_object_unref(loader);
+}
+
 int
 main(int argc, char *argv[])
 {
     g_test_init(&argc, &argv, NULL);
 
     g_test_add_func("/firmware/basic", test_basic);
+    g_test_add_func("/firmware/loaded/basic", test_loaded);
 
     /* Upfront so we don't confuse valgrind */
     osinfo_firmware_get_type();
+    osinfo_firmwarelist_get_type();
+    osinfo_db_get_type();
+    osinfo_filter_get_type();
+    osinfo_list_get_type();
+    osinfo_loader_get_type();
+    osinfo_os_get_type();
 
     return g_test_run();
 }
diff --git a/tests/test-os.c b/tests/test-os.c
index fe7c2d6..cefa99e 100644
--- a/tests/test-os.c
+++ b/tests/test-os.c
@@ -651,6 +651,123 @@ test_multiple_short_ids(void)
     g_object_unref(db);
 }
 
+static void
+check_firmwares(OsinfoDb *db,
+                const gchar *os_id,
+                gint list_len)
+{
+    OsinfoOs *os;
+    OsinfoFirmwareList *firmwarelist;
+
+    g_test_message("Testing \"%s\"", os_id);
+
+    os = osinfo_db_get_os(db, os_id);
+    g_assert_true(OSINFO_IS_OS(os));
+
+    firmwarelist = osinfo_os_get_firmware_list(os, NULL);
+    g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(firmwarelist)), ==, list_len);
+
+    g_object_unref(firmwarelist);
+}
+
+
+static void
+test_firmwares_inheritance(void)
+{
+    OsinfoLoader *loader = osinfo_loader_new();
+    OsinfoDb *db;
+    GError *error = NULL;
+
+    osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error);
+    g_assert_no_error(error);
+    db = g_object_ref(osinfo_loader_get_db(loader));
+    g_object_unref(loader);
+
+    /**
+     * os1:
+     * - firmwares:
+     *   - explicitly added
+     *     - x86_64 | bios
+     *     - x86_64 | efi
+     *   - explicitly removed
+     *   - expected:
+     *     - x86_64 | bios
+     *     - x86_64 | efi
+
+     */
+    check_firmwares(db,
+                    "http://libosinfo.org/test/os/firmwares/inheritance/1",
+                    2);
+
+    /**
+     * os2 (derives-from os1):
+     * - firmwares
+     *   - explicitly added
+     *   - explicitly removed
+     *   - expected:
+     *     - x86_64 | bios
+     *     - x86_64 | efi
+     */
+    check_firmwares(db,
+                    "http://libosinfo.org/test/os/firmwares/inheritance/2",
+                    2);
+
+    /**
+     * os3 (derives-from os2):
+     * - firmwares
+     *   - explicitly added
+     *   - explicitly removed
+     *     - x86_64 | bios
+     *   - expected:
+     *     - x86_64 | efi
+
+     */
+    check_firmwares(db,
+                    "http://libosinfo.org/test/os/firmwares/inheritance/3",
+                    1);
+
+    /**
+     * os4 (derives-from os3):
+     * - firmwares
+     *   - explicitly added
+     *   - explicitly removed
+     *   - expected:
+     *     - x86_64 | efi
+     */
+    check_firmwares(db,
+                    "http://libosinfo.org/test/os/firmwares/inheritance/4",
+                    1);
+
+    /**
+     * os5 (derives-from os4):
+     * - firmwares
+     *   - explicitly added
+     *     - x86_64 | bios
+     *   - explicitly removed
+     *   - expected:
+     *     - x86_64 | bios
+     *     - x86_64 | efi
+     */
+    check_firmwares(db,
+                    "http://libosinfo.org/test/os/firmwares/inheritance/5",
+                    2);
+
+    /**
+     * os6 (derives-from os5):
+     * - firmwares
+     *   - explicitly added
+     *   - explicitly removed
+     *   - expected:
+     *     - x86_64 | bios
+     *     - x86_64 | efi
+     */
+    check_firmwares(db,
+                    "http://libosinfo.org/test/os/firmwares/inheritance/6",
+                    2);
+
+    g_object_unref(db);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -670,6 +787,7 @@ main(int argc, char *argv[])
     g_test_add_func("/os/resources/inheritance", test_resources_inheritance);
     g_test_add_func("/os/find_install_script", test_find_install_script);
     g_test_add_func("/os/mulitple_short_ids", test_multiple_short_ids);
+    g_test_add_func("/os/firmwares/inheritance", test_firmwares_inheritance);
 
     /* Upfront so we don't confuse valgrind */
     osinfo_platform_get_type();
-- 
2.21.0



From felipe10borges at gmail.com  Tue May  7 17:49:22 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Tue,  7 May 2019 19:49:22 +0200
Subject: [Libosinfo] [PATCH] rhel-8: Update releasedate
Message-ID: <20190507174922.18339-1-feborges@redhat.com>

RHEL 8.0 has been released today, 2019-05-07.

https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/8.0_release_notes/index

Signed-off-by: Felipe Borges <feborges at redhat.com>
---
 data/os/redhat.com/rhel-8.0.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index fe9f489..48fd927 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -10,7 +10,7 @@
     <distro>rhel</distro>
     <upgrades id="http://redhat.com/rhel/7.6"/>
 
-    <release-status>prerelease</release-status>
+    <release-status>2018-05-07</release-status>
 
     <devices>
       <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
-- 
2.21.0



From felipe10borges at gmail.com  Tue May  7 17:50:52 2019
From: felipe10borges at gmail.com (Felipe Borges)
Date: Tue,  7 May 2019 19:50:52 +0200
Subject: [Libosinfo] [PATCH] rhel-8: Update releasedate
Message-ID: <20190507175052.18950-1-feborges@redhat.com>

RHEL 8.0 has been released today, 2019-05-07.

https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/8.0_release_notes/index

Signed-off-by: Felipe Borges <feborges at redhat.com>
---
 data/os/redhat.com/rhel-8.0.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index fe9f489..e2eea8f 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -10,7 +10,7 @@
     <distro>rhel</distro>
     <upgrades id="http://redhat.com/rhel/7.6"/>
 
-    <release-status>prerelease</release-status>
+    <release-date>2018-05-07</release-date>
 
     <devices>
       <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
-- 
2.21.0



From livy.ge at oracle.com  Wed May  8 10:31:08 2019
From: livy.ge at oracle.com (Liwei Ge)
Date: Wed, 8 May 2019 18:31:08 +0800
Subject: [Libosinfo] how to submit patch
Message-ID: <171eeb7b-4db6-e865-d890-5f6e61ddd814@oracle.com>

Hi, All

I want to submit a patch to add some os xml files.

If there a standard format or template to follow for reviewing ?

Or just need attach the patch file ?

-- 
Oracle <http://www.oracle.com>
Liwei Ge
Phone: +861061066490 <tel:+861061066490>

Oracle
Green Oracle <http://www.oracle.com/commitment> Oracle is committed to 
developing practices and products that help protect the environment
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190508/e090dbe1/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: oracle_sig_logo.gif
Type: image/gif
Size: 658 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190508/e090dbe1/attachment.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: green-for-email-sig_0.gif
Type: image/gif
Size: 356 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190508/e090dbe1/attachment-0001.gif>

From berrange at redhat.com  Wed May  8 10:47:49 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 8 May 2019 11:47:49 +0100
Subject: [Libosinfo] how to submit patch
In-Reply-To: <171eeb7b-4db6-e865-d890-5f6e61ddd814@oracle.com>
References: <171eeb7b-4db6-e865-d890-5f6e61ddd814@oracle.com>
Message-ID: <20190508104749.GG32552@redhat.com>

On Wed, May 08, 2019 at 06:31:08PM +0800, Liwei Ge wrote:
> Hi, All
> 
> I want to submit a patch to add some os xml files.
> 
> If there a standard format or template to follow for reviewing ?
> 
> Or just need attach the patch file ?

Either send patches to this mailing list, or send a pull request
to gitlab at your choice.

If sending patches via email, then we strongly recommend using
git-publish or git send-email as they get the formatting right.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



From fabiano at fidencio.org  Wed May  8 10:54:05 2019
From: fabiano at fidencio.org (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Wed, 8 May 2019 12:54:05 +0200
Subject: [Libosinfo] how to submit patch
In-Reply-To: <20190508104749.GG32552@redhat.com>
References: <171eeb7b-4db6-e865-d890-5f6e61ddd814@oracle.com>
	<20190508104749.GG32552@redhat.com>
Message-ID: <CAK9pz9JS-4a6AU2H4RP0xpzv3haoZYKN97BZ+qmJeAz8S5SAgQ@mail.gmail.com>

On Wed, May 8, 2019 at 12:47 PM Daniel P. Berrang? <berrange at redhat.com> wrote:
>
> On Wed, May 08, 2019 at 06:31:08PM +0800, Liwei Ge wrote:
> > Hi, All
> >
> > I want to submit a patch to add some os xml files.
> >
> > If there a standard format or template to follow for reviewing ?
> >
> > Or just need attach the patch file ?
>
> Either send patches to this mailing list, or send a pull request
> to gitlab at your choice.

And if you decide to use gitlab, you don't have to have developer
access to libosinfo projects (although, after several successful
contributions we're more than happy to accept new developers :-)).

Just fork the project, clone the fork, do your work on your branch and
open a merge request against the official repository.

We strongly recommend adding test data to the ISOs you're adding
(isoinfo -d -i /path/to/the/iso iso.txt, and put it into
osinfo-db/tests/isodata/...) and also running `make check` in order to
be sure your changes are not breaking anything.

Here's a good example of a patch submission that you can follow:
https://www.redhat.com/archives/libosinfo/2019-April/msg00211.html

>
> If sending patches via email, then we strongly recommend using
> git-publish or git send-email as they get the formatting right.
>
> Regards,
> Daniel
> --
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


Best Regards,
-- 
Fabiano Fid?ncio



From fabiano at fidencio.org  Wed May  8 10:55:20 2019
From: fabiano at fidencio.org (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Wed, 8 May 2019 12:55:20 +0200
Subject: [Libosinfo] [PATCH] rhel-8: Update releasedate
In-Reply-To: <20190507174922.18339-1-feborges@redhat.com>
References: <20190507174922.18339-1-feborges@redhat.com>
Message-ID: <CAK9pz9JWMnPV4eKUo__O5V+fXKPZCDXEenyaV_AGp4++mwzjMQ@mail.gmail.com>

On Tue, May 7, 2019 at 7:49 PM Felipe Borges <felipe10borges at gmail.com> wrote:
>
> RHEL 8.0 has been released today, 2019-05-07.
>
> https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/8.0_release_notes/index
>
> Signed-off-by: Felipe Borges <feborges at redhat.com>
> ---
>  data/os/redhat.com/rhel-8.0.xml.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
> index fe9f489..48fd927 100644
> --- a/data/os/redhat.com/rhel-8.0.xml.in
> +++ b/data/os/redhat.com/rhel-8.0.xml.in
> @@ -10,7 +10,7 @@
>      <distro>rhel</distro>
>      <upgrades id="http://redhat.com/rhel/7.6"/>
>
> -    <release-status>prerelease</release-status>
> +    <release-status>2018-05-07</release-status>
>
>      <devices>
>        <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>
-- 
Fabiano Fid?ncio



From crobinso at redhat.com  Wed May  8 13:46:30 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 8 May 2019 09:46:30 -0400
Subject: [Libosinfo] [osinfo-db-tools PATCH 1/1] Update NEWS for 1.5.0
 release
In-Reply-To: <20190506102701.31158-2-fidencio@redhat.com>
References: <20190506102701.31158-1-fidencio@redhat.com>
	<20190506102701.31158-2-fidencio@redhat.com>
Message-ID: <e510ba08-7f65-5737-442a-8b8613e9d22e@redhat.com>

On 5/6/19 6:27 AM, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  NEWS | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/NEWS b/NEWS
> index 4beb1a4..1a4add3 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -1,3 +1,12 @@
> +1.5.0
> +=====
> +
> +- Refreshed translations from Zanata

I don't think this needs to be in a NEWS file, it should be a standard
part of a release

> +- Add a test suit covering all the tools

* suite

Reviewed-by: Cole Robinson <crobinso at redhat.com>

> +- Improve usage of --root by not requiring its argument to end with '/'
> +- Fix memory leak on osinfo-db-validate
> +- Fix wording of osinfo-db-export --help
> +
>  1.4.0
>  =====
>  
>



From crobinso at redhat.com  Wed May  8 13:56:59 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 8 May 2019 09:56:59 -0400
Subject: [Libosinfo] [libosinfo PATCH 1/1] Update NEWS for 1.5.0 release
In-Reply-To: <20190506100756.6003-2-fidencio@redhat.com>
References: <20190506100756.6003-1-fidencio@redhat.com>
	<20190506100756.6003-2-fidencio@redhat.com>
Message-ID: <9c6fd427-877e-9acd-5e59-4ac94cae847c@redhat.com>

On 5/6/19 6:07 AM, Fabiano Fid?ncio wrote:
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  NEWS | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
> 
> diff --git a/NEWS b/NEWS
> index 003b697..85211f6 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -1,6 +1,31 @@
>                 libosinfo News
>  	       ==============
>  

There's a hard tab here. I suggest you remove it while you are here

> +1.5.0 - May 06, 2019
> +====================

Other entries have a newline here

Generally I try to use NEWS to advertise user visible or interesting
things. If it gets too into the details it's just a poor duplication of
git log IMO. Also I tend to rank them a bit and try to group them. Like
maybe put all the API addtions together and upfront. Just some ideas...

> +- Refreshed translations from Zanata

As mentioned in the other patch I don't think this ever needs to be in news.

> +- Improvements to the documentation and annotations
> +- Add API to get all short-ids from an OsinfoProduct
> +- Improve OsinfoLoader in order to fully support multiple short-ids values on
> +  an OsinfoProduct
> +- Explicitly set GVFS as a requirement in the project spec file
> +- Improve osinfo-detect tool's help wording
> +- Add API to get an OS from OsinfoTrees & OsinfoMedias
> +- Add API to set an OS to OsinfoTrees & OsinfoMedias
> +- Improve osinfo-detect tool, making it aware of OsinfoTree's OS variants
> +- Fix the loading of the architecture value of OsinfoImages
> +- Fix usage of application id on media detection
> +- Accept "all" as a valid fallback architecture for OsinfoTrees & OsinfoMedias
> +- Improve treeinfo check by check for both ".treeinfo" and "treeinfo" files
> +- Add API to get the OS variants from OsinfoTrees & OsinfoImages
> +- Add a git-publish configuration file
> +- Remove osinfo-db related tests

They were removed, but maybe say 'Moved tests to osinfo-db project'

> +- Remove emacs "Local variables" annotations
> +- Add a toplevel .dir-local.el
> +- Improvements to the project spec file

I think these 3 can be dropped

Reviewed-by: Cole Robinson <crobinso at redhat.com>



From crobinso at redhat.com  Wed May  8 13:58:51 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 8 May 2019 09:58:51 -0400
Subject: [Libosinfo] [libosinfo PATCH 0/6] A bunch of trivial fixes to
 our docs
In-Reply-To: <20190506100218.5538-1-fidencio@redhat.com>
References: <20190506100218.5538-1-fidencio@redhat.com>
Message-ID: <1e6d6b31-9f50-39e7-8612-6bbd368eaf8c@redhat.com>

On 5/6/19 6:02 AM, Fabiano Fid?ncio wrote:
> This patch series fixes a bunch of trivial fixes in our docs &
> annotations.
> 
> Fabiano Fid?ncio (6):
>   install_config: Fix _get_installation_url docs
>   media: Document OSINFO_MEDIA_ERROR_NO_DIRECTORY_RECORD_EXTENT
>   media: Use the same parameters' name for .c and .h
>   install_script: Document OsinfoInstallScriptInstallationSource
>   install_script: Use the same parameter's name in .c and .h
>   docs: Add missing docs links from main docs page
> 
>  docs/reference/Libosinfo-docs.xml | 2 ++
>  osinfo/osinfo_install_config.c    | 2 +-
>  osinfo/osinfo_install_script.h    | 9 ++++++++-
>  osinfo/osinfo_media.h             | 4 +++-
>  4 files changed, 14 insertions(+), 3 deletions(-)
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole



From crobinso at redhat.com  Wed May  8 14:01:01 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 8 May 2019 10:01:01 -0400
Subject: [Libosinfo] [libosinfo PATCH] Revert "osinfo-detect: print os
 variants info for env format"
In-Reply-To: <20190503110146.10528-1-fidencio@redhat.com>
References: <20190503110146.10528-1-fidencio@redhat.com>
Message-ID: <e504a6f4-b458-c3f2-22c4-828f65ea3ac3@redhat.com>

On 5/3/19 7:01 AM, Fabiano Fid?ncio wrote:
> This reverts commit 44cab89243220223b0ac6312237c08a514055664, as the
> commit was mistakenly pushed.
> 
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole



From fidencio at redhat.com  Thu May  9 08:16:16 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Thu, 09 May 2019 10:16:16 +0200
Subject: [Libosinfo] ANNOUNCE: libosinfo 1.5.0 release
Message-ID: <c014b6a50b4551913d1e1deca95823bba1b4ac9a.camel@redhat.com>

I am happy to announce a new release of libosinfo, version 1.5.0:

  https://releases.pagure.org/libosinfo/libosinfo-1.5.0.tar.gz

This is signed with key 
09B9 C8FF 223E F113 AFA0  6A39 EE92 6C2B DACC 177B  (4096R)

  https://releases.pagure.org/libosinfo/libosinfo-1.5.0.tar.gz.asc

All historical releases are available from:

  http://libosinfo.org/download/

Changes in this release include:

- Add API to get an OS from OsinfoTrees & OsinfoImages
- Add API to set an OS to OsinfoTrees & OsinfoImages
- Add API to get the OS variants from OsinfoTrees & OsinfoImages
- Add API to set the installation URL to a OsinfoInstallConfig
- Add API to get all short-ids from an OsinfoProduct
- Improve OsinfoLoader in order to fully support multiple short-ids
values on an OsinfoProduct
- Improve osinfo-detect tool's help wording
- Improve osinfo-detect tool, making it aware of OsinfoTree's OS
variants
- Fix the loading of the architecture value of OsinfoImages
- Fix usage of application id on media detection
- Accept "all" as a valid fallback architecture for OsinfoTrees &
OsinfoMedias
- Improve treeinfo check by checking for both ".treeinfo" and
"treeinfo" files
- Explicitly set GVFS as a requirement in the project spec file
- Move osinfo-db related tests to osinfo-db project

Thanks to everyone who contributed to this release

Best Regards,
Fabiano Fid?ncio



From fidencio at redhat.com  Thu May  9 08:16:23 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Thu, 09 May 2019 10:16:23 +0200
Subject: [Libosinfo] ANNOUNCE: osinfo-db-tools 1.5.0 release
Message-ID: <85772db113c090fe1d4979cf57be27af5824b5a5.camel@redhat.com>

I am happy to announce a new release of osinfo-db-tools, version 1.5.0:

  https://releases.pagure.org/libosinfo/osinfo-db-tools-1.5.0.tar.gz

This is signed with key 
09B9 C8FF 223E F113 AFA0  6A39 EE92 6C2B DACC 177B  (4096R)

  
https://releases.pagure.org/libosinfo/osinfo-db-tools-1.5.0.tar.gz.asc

All historical releases are available from:

  http://libosinfo.org/download/

Changes in this release include:

- Add a test suite covering all the tools
- Improve usage of --root by not requiring its argument to end with '/'
- Fix memory leak on osinfo-db-validate
- Fix wording of osinfo-db-export --help

Thanks to everyone who contributed to this release

Best Regards,
Fabiano Fid?ncio



From crobinso at redhat.com  Thu May  9 17:42:15 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 9 May 2019 13:42:15 -0400
Subject: [Libosinfo] [libosinfo PATCH v2] os: Add kernel-url-argument API
In-Reply-To: <20190503155324.20790-1-fidencio@redhat.com>
References: <20190503155324.20790-1-fidencio@redhat.com>
Message-ID: <5b96184b-b84a-cc3d-08a5-e4b69742c5a9@redhat.com>

On 5/3/19 11:53 AM, Fabiano Fid?ncio wrote:
> Tree based installations will require a kernel-url-argument to be
> assed. Let's provide an API to the apps to get this info from OsinfoOS.
> 
> https://gitlab.com/libosinfo/osinfo-db/issues/28
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole



From crobinso at redhat.com  Thu May  9 17:42:27 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Thu, 9 May 2019 13:42:27 -0400
Subject: [Libosinfo] [osinfo-db PATCH v3 00/13] Add missing command line
 info for tree based installations
In-Reply-To: <20190503155553.21445-1-fidencio@redhat.com>
References: <20190503155553.21445-1-fidencio@redhat.com>
Message-ID: <38a48f37-25ea-497d-f4e7-a5aa44cc07ee@redhat.com>

On 5/3/19 11:55 AM, Fabiano Fid?ncio wrote:
> Tree based installations will need more info from the command line than
> what's currently provided by osinfo-db.
> 
> Let's add the needed info as part of <os/> and also to the command line
> geenerated to passed to the kernel.
> 
> The reason of the duplication is because ther entry in <os/> takes
> advantage of inheritance, making the new <kernel-url-argument/>
> attribute not present for all OSes.
> 
> With those patches, management apps can rely solely in the command line
> generated by us for doing tree based installations.
> 
> This patch has been built atop of:
> https://www.redhat.com/archives/libosinfo/2019-May/msg00013.html
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole



From athina.plaskasoviti at gmail.com  Fri May 17 11:19:35 2019
From: athina.plaskasoviti at gmail.com (Athina Plaskasoviti)
Date: Fri, 17 May 2019 14:19:35 +0300
Subject: [Libosinfo] GSoC 2019 student introduction
Message-ID: <CAC37CmeOmZ0-wpG3a8iKQGSJu9Ywz4GKKfAsDic4AnOvmtGtPQ@mail.gmail.com>

Hello,

My name is Athina Plaskasoviti. I am studying Electrical and Computer
Engineering at the National Technical University of Athens, Greece.

I am currently doing my thesis in the field of Telecommunication Systems
and Computer Networks, specifically working on testing and benchmarking
MQTT open-source broker implementation for determining a highly scalable
infrastructure for demanding enterprise IoT applications.

I got accepted for Google Summer of Code 2019, to the libvirt project,
mainly focusing on virt-install/virt-manager tool. I am going to introduce
cloud-init configuration through virt-install/virt-manager input arguments
at VM initial setup. My mentors for this project are Cole Robinson, Pavel
Hrdina and Fabiano Fid?ncio.

I wanted to be a part of this project because virt-intall/virt-manager is a
tool I am using a lot for my thesis, and I would like to become more
familiar with the concept of virtualization. It will also be really nice to
work on my coding skills, even better to do both at the same time.

My alias on IRC is *celeste*.

I am very excited to start contributing to this project and hope that I
will blend in easily with the community.

Best wishes,
Athina
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190517/e0e1b7fc/attachment.htm>

From crobinso at redhat.com  Fri May 17 19:26:44 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Fri, 17 May 2019 15:26:44 -0400
Subject: [Libosinfo] [virt-tools-list] GSoC 2019 student introduction
In-Reply-To: <CAC37CmeOmZ0-wpG3a8iKQGSJu9Ywz4GKKfAsDic4AnOvmtGtPQ@mail.gmail.com>
References: <CAC37CmeOmZ0-wpG3a8iKQGSJu9Ywz4GKKfAsDic4AnOvmtGtPQ@mail.gmail.com>
Message-ID: <efea8658-00f3-6477-7b7c-1e63e89af7b4@redhat.com>

Welcome Athina!

- Cole

On 5/17/19 7:19 AM, Athina Plaskasoviti wrote:
> Hello,
> 
> My name is Athina Plaskasoviti. I am studying Electrical and Computer
> Engineering at the National Technical University of Athens, Greece.
> 
> I am currently doing my thesis in the field of Telecommunication Systems
> and Computer Networks, specifically working on testing and benchmarking
> MQTT open-source broker implementation for determining a highly scalable
> infrastructure for demanding enterprise IoT applications.
> 
> I got accepted for Google Summer of Code 2019, to the libvirt project,
> mainly focusing on virt-install/virt-manager tool. I am going to
> introduce cloud-init configuration through virt-install/virt-manager
> input arguments at VM initial setup. My mentors for this project are
> Cole Robinson, Pavel Hrdina and Fabiano Fid?ncio.
> 
> I wanted to be a part of this project because virt-intall/virt-manager
> is a tool I am using a lot for my thesis, and I would like to become
> more familiar with the concept of virtualization. It will also be really
> nice to work on my coding skills, even better to do both at the same time.
> 
> My alias on IRC is *celeste*.
> 
> I am very excited to start contributing to this project and hope that I
> will blend in easily with the community.
> 
> Best wishes,
> Athina



From fidencio at redhat.com  Mon May 20 09:01:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 20 May 2019 11:01:12 +0200
Subject: [Libosinfo] [libosinfo PATCH] osinfo-detect: Describe the needed
	env vars in order to run as root
Message-ID: <20190520090112.6453-1-fidencio@redhat.com>

GVfs requires the session bus i order to work properly, which means
`DBUS_SESSION_BUS_ADDRESS` has to be defined in the environment.

https://gitlab.com/libosinfo/libosinfo/issues/30

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tools/osinfo-detect.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c
index c21e694..8c6538c 100644
--- a/tools/osinfo-detect.c
+++ b/tools/osinfo-detect.c
@@ -366,6 +366,12 @@ install trees (B<tree>)
 The exit status will be 0 if an operating system was detected,
 or 1 if none was found.
 
+=head1 ENVIRONMENT
+
+When running osinfo-detect as root, `DBUS_SESSION_BUS_ADDRESS` needs
+to be defined in the environment as GVfs requires the session bus in
+order to work properly.
+
 =head1 AUTHORS
 
 Zeeshan Ali (Khattak) <zeeshanak at gnome.org>, Daniel P. Berrange <berrange at redhat.com>
-- 
2.21.0



From fidencio at redhat.com  Mon May 20 09:01:50 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 20 May 2019 11:01:50 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH] import: Describe the needed env
	vars in order to run as root
Message-ID: <20190520090150.6685-1-fidencio@redhat.com>

GVfs requires the session bus i order to work properly, which means
`DBUS_SESSION_BUS_ADDRESS` has to be defined in the environment.

https://gitlab.com/libosinfo/libosinfo/issues/30

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tools/osinfo-db-import.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
index 920f71b..37da6a3 100644
--- a/tools/osinfo-db-import.c
+++ b/tools/osinfo-db-import.c
@@ -580,6 +580,12 @@ The exit status will be 0 if all files were installed
 successfully, or 1 if at least one file could not be
 installed.
 
+=head1 ENVIRONMENT
+
+When running osinfo-db-import as root, `DBUS_SESSION_BUS_ADDRESS`
+needs to be defined in the environment as GVfs requires the session
+bus in order to work properly.
+
 =head1 SEE ALSO
 
 C<osinfo-db-export(1)>, C<osinfo-db-path(1)>
-- 
2.21.0



From fidencio at redhat.com  Mon May 20 11:24:52 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 20 May 2019 13:24:52 +0200
Subject: [Libosinfo] [osinfo-db PATCH] debian9: Update images URL
Message-ID: <20190520112452.12561-1-fidencio@redhat.com>

Let's use a URL where the file names are not changing on every new
release.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
Pushed under test breakage rule
---
 data/os/debian.org/debian-9.xml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index b9a9952..859c979 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -195,19 +195,19 @@
     </tree>
 
     <image arch="x86_64" format="qcow2" cloud-init="true">
-      <url>https://cloud.debian.org/images/cloud/OpenStack/current/debian-9.9.0-openstack-amd64.qcow2</url>
+      <url>https://cloud.debian.org/images/cloud/OpenStack/current-9/debian-9-openstack-amd64.qcow2</url>
     </image>
 
     <image arch="x86_64" format="raw" cloud-init="true">
-      <url>https://cloud.debian.org/images/cloud/OpenStack/current/debian-9.9.0-openstack-amd64.raw</url>
+      <url>https://cloud.debian.org/images/cloud/OpenStack/current-9/debian-9-openstack-amd64.raw</url>
     </image>
 
     <image arch="aarch64" format="qcow2" cloud-init="true">
-      <url>https://cloud.debian.org/images/cloud/OpenStack/current/debian-9.9.0-openstack-arm64.qcow2</url>
+      <url>https://cloud.debian.org/images/cloud/OpenStack/current-9/debian-9-openstack-arm64.qcow2</url>
     </image>
 
     <image arch="aarch64" format="raw" cloud-init="true">
-      <url>https://cloud.debian.org/images/cloud/OpenStack/current/debian-9.9.0-openstack-arm64.raw</url>
+      <url>https://cloud.debian.org/images/cloud/OpenStack/current-9/debian-9-openstack-arm64.raw</url>
     </image>
 
     <installer>
-- 
2.21.0



From fidencio at redhat.com  Mon May 20 12:39:10 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 20 May 2019 14:39:10 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH 0/3] Fix coverity/clang issues
Message-ID: <20190520123913.23337-1-fidencio@redhat.com>

This series fixes 3 issues found by either coverity or clang.
The issues are:
- FORWARD_NULL, due to the possibility of calling unlink(NULL) in the
  osinfo-db-import code;
- DEADCODE, due to err being declared, instantiated but never used in the
  osinfo-db-export code;
- A memory leak of memory pointed to by "files";

Fabiano Fid?ncio (3):
  import: Don't call unlink(NULL)
  export: Remove unused variable
  validate: Don't leak "files"

 tools/osinfo-db-export.c   | 3 ---
 tools/osinfo-db-import.c   | 2 +-
 tools/osinfo-db-validate.c | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Mon May 20 12:39:11 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 20 May 2019 14:39:11 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH 1/3] import: Don't call
	unlink(NULL)
In-Reply-To: <20190520123913.23337-1-fidencio@redhat.com>
References: <20190520123913.23337-1-fidencio@redhat.com>
Message-ID: <20190520123913.23337-2-fidencio@redhat.com>

Although `man 3 unlink` doesn't mention what should be the unlink()
behaviour when NULL is passed to it, both coverity and clang complains
about that.

Error: FORWARD_NULL (CWE-476):
osinfo-db-tools-1.5.0/tools/osinfo-db-import.c:157: var_compare_op:
Comparing "*source_file" to null implies that "*source_file" might be
null.
osinfo-db-tools-1.5.0/tools/osinfo-db-import.c:181: var_deref_model:
Passing null pointer "*source_file" to "unlink", which dereferences it.
 #  179|           g_error_free(err);
 #  180|       if (ret != 0)
 #  181|->         unlink(*source_file);
 #  182|
 #  183|       return ret;

Error: CLANG_WARNING:
osinfo-db-tools-1.5.0/tools/osinfo-db-import.c:181:9: warning: Null
pointer passed as an argument to a 'nonnull' parameter
 #        unlink(*source_file);
 #        ^

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tools/osinfo-db-import.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
index 920f71b..11e68ae 100644
--- a/tools/osinfo-db-import.c
+++ b/tools/osinfo-db-import.c
@@ -177,7 +177,7 @@ osinfo_db_import_download_file(GFile *file,
         g_object_unref(out);
     if (err != NULL)
         g_error_free(err);
-    if (ret != 0)
+    if (ret != 0 && *source_file != NULL)
         unlink(*source_file);
 
     return ret;
-- 
2.21.0



From fidencio at redhat.com  Mon May 20 12:39:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 20 May 2019 14:39:12 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH 2/3] export: Remove unused
	variable
In-Reply-To: <20190520123913.23337-1-fidencio@redhat.com>
References: <20190520123913.23337-1-fidencio@redhat.com>
Message-ID: <20190520123913.23337-3-fidencio@redhat.com>

err is declared, set to NULL, but never used in
osinfo_db_export_create().

Error: DEADCODE (CWE-561):
osinfo-db-tools-1.5.0/tools/osinfo-db-export.c:410: assignment:
Assigning: "err" = "NULL".
osinfo-db-tools-1.5.0/tools/osinfo-db-export.c:448: null: At condition
"err", the value of "err" must be "NULL".
osinfo-db-tools-1.5.0/tools/osinfo-db-export.c:448: dead_error_condition:
The condition "err" cannot be true.
osinfo-db-tools-1.5.0/tools/osinfo-db-export.c:449: dead_error_line:
Execution cannot reach this statement: "g_error_free(err);".
osinfo-db-tools-1.5.0/tools/osinfo-db-export.c:449: effectively_constant:
Local variable "err" is assigned only once, to a constant value, making
it effectively constant throughout its scope. If this is not the intent,
examine the logic to see if there is a missing assigment that would make
"err" not remain constant.
 #  447|       archive_write_free(arc);
 #  448|       if (err)
 #  449|->         g_error_free(err);
 #  450|       return ret;
 #  451|   }

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tools/osinfo-db-export.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
index 3137e1d..eef6688 100644
--- a/tools/osinfo-db-export.c
+++ b/tools/osinfo-db-export.c
@@ -407,7 +407,6 @@ static int osinfo_db_export_create(const gchar *prefix,
     struct archive *arc;
     int ret = -1;
     int r;
-    GError *err = NULL;
 
     arc = archive_write_new();
 
@@ -445,8 +444,6 @@ static int osinfo_db_export_create(const gchar *prefix,
     ret = 0;
  cleanup:
     archive_write_free(arc);
-    if (err)
-        g_error_free(err);
     return ret;
 }
 
-- 
2.21.0



From fidencio at redhat.com  Mon May 20 12:39:13 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 20 May 2019 14:39:13 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH 3/3] validate: Don't leak "files"
In-Reply-To: <20190520123913.23337-1-fidencio@redhat.com>
References: <20190520123913.23337-1-fidencio@redhat.com>
Message-ID: <20190520123913.23337-4-fidencio@redhat.com>

Error: CLANG_WARNING:
osinfo-db-tools-1.5.0/tools/osinfo-db-validate.c:319:9: warning:
Potential leak of memory pointed to by 'files'
 #        g_printerr("%s\n", error->message);
 #        ^

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tools/osinfo-db-validate.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
index 0e28e1c..7fd87d2 100644
--- a/tools/osinfo-db-validate.c
+++ b/tools/osinfo-db-validate.c
@@ -327,6 +327,7 @@ gint main(gint argc, gchar **argv)
         g_object_unref(schema);
     if (dir)
         g_object_unref(dir);
+    g_free(files);
     g_clear_error(&error);
     g_option_context_free(context);
 
-- 
2.21.0



From ptoscano at redhat.com  Tue May 21 11:26:31 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 13:26:31 +0200
Subject: [Libosinfo] [PATCH 0/3] Misc OpenBSD fixes
Message-ID: <20190521112634.19366-1-ptoscano@redhat.com>

*** LOOK, A BLURB HERE! ***

Pino Toscano (3):
  openbsd: add missing <derives-from>
  openbsd: fill missing <eol-date>
  openbsd: fix <release-date> of 4.3

 data/os/openbsd.org/openbsd-4.3.xml.in | 2 +-
 data/os/openbsd.org/openbsd-5.1.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.2.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.3.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.4.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.5.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.6.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.7.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.8.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.9.xml.in | 2 ++
 data/os/openbsd.org/openbsd-6.0.xml.in | 2 ++
 data/os/openbsd.org/openbsd-6.1.xml.in | 2 ++
 data/os/openbsd.org/openbsd-6.2.xml.in | 2 ++
 data/os/openbsd.org/openbsd-6.3.xml.in | 2 ++
 data/os/openbsd.org/openbsd-6.4.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.5.xml.in | 1 +
 16 files changed, 21 insertions(+), 1 deletion(-)

-- 
2.21.0



From ptoscano at redhat.com  Tue May 21 11:26:32 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 13:26:32 +0200
Subject: [Libosinfo] [PATCH 1/3] openbsd: add missing <derives-from>
In-Reply-To: <20190521112634.19366-1-ptoscano@redhat.com>
References: <20190521112634.19366-1-ptoscano@redhat.com>
Message-ID: <20190521112634.19366-2-ptoscano@redhat.com>

Each OpenBSD release derives from the previous one, not just upgrades
it.  This makes sure that devices supported in old versions are used
also in newer releases.
---
 data/os/openbsd.org/openbsd-5.9.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.0.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.1.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.2.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.3.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.4.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.5.xml.in | 1 +
 7 files changed, 7 insertions(+)

diff --git a/data/os/openbsd.org/openbsd-5.9.xml.in b/data/os/openbsd.org/openbsd-5.9.xml.in
index aad3f93..3b1de6d 100644
--- a/data/os/openbsd.org/openbsd-5.9.xml.in
+++ b/data/os/openbsd.org/openbsd-5.9.xml.in
@@ -9,6 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/5.8'/>
+    <derives-from id='http://openbsd.org/openbsd/5.8'/>
 
     <release-date>2016-03-29</release-date>
 
diff --git a/data/os/openbsd.org/openbsd-6.0.xml.in b/data/os/openbsd.org/openbsd-6.0.xml.in
index dc4f399..a233a1d 100644
--- a/data/os/openbsd.org/openbsd-6.0.xml.in
+++ b/data/os/openbsd.org/openbsd-6.0.xml.in
@@ -9,6 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/5.9'/>
+    <derives-from id='http://openbsd.org/openbsd/5.9'/>
 
     <release-date>2016-09-01</release-date>
 
diff --git a/data/os/openbsd.org/openbsd-6.1.xml.in b/data/os/openbsd.org/openbsd-6.1.xml.in
index 42fca4d..f2efa27 100644
--- a/data/os/openbsd.org/openbsd-6.1.xml.in
+++ b/data/os/openbsd.org/openbsd-6.1.xml.in
@@ -9,6 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/6.0'/>
+    <derives-from id='http://openbsd.org/openbsd/6.0'/>
 
     <release-date>2017-04-11</release-date>
 
diff --git a/data/os/openbsd.org/openbsd-6.2.xml.in b/data/os/openbsd.org/openbsd-6.2.xml.in
index 7f517d8..b40792d 100644
--- a/data/os/openbsd.org/openbsd-6.2.xml.in
+++ b/data/os/openbsd.org/openbsd-6.2.xml.in
@@ -9,6 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/6.1'/>
+    <derives-from id='http://openbsd.org/openbsd/6.1'/>
 
     <release-date>2017-10-09</release-date>
 
diff --git a/data/os/openbsd.org/openbsd-6.3.xml.in b/data/os/openbsd.org/openbsd-6.3.xml.in
index 21ea01a..ccf0a37 100644
--- a/data/os/openbsd.org/openbsd-6.3.xml.in
+++ b/data/os/openbsd.org/openbsd-6.3.xml.in
@@ -9,6 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/6.2'/>
+    <derives-from id='http://openbsd.org/openbsd/6.3'/>
 
     <release-date>2018-04-02</release-date>
 
diff --git a/data/os/openbsd.org/openbsd-6.4.xml.in b/data/os/openbsd.org/openbsd-6.4.xml.in
index f2a216c..abf186f 100644
--- a/data/os/openbsd.org/openbsd-6.4.xml.in
+++ b/data/os/openbsd.org/openbsd-6.4.xml.in
@@ -9,6 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/6.3'/>
+    <derives-from id='http://openbsd.org/openbsd/6.3'/>
 
     <release-date>2018-10-18</release-date>
 
diff --git a/data/os/openbsd.org/openbsd-6.5.xml.in b/data/os/openbsd.org/openbsd-6.5.xml.in
index 7a9ee54..60face8 100644
--- a/data/os/openbsd.org/openbsd-6.5.xml.in
+++ b/data/os/openbsd.org/openbsd-6.5.xml.in
@@ -9,6 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/6.4'/>
+    <derives-from id='http://openbsd.org/openbsd/6.4'/>
 
     <release-date>2019-05-01</release-date>
     <eol-date>2020-05-01</eol-date>
-- 
2.21.0



From ptoscano at redhat.com  Tue May 21 11:26:33 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 13:26:33 +0200
Subject: [Libosinfo] [PATCH 2/3] openbsd: fill missing <eol-date>
In-Reply-To: <20190521112634.19366-1-ptoscano@redhat.com>
References: <20190521112634.19366-1-ptoscano@redhat.com>
Message-ID: <20190521112634.19366-3-ptoscano@redhat.com>

The OpenBSD project supports only the latest, and the previous releases,
so version N is EOL when N+2 is released.

http://www.openbsd.org/faq/faq5.html#Flavors
---
 data/os/openbsd.org/openbsd-5.1.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.2.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.3.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.4.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.5.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.6.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.7.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.8.xml.in | 1 +
 data/os/openbsd.org/openbsd-5.9.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.0.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.1.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.2.xml.in | 1 +
 data/os/openbsd.org/openbsd-6.3.xml.in | 1 +
 13 files changed, 13 insertions(+)

diff --git a/data/os/openbsd.org/openbsd-5.1.xml.in b/data/os/openbsd.org/openbsd-5.1.xml.in
index cb650d4..c5fa5c4 100644
--- a/data/os/openbsd.org/openbsd-5.1.xml.in
+++ b/data/os/openbsd.org/openbsd-5.1.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.0'/>
 
     <release-date>2012-05-01</release-date>
+    <eol-date>2013-05-01</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.2.xml.in b/data/os/openbsd.org/openbsd-5.2.xml.in
index 12549db..815c503 100644
--- a/data/os/openbsd.org/openbsd-5.2.xml.in
+++ b/data/os/openbsd.org/openbsd-5.2.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.1'/>
 
     <release-date>2012-11-01</release-date>
+    <eol-date>2013-11-01</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.3.xml.in b/data/os/openbsd.org/openbsd-5.3.xml.in
index de43d57..7f66407 100644
--- a/data/os/openbsd.org/openbsd-5.3.xml.in
+++ b/data/os/openbsd.org/openbsd-5.3.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.2'/>
 
     <release-date>2013-05-01</release-date>
+    <eol-date>2014-05-01</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.4.xml.in b/data/os/openbsd.org/openbsd-5.4.xml.in
index fc08332..2a02044 100644
--- a/data/os/openbsd.org/openbsd-5.4.xml.in
+++ b/data/os/openbsd.org/openbsd-5.4.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.3'/>
 
     <release-date>2013-11-01</release-date>
+    <eol-date>2014-11-01</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.5.xml.in b/data/os/openbsd.org/openbsd-5.5.xml.in
index 47c2a5a..cf77688 100644
--- a/data/os/openbsd.org/openbsd-5.5.xml.in
+++ b/data/os/openbsd.org/openbsd-5.5.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.4'/>
 
     <release-date>2014-05-01</release-date>
+    <eol-date>2015-05-01</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.6.xml.in b/data/os/openbsd.org/openbsd-5.6.xml.in
index 39efb88..0c2780e 100644
--- a/data/os/openbsd.org/openbsd-5.6.xml.in
+++ b/data/os/openbsd.org/openbsd-5.6.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.5'/>
 
     <release-date>2014-11-01</release-date>
+    <eol-date>2015-10-18</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.7.xml.in b/data/os/openbsd.org/openbsd-5.7.xml.in
index 187e3e9..c2cf3e5 100644
--- a/data/os/openbsd.org/openbsd-5.7.xml.in
+++ b/data/os/openbsd.org/openbsd-5.7.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.6'/>
 
     <release-date>2015-05-01</release-date>
+    <eol-date>2016-03-29</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.8.xml.in b/data/os/openbsd.org/openbsd-5.8.xml.in
index 21c3643..e5522dd 100644
--- a/data/os/openbsd.org/openbsd-5.8.xml.in
+++ b/data/os/openbsd.org/openbsd-5.8.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.7'/>
 
     <release-date>2015-10-18</release-date>
+    <eol-date>2016-09-01</eol-date>
 
     <media arch="i686">
       <iso>
diff --git a/data/os/openbsd.org/openbsd-5.9.xml.in b/data/os/openbsd.org/openbsd-5.9.xml.in
index 3b1de6d..96534c4 100644
--- a/data/os/openbsd.org/openbsd-5.9.xml.in
+++ b/data/os/openbsd.org/openbsd-5.9.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.8'/>
 
     <release-date>2016-03-29</release-date>
+    <eol-date>2017-04-11</eol-date>
 
     <media arch="i686">
       <url>https://ftp.eu.openbsd.org/pub/OpenBSD/5.9/i386/install59.iso</url>
diff --git a/data/os/openbsd.org/openbsd-6.0.xml.in b/data/os/openbsd.org/openbsd-6.0.xml.in
index a233a1d..282f4ed 100644
--- a/data/os/openbsd.org/openbsd-6.0.xml.in
+++ b/data/os/openbsd.org/openbsd-6.0.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/5.9'/>
 
     <release-date>2016-09-01</release-date>
+    <eol-date>2013-10-09</eol-date>
 
     <media arch="i686">
       <url>https://ftp.eu.openbsd.org/pub/OpenBSD/6.0/i386/install60.iso</url>
diff --git a/data/os/openbsd.org/openbsd-6.1.xml.in b/data/os/openbsd.org/openbsd-6.1.xml.in
index f2efa27..7620e40 100644
--- a/data/os/openbsd.org/openbsd-6.1.xml.in
+++ b/data/os/openbsd.org/openbsd-6.1.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/6.0'/>
 
     <release-date>2017-04-11</release-date>
+    <eol-date>2018-05-01</eol-date>
 
     <media arch="i686">
       <url>https://ftp.eu.openbsd.org/pub/OpenBSD/6.1/i386/install61.iso</url>
diff --git a/data/os/openbsd.org/openbsd-6.2.xml.in b/data/os/openbsd.org/openbsd-6.2.xml.in
index b40792d..f57dc7c 100644
--- a/data/os/openbsd.org/openbsd-6.2.xml.in
+++ b/data/os/openbsd.org/openbsd-6.2.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/6.1'/>
 
     <release-date>2017-10-09</release-date>
+    <eol-date>2018-10-18</eol-date>
 
     <media arch="i686">
       <url>https://ftp.eu.openbsd.org/pub/OpenBSD/6.2/i386/install62.iso</url>
diff --git a/data/os/openbsd.org/openbsd-6.3.xml.in b/data/os/openbsd.org/openbsd-6.3.xml.in
index ccf0a37..e52b1b9 100644
--- a/data/os/openbsd.org/openbsd-6.3.xml.in
+++ b/data/os/openbsd.org/openbsd-6.3.xml.in
@@ -12,6 +12,7 @@
     <derives-from id='http://openbsd.org/openbsd/6.3'/>
 
     <release-date>2018-04-02</release-date>
+    <eol-date>2019-05-03</eol-date>
 
     <media arch="i686">
       <url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.3/i386/install63.iso</url>
-- 
2.21.0



From ptoscano at redhat.com  Tue May 21 11:26:34 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 13:26:34 +0200
Subject: [Libosinfo] [PATCH 3/3] openbsd: fix <release-date> of 4.3
In-Reply-To: <20190521112634.19366-1-ptoscano@redhat.com>
References: <20190521112634.19366-1-ptoscano@redhat.com>
Message-ID: <20190521112634.19366-4-ptoscano@redhat.com>

https://www.openbsd.org/43.html
---
 data/os/openbsd.org/openbsd-4.3.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/openbsd.org/openbsd-4.3.xml.in b/data/os/openbsd.org/openbsd-4.3.xml.in
index a971d09..40533fd 100644
--- a/data/os/openbsd.org/openbsd-4.3.xml.in
+++ b/data/os/openbsd.org/openbsd-4.3.xml.in
@@ -11,7 +11,7 @@
     <upgrades id='http://openbsd.org/openbsd/4.2'/>
     <derives-from id='http://openbsd.org/openbsd/4.2'/>
 
-    <release-date>2008-04-01</release-date>
+    <release-date>2008-05-01</release-date>
     <eol-date>2009-05-01</eol-date>
 
     <media arch="i686">
-- 
2.21.0



From fidencio at redhat.com  Tue May 21 11:35:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 21 May 2019 13:35:12 +0200
Subject: [Libosinfo] [libosinfo PATCH 0/3] Fix issues found by coverity/clang
Message-ID: <20190521113515.17971-1-fidencio@redhat.com>

This series fixes 2 issues found by either coverity or clang. Together
with the second fix, there's also a patch cleaning the code up a little
bit.

Fabiano Fid?ncio (3):
  db: Avoid dereference of null pointer
  tree: Avoid use of memory after it's freed
  tree: Cleanup _create_from_location_async_helper()

 osinfo/osinfo_db.c   | 10 ++++++----
 osinfo/osinfo_tree.c | 32 ++++++++++----------------------
 2 files changed, 16 insertions(+), 26 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Tue May 21 11:35:13 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 21 May 2019 13:35:13 +0200
Subject: [Libosinfo] [libosinfo PATCH 1/3] db: Avoid dereference of null
	pointer
In-Reply-To: <20190521113515.17971-1-fidencio@redhat.com>
References: <20190521113515.17971-1-fidencio@redhat.com>
Message-ID: <20190521113515.17971-2-fidencio@redhat.com>

As any consumer of libosinfo API may pass NULL as the @matched argument
of compare_tree(), the current code could be dereferencing a NULL
pointer when calling `osinfo_tree_set_os()`.

In order to avoid doing so, let's set the os to the OsinfoTree at the
moment the @matched argument is set.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_db.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index b7da2b7..c4cd1e4 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -790,6 +790,7 @@ static gboolean compare_tree(OsinfoTree *tree,
         OsinfoTreeList *tree_list = osinfo_os_get_tree_list(os);
         GList *trees = osinfo_list_get_elements(OSINFO_LIST(tree_list));
         GList *tree_iter;
+        gboolean found = FALSE;
 
         for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) {
             OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data);
@@ -820,8 +821,11 @@ static gboolean compare_tree(OsinfoTree *tree,
                 match_regex(os_treeinfo_version, treeinfo_version) &&
                 match_regex(os_treeinfo_arch, treeinfo_arch)) {
                 *ret_os = os;
-                if (matched != NULL)
+                if (matched != NULL) {
                     *matched = os_tree;
+                    osinfo_tree_set_os(*matched, *ret_os);
+                    found = TRUE;
+                }
                 break;
             }
         }
@@ -829,10 +833,8 @@ static gboolean compare_tree(OsinfoTree *tree,
         g_list_free(trees);
         g_object_unref(tree_list);
 
-        if (*ret_os != NULL) {
-            osinfo_tree_set_os(*matched, *ret_os);
+        if (found)
             return TRUE;
-        }
     }
 
     return FALSE;
-- 
2.21.0



From fidencio at redhat.com  Tue May 21 11:35:14 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 21 May 2019 13:35:14 +0200
Subject: [Libosinfo] [libosinfo PATCH 2/3] tree: Avoid use of memory after
	it's freed
In-Reply-To: <20190521113515.17971-1-fidencio@redhat.com>
References: <20190521113515.17971-1-fidencio@redhat.com>
Message-ID: <20190521113515.17971-3-fidencio@redhat.com>

We've been passing data->location as the @url argument of
osinfo_tree_create_from_location_async_helper(), freeing it and trying
to g_strdup() it as the new content of data->location.

In order to avoid doing so, let's set the data->location only once, in
the first caller of osinfo_tree_create_from_location_async_helper(), as
its content is always going to be the same doesn't matter the treeinfo
format to be used with.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_tree.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index 88a2d6e..ab498f0 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -702,9 +702,6 @@ osinfo_tree_create_from_location_async_helper(const gchar *url,
     g_clear_object(&data->file);
     data->file = g_file_new_for_uri(location);
 
-    g_free(data->location);
-    data->location = g_strdup(url);
-
     g_free(data->treeinfo);
     data->treeinfo = g_strdup(treeinfo);
 
@@ -740,6 +737,8 @@ void osinfo_tree_create_from_location_async(const gchar *location,
                            user_data);
     g_task_set_priority(data->res, priority);
 
+    data->location = g_strdup(location);
+
     osinfo_tree_create_from_location_async_helper(location,
                                                   ".treeinfo",
                                                   cancellable,
-- 
2.21.0



From fidencio at redhat.com  Tue May 21 11:35:15 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Tue, 21 May 2019 13:35:15 +0200
Subject: [Libosinfo] [libosinfo PATCH 3/3] tree: Cleanup
	_create_from_location_async_helper()
In-Reply-To: <20190521113515.17971-1-fidencio@redhat.com>
References: <20190521113515.17971-1-fidencio@redhat.com>
Message-ID: <20190521113515.17971-4-fidencio@redhat.com>

There's no need to pass neither the URL nor the cancellable to this
function as those can be taken directly from data.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 osinfo/osinfo_tree.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index ab498f0..0f14276 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -631,10 +631,8 @@ static OsinfoTree *load_keyinfo(const gchar *location,
 }
 
 static void
-osinfo_tree_create_from_location_async_helper(const gchar *url,
-                                              const gchar *treeinfo,
-                                              GCancellable *cancellable,
-                                              CreateFromLocationAsyncData *data);
+osinfo_tree_create_from_location_async_helper(CreateFromLocationAsyncData *data,
+                                              const gchar *treeinfo);
 
 static void on_location_read(GObject *source,
                              GAsyncResult *res,
@@ -657,10 +655,7 @@ static void on_location_read(GObject *source,
         /* It means no ".treeinfo" file has been found. Try again, this time
          * looking for a "treeinfo" file. */
         if (g_str_equal(data->treeinfo, ".treeinfo")) {
-            osinfo_tree_create_from_location_async_helper(data->location,
-                                                          "treeinfo",
-                                                          g_task_get_cancellable(data->res),
-                                                          data);
+            osinfo_tree_create_from_location_async_helper(data, "treeinfo");
             return;
         }
 
@@ -687,17 +682,14 @@ static void on_location_read(GObject *source,
 }
 
 static void
-osinfo_tree_create_from_location_async_helper(const gchar *url,
-                                              const gchar *treeinfo,
-                                              GCancellable *cancellable,
-                                              CreateFromLocationAsyncData *data)
+osinfo_tree_create_from_location_async_helper(CreateFromLocationAsyncData *data,
+                                              const gchar *treeinfo)
 {
     gchar *location;
 
-    g_return_if_fail(url != NULL);
     g_return_if_fail(treeinfo != NULL);
 
-    location = g_strdup_printf("%s/%s", url, treeinfo);
+    location = g_strdup_printf("%s/%s", data->location, treeinfo);
 
     g_clear_object(&data->file);
     data->file = g_file_new_for_uri(location);
@@ -706,7 +698,7 @@ osinfo_tree_create_from_location_async_helper(const gchar *url,
     data->treeinfo = g_strdup(treeinfo);
 
     g_file_load_contents_async(data->file,
-                               cancellable,
+                               g_task_get_cancellable(data->res),
                                on_location_read,
                                data);
     g_free(location);
@@ -739,10 +731,7 @@ void osinfo_tree_create_from_location_async(const gchar *location,
 
     data->location = g_strdup(location);
 
-    osinfo_tree_create_from_location_async_helper(location,
-                                                  ".treeinfo",
-                                                  cancellable,
-                                                  data);
+    osinfo_tree_create_from_location_async_helper(data, ".treeinfo");
 }
 
 
-- 
2.21.0



From fidencio at redhat.com  Tue May 21 11:43:50 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 21 May 2019 13:43:50 +0200
Subject: [Libosinfo] [PATCH 0/3] Misc OpenBSD fixes
In-Reply-To: <20190521112634.19366-1-ptoscano@redhat.com>
References: <20190521112634.19366-1-ptoscano@redhat.com>
Message-ID: <c42ffe69665429bd3cd79ebe60db61de1de580ba.camel@redhat.com>

On Tue, 2019-05-21 at 13:26 +0200, Pino Toscano wrote:
> *** LOOK, A BLURB HERE! ***
> 
> Pino Toscano (3):
>   openbsd: add missing <derives-from>
>   openbsd: fill missing <eol-date>
>   openbsd: fix <release-date> of 4.3

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>
I'll push those in a few, thanks for the contribution!

Best Regards,
-- 
Fabiano Fid?ncio



From ptoscano at redhat.com  Tue May 21 11:56:47 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 13:56:47 +0200
Subject: [Libosinfo] [PATCH 2/3] openbsd: fill missing <eol-date>
In-Reply-To: <20190521112634.19366-3-ptoscano@redhat.com>
References: <20190521112634.19366-1-ptoscano@redhat.com>
	<20190521112634.19366-3-ptoscano@redhat.com>
Message-ID: <3214972.Q81ZNG2jrK@lindworm.usersys.redhat.com>

On Tuesday, May 21, 2019 1:26:33 PM CEST Pino Toscano wrote:
> diff --git a/data/os/openbsd.org/openbsd-6.0.xml.in b/data/os/openbsd.org/openbsd-6.0.xml.in
> index a233a1d..282f4ed 100644
> --- a/data/os/openbsd.org/openbsd-6.0.xml.in
> +++ b/data/os/openbsd.org/openbsd-6.0.xml.in
> @@ -12,6 +12,7 @@
>      <derives-from id='http://openbsd.org/openbsd/5.9'/>
>  
>      <release-date>2016-09-01</release-date>
> +    <eol-date>2013-10-09</eol-date>

Consider this as:
    <eol-date>2017-10-09</eol-date>

(already fixed before pushing)

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190521/a9f66004/attachment.sig>

From ptoscano at redhat.com  Tue May 21 12:01:37 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 14:01:37 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Add simple tests for the dates
Message-ID: <20190521120139.21846-1-ptoscano@redhat.com>

Make sure that the release, and EOL dates are actually valid, and
logically sane.

Pino Toscano (2):
  tests: get the release/EOL dates
  tests: add a new test for dates

 tests/osinfo.py     |  8 ++++++++
 tests/test_dates.py | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 tests/test_dates.py

-- 
2.21.0



From ptoscano at redhat.com  Tue May 21 12:01:38 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 14:01:38 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] tests: get the release/EOL dates
In-Reply-To: <20190521120139.21846-1-ptoscano@redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
Message-ID: <20190521120139.21846-2-ptoscano@redhat.com>

---
 tests/osinfo.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/osinfo.py b/tests/osinfo.py
index 3585f44..20c1866 100644
--- a/tests/osinfo.py
+++ b/tests/osinfo.py
@@ -137,6 +137,14 @@ class Os(_XMLBase):
     def get_network_install_resources(self, node):
         return self._get_resources(node, 'network-install')
 
+    @_cache_property
+    def release_date(self):
+        return self._get_text('release-date')
+
+    @_cache_property
+    def eol_date(self):
+        return self._get_text('eol-date')
+
 
 class Resources(_XMLBase):
     @_cache_property
-- 
2.21.0



From ptoscano at redhat.com  Tue May 21 12:01:39 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 14:01:39 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] tests: add a new test for dates
In-Reply-To: <20190521120139.21846-1-ptoscano@redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
Message-ID: <20190521120139.21846-3-ptoscano@redhat.com>

For each OS, check two things:
- release-date/eol-date are actually valid dates; this is needed because
  the schema just specifies the regex, and it cannot detect invalid
  dates such as "2019-05-00" or 2019-05-40"
- if both release-date/eol-date are specified, eol-date must be later
  than release-date
---
 tests/test_dates.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/test_dates.py

diff --git a/tests/test_dates.py b/tests/test_dates.py
new file mode 100644
index 0000000..60f70e6
--- /dev/null
+++ b/tests/test_dates.py
@@ -0,0 +1,22 @@
+# This work is licensed under the GNU GPLv2 or later.
+# See the COPYING file in the top-level directory.
+
+import datetime
+
+import pytest
+
+from . import util
+
+
+def _parse_date(date_string):
+    if not date_string:
+        return None
+    return datetime.date.fromisoformat(date_string)
+
+
+ at pytest.mark.parametrize('os', util.DataFiles.oses())
+def test_dates(os):
+    release_date = _parse_date(os.release_date)
+    eol_date = _parse_date(os.eol_date)
+    if release_date and eol_date:
+        assert release_date < eol_date
-- 
2.21.0



From fidencio at redhat.com  Tue May 21 12:30:18 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 21 May 2019 14:30:18 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] tests: get the release/EOL
 dates
In-Reply-To: <20190521120139.21846-2-ptoscano@redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
	<20190521120139.21846-2-ptoscano@redhat.com>
Message-ID: <ff88a286b22dff71b6758e3c04d40b014f839798.camel@redhat.com>

On Tue, 2019-05-21 at 14:01 +0200, Pino Toscano wrote:
> ---
>  tests/osinfo.py | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/tests/osinfo.py b/tests/osinfo.py
> index 3585f44..20c1866 100644
> --- a/tests/osinfo.py
> +++ b/tests/osinfo.py
> @@ -137,6 +137,14 @@ class Os(_XMLBase):
>      def get_network_install_resources(self, node):
>          return self._get_resources(node, 'network-install')
>  
> +    @_cache_property
> +    def release_date(self):
> +        return self._get_text('release-date')

Here I'd just do: `return self._get_text('release-date') or None`, as
it may help in the next patch

> +
> +    @_cache_property
> +    def eol_date(self):
> +        return self._get_text('eol-date')

Same here.

> +
>  
>  class Resources(_XMLBase):
>      @_cache_property



From fidencio at redhat.com  Tue May 21 12:30:28 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 21 May 2019 14:30:28 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] tests: add a new test for
 dates
In-Reply-To: <20190521120139.21846-3-ptoscano@redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
	<20190521120139.21846-3-ptoscano@redhat.com>
Message-ID: <0b450b402d26b2acd37f4e1d98a8756817add2f5.camel@redhat.com>

On Tue, 2019-05-21 at 14:01 +0200, Pino Toscano wrote:
> For each OS, check two things:
> - release-date/eol-date are actually valid dates; this is needed
> because
>   the schema just specifies the regex, and it cannot detect invalid
>   dates such as "2019-05-00" or 2019-05-40"
> - if both release-date/eol-date are specified, eol-date must be later
>   than release-date
> ---
>  tests/test_dates.py | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 tests/test_dates.py
> 
> diff --git a/tests/test_dates.py b/tests/test_dates.py
> new file mode 100644
> index 0000000..60f70e6
> --- /dev/null
> +++ b/tests/test_dates.py
> @@ -0,0 +1,22 @@
> +# This work is licensed under the GNU GPLv2 or later.
> +# See the COPYING file in the top-level directory.
> +
> +import datetime
> +
> +import pytest

There's no need to import pytest here.

> +
> +from . import util
> +
> +
> +def _parse_date(date_string):
> +    if not date_string:
> +        return None
> +    return datetime.date.fromisoformat(date_string)

With the change suggested in the first patch, you can just ditch this
method ...

> +
> +
> + at pytest.mark.parametrize('os', util.DataFiles.oses())

Here, I'd suggest to use `@util.os_parametrize('osxml',
filter_dates=True)` and then un util.py just add a new filter_dates that would be something like:
oses = [o for o in oses if o.release_date and o.eol_date]

This will make the test to run only against the entries that have
release and eol date, instead of running against every entry we have.

Of course, by doing this you'll have to adjust os -> osxml.


> +def test_dates(os):
> +    release_date = _parse_date(os.release_date)
> +    eol_date = _parse_date(os.eol_date)

... and just call datetime.data.fromisoformat() directly here

> +    if release_date and eol_date:
> +        assert release_date < eol_date



From fidencio at redhat.com  Tue May 21 12:36:49 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 21 May 2019 14:36:49 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] tests: get the release/EOL
 dates
In-Reply-To: <ff88a286b22dff71b6758e3c04d40b014f839798.camel@redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
	<20190521120139.21846-2-ptoscano@redhat.com>
	<ff88a286b22dff71b6758e3c04d40b014f839798.camel@redhat.com>
Message-ID: <aa6f16dd28826a7bbca7d2339ead27bdd9ba14aa.camel@redhat.com>

On Tue, 2019-05-21 at 14:30 +0200, Fabiano Fid?ncio wrote:
> On Tue, 2019-05-21 at 14:01 +0200, Pino Toscano wrote:
> > ---
> >  tests/osinfo.py | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> > 
> > diff --git a/tests/osinfo.py b/tests/osinfo.py
> > index 3585f44..20c1866 100644
> > --- a/tests/osinfo.py
> > +++ b/tests/osinfo.py
> > @@ -137,6 +137,14 @@ class Os(_XMLBase):
> >      def get_network_install_resources(self, node):
> >          return self._get_resources(node, 'network-install')
> >  
> > +    @_cache_property
> > +    def release_date(self):
> > +        return self._get_text('release-date')
> 
> Here I'd just do: `return self._get_text('release-date') or None`, as
> it may help in the next patch
> 
> > +
> > +    @_cache_property
> > +    def eol_date(self):
> > +        return self._get_text('eol-date')
> 
> Same here.
> 
> > +
> >  
> >  class Resources(_XMLBase):
> >      @_cache_property

Nevermind about those. _get_text() already returns None in case the
attribute is not found.

So, for this one, Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>



From fidencio at redhat.com  Tue May 21 12:39:37 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 21 May 2019 14:39:37 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] tests: add a new test for
 dates
In-Reply-To: <0b450b402d26b2acd37f4e1d98a8756817add2f5.camel@redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
	<20190521120139.21846-3-ptoscano@redhat.com>
	<0b450b402d26b2acd37f4e1d98a8756817add2f5.camel@redhat.com>
Message-ID: <bb56948f9e39a4b0a920341aa9e9f24096dd5367.camel@redhat.com>

On Tue, 2019-05-21 at 14:30 +0200, Fabiano Fid?ncio wrote:
> On Tue, 2019-05-21 at 14:01 +0200, Pino Toscano wrote:
> > For each OS, check two things:
> > - release-date/eol-date are actually valid dates; this is needed
> > because
> >   the schema just specifies the regex, and it cannot detect invalid
> >   dates such as "2019-05-00" or 2019-05-40"
> > - if both release-date/eol-date are specified, eol-date must be
> > later
> >   than release-date
> > ---
> >  tests/test_dates.py | 22 ++++++++++++++++++++++
> >  1 file changed, 22 insertions(+)
> >  create mode 100644 tests/test_dates.py
> > 
> > diff --git a/tests/test_dates.py b/tests/test_dates.py
> > new file mode 100644
> > index 0000000..60f70e6
> > --- /dev/null
> > +++ b/tests/test_dates.py
> > @@ -0,0 +1,22 @@
> > +# This work is licensed under the GNU GPLv2 or later.
> > +# See the COPYING file in the top-level directory.
> > +
> > +import datetime
> > +
> > +import pytest
> 
> There's no need to import pytest here.
> 
> > +
> > +from . import util
> > +
> > +
> > +def _parse_date(date_string):
> > +    if not date_string:
> > +        return None
> > +    return datetime.date.fromisoformat(date_string)
> 
> With the change suggested in the first patch, you can just ditch this
> method ...

You actually can't. Sorry. :-)
 
> 
> > +
> > +^
> > + at pytest.mark.parametrize('os', util.DataFiles.oses())
> 
> Here, I'd suggest to use `@util.os_parametrize('osxml',
> filter_dates=True)` and then un util.py just add a new filter_dates
> that would be something like:
> oses = [o for o in oses if o.release_date and o.eol_date]

The check to be done should be "or" as your original test was catching
single entries as well (as in just with release-date or just with eol-
date).

> 
> This will make the test to run only against the entries that have
> release and eol date, instead of running against every entry we have.
> 
> Of course, by doing this you'll have to adjust os -> osxml.

This comment still aplies.

> 
> 
> > +def test_dates(os):
> > +    release_date = _parse_date(os.release_date)
> > +    eol_date = _parse_date(os.eol_date)
> 
> ... and just call datetime.data.fromisoformat() directly here

This, doesn't. Sorry. :-)

> 
> > +    if release_date and eol_date:
> > +        assert release_date < eol_date


So, in the end, my suggestion is to add to this patches something like:
```
fidencio at laerte ~/src/upstream/osinfo-db $ git diff
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 60f70e6..aa8db17 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -3,8 +3,6 @@
 
 import datetime
 
-import pytest
-
 from . import util
 
 
@@ -14,9 +12,9 @@ def _parse_date(date_string):
     return datetime.date.fromisoformat(date_string)
 
 
- at pytest.mark.parametrize('os', util.DataFiles.oses())
-def test_dates(os):
-    release_date = _parse_date(os.release_date)
-    eol_date = _parse_date(os.eol_date)
+ at util.os_parametrize('osxml', filter_dates=True)
+def test_dates(osxml):
+    release_date = _parse_date(osxml.release_date)
+    eol_date = _parse_date(osxml.eol_date)
     if release_date and eol_date:
         assert release_date < eol_date
diff --git a/tests/util.py b/tests/util.py
index 19728a4..b5dcd8b 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -84,6 +84,8 @@ class _Files():
             oses = [o for o in oses if o.devices]
         if filter_resources:
             oses = [o for o in oses if o.resources_list]
+        if filter_dates:
+            oses = [o for o in oses if o.release_date or o.eol_date]
         return oses
 
     def getosxml_related(self, osxml):
```

If I get your ack on this, I can just squash the patch into yours and
push without the need of a v2.

Best Regards,
-- 
Fabiano Fid?ncio



From ptoscano at redhat.com  Tue May 21 13:34:19 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 15:34:19 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] tests: add a new test for
	dates
In-Reply-To: <bb56948f9e39a4b0a920341aa9e9f24096dd5367.camel@redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
	<0b450b402d26b2acd37f4e1d98a8756817add2f5.camel@redhat.com>
	<bb56948f9e39a4b0a920341aa9e9f24096dd5367.camel@redhat.com>
Message-ID: <2674843.cTnTWIkHnD@lindworm.usersys.redhat.com>

On Tuesday, May 21, 2019 2:39:37 PM CEST Fabiano Fid?ncio wrote:
> So, in the end, my suggestion is to add to this patches something like:
> ```
> fidencio at laerte ~/src/upstream/osinfo-db $ git diff
> diff --git a/tests/test_dates.py b/tests/test_dates.py
> index 60f70e6..aa8db17 100644
> --- a/tests/test_dates.py
> +++ b/tests/test_dates.py
> @@ -3,8 +3,6 @@
>  
>  import datetime
>  
> -import pytest
> -
>  from . import util
>  
>  
> @@ -14,9 +12,9 @@ def _parse_date(date_string):
>      return datetime.date.fromisoformat(date_string)
>  
>  
> - at pytest.mark.parametrize('os', util.DataFiles.oses())
> -def test_dates(os):
> -    release_date = _parse_date(os.release_date)
> -    eol_date = _parse_date(os.eol_date)
> + at util.os_parametrize('osxml', filter_dates=True)
> +def test_dates(osxml):
> +    release_date = _parse_date(osxml.release_date)
> +    eol_date = _parse_date(osxml.eol_date)
>      if release_date and eol_date:
>          assert release_date < eol_date
> diff --git a/tests/util.py b/tests/util.py
> index 19728a4..b5dcd8b 100644
> --- a/tests/util.py
> +++ b/tests/util.py
> @@ -84,6 +84,8 @@ class _Files():
>              oses = [o for o in oses if o.devices]
>          if filter_resources:
>              oses = [o for o in oses if o.resources_list]
> +        if filter_dates:
> +            oses = [o for o in oses if o.release_date or o.eol_date]
>          return oses
>  
>      def getosxml_related(self, osxml):
> ```
> 
> If I get your ack on this, I can just squash the patch into yours and
> push without the need of a v2.

LGTM, thanks.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190521/4091b374/attachment.sig>

From fidencio at redhat.com  Tue May 21 13:45:52 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 21 May 2019 15:45:52 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] tests: add a new test for
 dates
In-Reply-To: <2674843.cTnTWIkHnD@lindworm.usersys.redhat.com>
References: <20190521120139.21846-1-ptoscano@redhat.com>
	<0b450b402d26b2acd37f4e1d98a8756817add2f5.camel@redhat.com>
	<bb56948f9e39a4b0a920341aa9e9f24096dd5367.camel@redhat.com>
	<2674843.cTnTWIkHnD@lindworm.usersys.redhat.com>
Message-ID: <83afb4cd7453e67068ef072c8e3a6db2eee8ff3b.camel@redhat.com>

On Tue, 2019-05-21 at 15:34 +0200, Pino Toscano wrote:
> On Tuesday, May 21, 2019 2:39:37 PM CEST Fabiano Fid?ncio wrote:
> > So, in the end, my suggestion is to add to this patches something
> > like:
> > ```
> > fidencio at laerte ~/src/upstream/osinfo-db $ git diff
> > diff --git a/tests/test_dates.py b/tests/test_dates.py
> > index 60f70e6..aa8db17 100644
> > --- a/tests/test_dates.py
> > +++ b/tests/test_dates.py
> > @@ -3,8 +3,6 @@
> >  
> >  import datetime
> >  
> > -import pytest
> > -
> >  from . import util
> >  
> >  
> > @@ -14,9 +12,9 @@ def _parse_date(date_string):
> >      return datetime.date.fromisoformat(date_string)
> >  
> >  
> > - at pytest.mark.parametrize('os', util.DataFiles.oses())
> > -def test_dates(os):
> > -    release_date = _parse_date(os.release_date)
> > -    eol_date = _parse_date(os.eol_date)
> > + at util.os_parametrize('osxml', filter_dates=True)
> > +def test_dates(osxml):
> > +    release_date = _parse_date(osxml.release_date)
> > +    eol_date = _parse_date(osxml.eol_date)
> >      if release_date and eol_date:
> >          assert release_date < eol_date
> > diff --git a/tests/util.py b/tests/util.py
> > index 19728a4..b5dcd8b 100644
> > --- a/tests/util.py
> > +++ b/tests/util.py
> > @@ -84,6 +84,8 @@ class _Files():
> >              oses = [o for o in oses if o.devices]
> >          if filter_resources:
> >              oses = [o for o in oses if o.resources_list]
> > +        if filter_dates:
> > +            oses = [o for o in oses if o.release_date or
> > o.eol_date]
> >          return oses
> >  
> >      def getosxml_related(self, osxml):
> > ```
> > 
> > If I get your ack on this, I can just squash the patch into yours
> > and
> > push without the need of a v2.
> 
> LGTM, thanks.

Pushed, thanks! :-)

> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



From ptoscano at redhat.com  Tue May 21 15:21:09 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Tue, 21 May 2019 17:21:09 +0200
Subject: [Libosinfo] [osinfo-db PATCH] tests: test_dates: work without
	datetime.date.fromisoformat()
Message-ID: <20190521152109.4024-1-ptoscano@redhat.com>

datetime.date.fromisoformat() was introduced in Python 3.7, so provide
an alternative implementation for it with older Python versions.

Fixes commit 5da3b8fdd836a55a58365718e93d0372fcc2bf0b.
---
 tests/test_dates.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/test_dates.py b/tests/test_dates.py
index aa8db17..49df613 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -2,14 +2,26 @@
 # See the COPYING file in the top-level directory.
 
 import datetime
+import re
+import sys
 
 from . import util
 
 
+if sys.version_info >= (3, 7):
+    def _parse_iso_date(date_string):
+        return datetime.date.fromisoformat(date_string)
+else:
+    def _parse_iso_date(date_string):
+        m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
+        assert m
+        return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))
+
+
 def _parse_date(date_string):
     if not date_string:
         return None
-    return datetime.date.fromisoformat(date_string)
+    return _parse_iso_date(date_string)
 
 
 @util.os_parametrize('osxml', filter_dates=True)
-- 
2.21.0



From fidencio at redhat.com  Tue May 21 15:39:52 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Tue, 21 May 2019 17:39:52 +0200
Subject: [Libosinfo] [osinfo-db PATCH] tests: test_dates: work without
 datetime.date.fromisoformat()
In-Reply-To: <20190521152109.4024-1-ptoscano@redhat.com>
References: <20190521152109.4024-1-ptoscano@redhat.com>
Message-ID: <c7cf135829876cc6d0207118dc41e948b6990076.camel@redhat.com>

On Tue, 2019-05-21 at 17:21 +0200, Pino Toscano wrote:
> datetime.date.fromisoformat() was introduced in Python 3.7, so
> provide
> an alternative implementation for it with older Python versions.
> 
> Fixes commit 5da3b8fdd836a55a58365718e93d0372fcc2bf0b.

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>



From crobinso at redhat.com  Tue May 21 19:00:55 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 21 May 2019 15:00:55 -0400
Subject: [Libosinfo] [libosinfo PATCH] osinfo-detect: Describe the
 needed env vars in order to run as root
In-Reply-To: <20190520090112.6453-1-fidencio@redhat.com>
References: <20190520090112.6453-1-fidencio@redhat.com>
Message-ID: <465b0475-684d-1c8a-9ee7-2679d5e98701@redhat.com>

On 5/20/19 5:01 AM, Fabiano Fid?ncio wrote:
> GVfs requires the session bus i order to work properly, which means
> `DBUS_SESSION_BUS_ADDRESS` has to be defined in the environment.
> 
> https://gitlab.com/libosinfo/libosinfo/issues/30
> 

Hmm that issue kinda sucks and could be a blocker for virt-install to
ever fully depend on libosinfo create_from_location for media detection,
because we want 'sudo virt-install' to just work.

> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  tools/osinfo-detect.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/tools/osinfo-detect.c b/tools/osinfo-detect.c
> index c21e694..8c6538c 100644
> --- a/tools/osinfo-detect.c
> +++ b/tools/osinfo-detect.c
> @@ -366,6 +366,12 @@ install trees (B<tree>)
>  The exit status will be 0 if an operating system was detected,
>  or 1 if none was found.
>  
> +=head1 ENVIRONMENT
> +
> +When running osinfo-detect as root, `DBUS_SESSION_BUS_ADDRESS` needs
> +to be defined in the environment as GVfs requires the session bus in
> +order to work properly.
> +
>  =head1 AUTHORS
>  
>  Zeeshan Ali (Khattak) <zeeshanak at gnome.org>, Daniel P. Berrange <berrange at redhat.com>
> 
This also looks like it affects general libosinfo API usage as well.
Maybe we append a message about DBUS_SESSION_BUS_ADDRESS to the error
that gvfs raises? IMO documenting it in the man page is going to
accomplish much

Thanks,
Cole



From crobinso at redhat.com  Tue May 21 19:03:35 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 21 May 2019 15:03:35 -0400
Subject: [Libosinfo] [osinfo-db-tools PATCH 0/3] Fix coverity/clang
	issues
In-Reply-To: <20190520123913.23337-1-fidencio@redhat.com>
References: <20190520123913.23337-1-fidencio@redhat.com>
Message-ID: <d32651c9-160a-4596-4aa8-a9200c96d606@redhat.com>

On 5/20/19 8:39 AM, Fabiano Fid?ncio wrote:
> This series fixes 3 issues found by either coverity or clang.
> The issues are:
> - FORWARD_NULL, due to the possibility of calling unlink(NULL) in the
>   osinfo-db-import code;
> - DEADCODE, due to err being declared, instantiated but never used in the
>   osinfo-db-export code;
> - A memory leak of memory pointed to by "files";
> 
> Fabiano Fid?ncio (3):
>   import: Don't call unlink(NULL)
>   export: Remove unused variable
>   validate: Don't leak "files"
> 
>  tools/osinfo-db-export.c   | 3 ---
>  tools/osinfo-db-import.c   | 2 +-
>  tools/osinfo-db-validate.c | 1 +
>  3 files changed, 2 insertions(+), 4 deletions(-)
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole



From crobinso at redhat.com  Tue May 21 19:06:23 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 21 May 2019 15:06:23 -0400
Subject: [Libosinfo] [osinfo-db PATCH] tests: test_dates: work without
 datetime.date.fromisoformat()
In-Reply-To: <20190521152109.4024-1-ptoscano@redhat.com>
References: <20190521152109.4024-1-ptoscano@redhat.com>
Message-ID: <b8055dbc-7835-7e62-0edc-c8bd193132db@redhat.com>

On 5/21/19 11:21 AM, Pino Toscano wrote:
> datetime.date.fromisoformat() was introduced in Python 3.7, so provide
> an alternative implementation for it with older Python versions.
> 
> Fixes commit 5da3b8fdd836a55a58365718e93d0372fcc2bf0b.
> ---
>  tests/test_dates.py | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/test_dates.py b/tests/test_dates.py
> index aa8db17..49df613 100644
> --- a/tests/test_dates.py
> +++ b/tests/test_dates.py
> @@ -2,14 +2,26 @@
>  # See the COPYING file in the top-level directory.
>  
>  import datetime
> +import re
> +import sys
>  
>  from . import util
>  
>  
> +if sys.version_info >= (3, 7):
> +    def _parse_iso_date(date_string):
> +        return datetime.date.fromisoformat(date_string)
> +else:
> +    def _parse_iso_date(date_string):
> +        m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
> +        assert m
> +        return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))
> +
> +

Why two implementations? Seems to me it just increases the odds that the
impls diverge over time, reintroducing version specific issues

I say just use the fallback impl

Thanks,
Cole

>  def _parse_date(date_string):
>      if not date_string:
>          return None
> -    return datetime.date.fromisoformat(date_string)
> +    return _parse_iso_date(date_string)
>  
>  
>  @util.os_parametrize('osxml', filter_dates=True)
> 


- Cole



From crobinso at redhat.com  Tue May 21 19:37:17 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Tue, 21 May 2019 15:37:17 -0400
Subject: [Libosinfo] [libosinfo PATCH 0/3] Fix issues found by
 coverity/clang
In-Reply-To: <20190521113515.17971-1-fidencio@redhat.com>
References: <20190521113515.17971-1-fidencio@redhat.com>
Message-ID: <113f1fd4-4f55-f0f7-faac-0276cf3348bf@redhat.com>

On 5/21/19 7:35 AM, Fabiano Fid?ncio wrote:
> This series fixes 2 issues found by either coverity or clang. Together
> with the second fix, there's also a patch cleaning the code up a little
> bit.
> 
> Fabiano Fid?ncio (3):
>   db: Avoid dereference of null pointer
>   tree: Avoid use of memory after it's freed
>   tree: Cleanup _create_from_location_async_helper()
> 
>  osinfo/osinfo_db.c   | 10 ++++++----
>  osinfo/osinfo_tree.c | 32 ++++++++++----------------------
>  2 files changed, 16 insertions(+), 26 deletions(-)
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>	

- Cole



From sresthasrivastava.ss at gmail.com  Wed May 22 05:15:46 2019
From: sresthasrivastava.ss at gmail.com (Srestha Srivastava)
Date: Wed, 22 May 2019 11:45:46 +0630
Subject: [Libosinfo] Introduction
Message-ID: <CAGENWB-kfC7p52uM4WE+cNBRcF-1DLs09Ff7F13H_bYcwt57sw@mail.gmail.com>

Hello everybody, I am Srestha, a Google Summer of Code 2019 intern and this
summer I'll be working on "Improving GNOME Boxes express-installations by
adding support to tree-based installations"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190522/55ff6d67/attachment.htm>

From fidencio at redhat.com  Wed May 22 09:00:04 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Wed, 22 May 2019 11:00:04 +0200
Subject: [Libosinfo] Handling `http://` calls with sudo/su
Message-ID: <CAAY6Xscn=2xUwdBEAVbm-M+mWyoF3Y1gRbsHruTtQtOMkJT4Tw@mail.gmail.com>

People,

https://gitlab.com/libosinfo/libosinfo/issues/30 brought up an
interesting fact that I wasn't aware of and may have some negative
impact on libosinfo consumers.

Basically, GVfs requires access to the session bus (which, by deafult,
is private and does not accept connections of any other user apart
from the one that owns the bus), causing any call made to
`osinfo_{tree,media}_create_from_location()` and any operation of
osinfo-db-import and osinfo-detect relying on gvfsd-http to *not* work
when called using sudo/su.

Cole already stated that it could be blocker for virt-install to every
fully depend on libosinfo as `sudo virt-install ...` should just work.

Now, what are the options we have? (No, this is not a rethorical question ...)

There are a few things that come to my mind:
- Stop relying on GVfs for anything that's not local and implement the
`http://` on our side;
- Drop the privileges when calling libosinfo APIs that are known for
relying on GVfs, as suggested by Ondrej Holy
  - This would have to be done by each app consuming libosinfo APIs,
doesn't sound like the most appealing thing to do, even if possible to
implement properly

At this point, I'm totally out of ideas on how to proceed, thus I'd be
really happy to get some suggestions.

Best Regards,
-- 
Fabiano Fid?ncio



From berrange at redhat.com  Wed May 22 09:25:05 2019
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 22 May 2019 10:25:05 +0100
Subject: [Libosinfo] Handling `http://` calls with sudo/su
In-Reply-To: <CAAY6Xscn=2xUwdBEAVbm-M+mWyoF3Y1gRbsHruTtQtOMkJT4Tw@mail.gmail.com>
References: <CAAY6Xscn=2xUwdBEAVbm-M+mWyoF3Y1gRbsHruTtQtOMkJT4Tw@mail.gmail.com>
Message-ID: <20190522092505.GC29525@redhat.com>

On Wed, May 22, 2019 at 11:00:04AM +0200, Fabiano Fid?ncio wrote:
> People,
> 
> https://gitlab.com/libosinfo/libosinfo/issues/30 brought up an
> interesting fact that I wasn't aware of and may have some negative
> impact on libosinfo consumers.
> 
> Basically, GVfs requires access to the session bus (which, by deafult,
> is private and does not accept connections of any other user apart
> from the one that owns the bus), causing any call made to
> `osinfo_{tree,media}_create_from_location()` and any operation of
> osinfo-db-import and osinfo-detect relying on gvfsd-http to *not* work
> when called using sudo/su.
> 
> Cole already stated that it could be blocker for virt-install to every
> fully depend on libosinfo as `sudo virt-install ...` should just work.
> 
> Now, what are the options we have? (No, this is not a rethorical question ...)
> 
> There are a few things that come to my mind:
> - Stop relying on GVfs for anything that's not local and implement the
> `http://` on our side;

Reluctantly that is probably the best option we have :-(

> - Drop the privileges when calling libosinfo APIs that are known for
> relying on GVfs, as suggested by Ondrej Holy
>   - This would have to be done by each app consuming libosinfo APIs,
> doesn't sound like the most appealing thing to do, even if possible to
> implement properly

I think playing this kind of game will forever be a source of hard
to diagnose bugs.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



From fidencio at redhat.com  Wed May 22 13:16:27 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 22 May 2019 15:16:27 +0200
Subject: [Libosinfo] [osinfo-db PATCH] tests,
	test_dates: Keep just one implementation of _parse_iso_date()
Message-ID: <20190522131627.23846-1-fidencio@redhat.com>

As suggested by Cole, let's keep just one implementation of
_parse_iso_date() (the most compatible one) and avoid diverging over
time.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tests/test_dates.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/test_dates.py b/tests/test_dates.py
index 49df613..aca7472 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -8,14 +8,10 @@ import sys
 from . import util
 
 
-if sys.version_info >= (3, 7):
-    def _parse_iso_date(date_string):
-        return datetime.date.fromisoformat(date_string)
-else:
-    def _parse_iso_date(date_string):
-        m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
-        assert m
-        return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))
+def _parse_iso_date(date_string):
+    m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
+    assert m
+    return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))
 
 
 def _parse_date(date_string):
-- 
2.21.0



From ptoscano at redhat.com  Wed May 22 13:22:56 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Wed, 22 May 2019 15:22:56 +0200
Subject: [Libosinfo] [osinfo-db PATCH] tests,
	test_dates: Keep just one implementation of _parse_iso_date()
In-Reply-To: <20190522131627.23846-1-fidencio@redhat.com>
References: <20190522131627.23846-1-fidencio@redhat.com>
Message-ID: <3177951.MGIlRTJ09F@lindworm.usersys.redhat.com>

On Wednesday, 22 May 2019 15:16:27 CEST Fabiano Fid?ncio wrote:
> As suggested by Cole, let's keep just one implementation of
> _parse_iso_date() (the most compatible one) and avoid diverging over
> time.
> 
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  tests/test_dates.py | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/test_dates.py b/tests/test_dates.py
> index 49df613..aca7472 100644
> --- a/tests/test_dates.py
> +++ b/tests/test_dates.py
> @@ -8,14 +8,10 @@ import sys
>  from . import util
>  
>  
> -if sys.version_info >= (3, 7):
> -    def _parse_iso_date(date_string):
> -        return datetime.date.fromisoformat(date_string)
> -else:
> -    def _parse_iso_date(date_string):
> -        m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
> -        assert m
> -        return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))
> +def _parse_iso_date(date_string):
> +    m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
> +    assert m
> +    return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))

The purposes of having the two implementation are:
- datetime.date.fromisoformat() is available in newer versions, so it
  makes sense to leverage it
- my implementation is not optimized as datetime.date.fromisoformat();
  considering this is only a test, it is "good enough"
- having the version check means it is easier to drop the old
  implementation when raising the minimum Python version required

So I'm on -1 on this.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190522/91ac5fe0/attachment.sig>

From fidencio at redhat.com  Wed May 22 13:49:54 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 22 May 2019 15:49:54 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Add RHEL 8's codename
Message-ID: <20190522134956.27422-1-fidencio@redhat.com>

rhel-8.0 entry didn't have any codename set and rhel-8-unknown has been
using rhel-7's codename.

Fabiano Fid?ncio (2):
  rhel-8.0: Add codename (Ootpa)
  rhel-8-unknown: Fix codename

 data/os/redhat.com/rhel-8-unknown.xml.in | 2 +-
 data/os/redhat.com/rhel-8.0.xml.in       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.21.0



From fidencio at redhat.com  Wed May 22 13:49:55 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 22 May 2019 15:49:55 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] rhel-8.0: Add codename (Ootpa)
In-Reply-To: <20190522134956.27422-1-fidencio@redhat.com>
References: <20190522134956.27422-1-fidencio@redhat.com>
Message-ID: <20190522134956.27422-2-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-8.0.xml.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index 2ba1ad1..157c498 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -8,6 +8,7 @@
     <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
+    <codename>Ootpa</codename>
     <upgrades id="http://redhat.com/rhel/7.6"/>
 
     <release-date>2018-05-07</release-date>
-- 
2.21.0



From fidencio at redhat.com  Wed May 22 13:49:56 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 22 May 2019 15:49:56 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] rhel-8-unknown: Fix codename
In-Reply-To: <20190522134956.27422-1-fidencio@redhat.com>
References: <20190522134956.27422-1-fidencio@redhat.com>
Message-ID: <20190522134956.27422-3-fidencio@redhat.com>

rhel-8's codename is Ootpa and not Maipo.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-8-unknown.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/redhat.com/rhel-8-unknown.xml.in b/data/os/redhat.com/rhel-8-unknown.xml.in
index 23b5bd0..d0d3231 100644
--- a/data/os/redhat.com/rhel-8-unknown.xml.in
+++ b/data/os/redhat.com/rhel-8-unknown.xml.in
@@ -8,7 +8,7 @@
     <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
-    <codename>Maipo</codename>
+    <codename>Ootpa</codename>
     <upgrades id="http://redhat.com/rhel/8.0"/>
     <derives-from id="http://redhat.com/rhel/8.0"/>
 
-- 
2.21.0



From crobinso at redhat.com  Wed May 22 14:32:25 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 22 May 2019 10:32:25 -0400
Subject: [Libosinfo] [osinfo-db PATCH] tests,
 test_dates: Keep just one implementation of _parse_iso_date()
In-Reply-To: <3177951.MGIlRTJ09F@lindworm.usersys.redhat.com>
References: <20190522131627.23846-1-fidencio@redhat.com>
	<3177951.MGIlRTJ09F@lindworm.usersys.redhat.com>
Message-ID: <fb293ef1-7df5-7d00-f26b-6498196d79b6@redhat.com>

On 5/22/19 9:22 AM, Pino Toscano wrote:
> On Wednesday, 22 May 2019 15:16:27 CEST Fabiano Fid?ncio wrote:
>> As suggested by Cole, let's keep just one implementation of
>> _parse_iso_date() (the most compatible one) and avoid diverging over
>> time.
>>
>> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
>> ---
>>  tests/test_dates.py | 12 ++++--------
>>  1 file changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/tests/test_dates.py b/tests/test_dates.py
>> index 49df613..aca7472 100644
>> --- a/tests/test_dates.py
>> +++ b/tests/test_dates.py
>> @@ -8,14 +8,10 @@ import sys
>>  from . import util
>>  
>>  
>> -if sys.version_info >= (3, 7):
>> -    def _parse_iso_date(date_string):
>> -        return datetime.date.fromisoformat(date_string)
>> -else:
>> -    def _parse_iso_date(date_string):
>> -        m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
>> -        assert m
>> -        return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))
>> +def _parse_iso_date(date_string):
>> +    m = re.match("([0-9]{4})-([0-9]{2})-([0-9]{2})", date_string)
>> +    assert m
>> +    return datetime.date(int(m.group(1)), int(m.group(2)), int(m.group(3)))
> 
> The purposes of having the two implementation are:
> - datetime.date.fromisoformat() is available in newer versions, so it
>   makes sense to leverage it

What are the concrete benefits we receive from using the library call,
when we still need to maintain the old code path? All the code reuse
benefits are pretty much thrown out if we need to maintain the old code path

> - my implementation is not optimized as datetime.date.fromisoformat();
>   considering this is only a test, it is "good enough"
> - having the version check means it is easier to drop the old
>   implementation when raising the minimum Python version required
> 

Considering we will want to be compatible with running tests on RHEL8
which has python3.6 by default, we are talking a long time before we can
depend on python3.7+. In the intervening years, if a dev wants or needs
to change this code, we would need to test against two python versions
which is a pain, or push it off to CI to catch. It adds complexity for
hypothetical benefits. Doesn't seem worth it IMO.

But if you don't find that convincing, I won't argue it further :)

Thanks,
Cole



From crobinso at redhat.com  Wed May 22 14:35:35 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 22 May 2019 10:35:35 -0400
Subject: [Libosinfo] Handling `http://` calls with sudo/su
In-Reply-To: <20190522092505.GC29525@redhat.com>
References: <CAAY6Xscn=2xUwdBEAVbm-M+mWyoF3Y1gRbsHruTtQtOMkJT4Tw@mail.gmail.com>
	<20190522092505.GC29525@redhat.com>
Message-ID: <ba016cd5-f7c2-a62f-19ca-d7a4667cbcb0@redhat.com>

On 5/22/19 5:25 AM, Daniel P. Berrang? wrote:
> On Wed, May 22, 2019 at 11:00:04AM +0200, Fabiano Fid?ncio wrote:
>> People,
>>
>> https://gitlab.com/libosinfo/libosinfo/issues/30 brought up an
>> interesting fact that I wasn't aware of and may have some negative
>> impact on libosinfo consumers.
>>
>> Basically, GVfs requires access to the session bus (which, by deafult,
>> is private and does not accept connections of any other user apart
>> from the one that owns the bus), causing any call made to
>> `osinfo_{tree,media}_create_from_location()` and any operation of
>> osinfo-db-import and osinfo-detect relying on gvfsd-http to *not* work
>> when called using sudo/su.
>>
>> Cole already stated that it could be blocker for virt-install to every
>> fully depend on libosinfo as `sudo virt-install ...` should just work.
>>
>> Now, what are the options we have? (No, this is not a rethorical question ...)
>>
>> There are a few things that come to my mind:
>> - Stop relying on GVfs for anything that's not local and implement the
>> `http://` on our side;
> 
> Reluctantly that is probably the best option we have :-(
> 

Yeah it's too bad but I think it's the way to go. Thankfully our needs
for fetching http/ftp content should be pretty simple, .treeinfo files
are small

- Cole



From crobinso at redhat.com  Wed May 22 14:36:23 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 22 May 2019 10:36:23 -0400
Subject: [Libosinfo] Introduction
In-Reply-To: <CAGENWB-kfC7p52uM4WE+cNBRcF-1DLs09Ff7F13H_bYcwt57sw@mail.gmail.com>
References: <CAGENWB-kfC7p52uM4WE+cNBRcF-1DLs09Ff7F13H_bYcwt57sw@mail.gmail.com>
Message-ID: <967cedf2-c9f9-1132-f642-a102beab667b@redhat.com>

On 5/22/19 1:15 AM, Srestha Srivastava wrote:
> Hello everybody, I am Srestha, a Google Summer of Code 2019 intern and
> this summer I'll be working on "Improving GNOME Boxes
> express-installations by adding support to tree-based installations"
> 

Welcome Srestha!

- Cole



From crobinso at redhat.com  Wed May 22 14:47:34 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 22 May 2019 10:47:34 -0400
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Add RHEL 8's codename
In-Reply-To: <20190522134956.27422-1-fidencio@redhat.com>
References: <20190522134956.27422-1-fidencio@redhat.com>
Message-ID: <7b3f052d-6395-6f0a-9814-ac7c44ba550c@redhat.com>

On 5/22/19 9:49 AM, Fabiano Fid?ncio wrote:
> rhel-8.0 entry didn't have any codename set and rhel-8-unknown has been
> using rhel-7's codename.
> 
> Fabiano Fid?ncio (2):
>   rhel-8.0: Add codename (Ootpa)
>   rhel-8-unknown: Fix codename
> 
>  data/os/redhat.com/rhel-8-unknown.xml.in | 2 +-
>  data/os/redhat.com/rhel-8.0.xml.in       | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole



From fidencio at redhat.com  Wed May 22 16:10:22 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 22 May 2019 18:10:22 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH v2 0/1] Fix yet another coverity
	issue
Message-ID: <20190522161023.6662-1-fidencio@redhat.com>

This is another case of FORWARD_NULL, due to the possibility of calling
unlink(NULL) in another piece of osinfo-db-import code;

Fabiano Fid?ncio (1):
  import: Don't call unlink(NULL) in _import_extract()

 tools/osinfo-db-import.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.21.0



From fidencio at redhat.com  Wed May 22 16:10:23 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 22 May 2019 18:10:23 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH v2 1/1] import: Don't call
	unlink(NULL) in _import_extract()
In-Reply-To: <20190522161023.6662-1-fidencio@redhat.com>
References: <20190522161023.6662-1-fidencio@redhat.com>
Message-ID: <20190522161023.6662-2-fidencio@redhat.com>

Similarly to the issue fixed by ae52b0fbc, here we're also potentially
passing NULL to unlink().

Error: FORWARD_NULL (CWE-476):
osinfo-db-tools-1.5.0/tools/osinfo-db-import.c:332: var_compare_op: Comparing "source_file" to null implies that "source_file" might be null.
osinfo-db-tools-1.5.0/tools/osinfo-db-import.c:374: var_deref_model: Passing null pointer "source_file" to "unlink", which dereferences it.
 #  372|           g_object_unref(file);
 #  373|       if (!file_is_native)
 #  374|->         unlink(source_file);
 #  375|       g_free(source_file);
 #  376|       return ret;

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tools/osinfo-db-import.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
index 11e68ae..675961d 100644
--- a/tools/osinfo-db-import.c
+++ b/tools/osinfo-db-import.c
@@ -370,7 +370,7 @@ static int osinfo_db_import_extract(GFile *target,
     archive_read_free(arc);
     if (file)
         g_object_unref(file);
-    if (!file_is_native)
+    if (!file_is_native && source_file != NULL)
         unlink(source_file);
     g_free(source_file);
     return ret;
-- 
2.21.0



From crobinso at redhat.com  Wed May 22 19:29:37 2019
From: crobinso at redhat.com (Cole Robinson)
Date: Wed, 22 May 2019 15:29:37 -0400
Subject: [Libosinfo] [osinfo-db-tools PATCH v2 1/1] import: Don't call
 unlink(NULL) in _import_extract()
In-Reply-To: <20190522161023.6662-2-fidencio@redhat.com>
References: <20190522161023.6662-1-fidencio@redhat.com>
	<20190522161023.6662-2-fidencio@redhat.com>
Message-ID: <fc486d2f-eef9-f42e-a27d-b340198bcda4@redhat.com>

On 5/22/19 12:10 PM, Fabiano Fid?ncio wrote:
> Similarly to the issue fixed by ae52b0fbc, here we're also potentially
> passing NULL to unlink().
> 
> Error: FORWARD_NULL (CWE-476):
> osinfo-db-tools-1.5.0/tools/osinfo-db-import.c:332: var_compare_op: Comparing "source_file" to null implies that "source_file" might be null.
> osinfo-db-tools-1.5.0/tools/osinfo-db-import.c:374: var_deref_model: Passing null pointer "source_file" to "unlink", which dereferences it.
>  #  372|           g_object_unref(file);
>  #  373|       if (!file_is_native)
>  #  374|->         unlink(source_file);
>  #  375|       g_free(source_file);
>  #  376|       return ret;
> 
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  tools/osinfo-db-import.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
> index 11e68ae..675961d 100644
> --- a/tools/osinfo-db-import.c
> +++ b/tools/osinfo-db-import.c
> @@ -370,7 +370,7 @@ static int osinfo_db_import_extract(GFile *target,
>      archive_read_free(arc);
>      if (file)
>          g_object_unref(file);
> -    if (!file_is_native)
> +    if (!file_is_native && source_file != NULL)
>          unlink(source_file);
>      g_free(source_file);
>      return ret;
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole



From carnold at suse.com  Wed May 22 20:15:05 2019
From: carnold at suse.com (Charles Arnold)
Date: Wed, 22 May 2019 14:15:05 -0600
Subject: [Libosinfo] [PATCH osinfo-db 2/2] Add SLED version 12.4 to the
	database
In-Reply-To: <20190522201505.22465-1-carnold@suse.com>
References: <20190522201505.22465-1-carnold@suse.com>
Message-ID: <20190522201505.22465-3-carnold@suse.com>

---
 data/os/suse.com/sled-12.4.xml.in | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 data/os/suse.com/sled-12.4.xml.in

diff --git a/data/os/suse.com/sled-12.4.xml.in b/data/os/suse.com/sled-12.4.xml.in
new file mode 100644
index 0000000..317edd3
--- /dev/null
+++ b/data/os/suse.com/sled-12.4.xml.in
@@ -0,0 +1,38 @@
+<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/sled/12.4">
+    <short-id>sled12sp4</short-id>
+    <_name>SUSE Linux Enterprise Desktop 12 SP4</_name>
+    <version>12.4</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/12.3"/>
+    <derives-from id="http://suse.com/sled/12.3"/>
+
+    <release-date>2018-12-12</release-date>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLE-12-SP4-Desktop-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/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.12.3



From carnold at suse.com  Wed May 22 20:15:03 2019
From: carnold at suse.com (Charles Arnold)
Date: Wed, 22 May 2019 14:15:03 -0600
Subject: [Libosinfo] [PATCH osinfo-db 0/2] Add suse linux enterprise version
	12.4 to the database
Message-ID: <20190522201505.22465-1-carnold@suse.com>

Add description files for SLES and SLED version 12.4

Charles Arnold (2):
  Add SLES version 12.4 to the database
  Add SLED version 12.4 to the database

 data/os/suse.com/sled-12.4.xml.in | 38 +++++++++++++++++++++++
 data/os/suse.com/sles-12.4.xml.in | 65 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 data/os/suse.com/sled-12.4.xml.in
 create mode 100644 data/os/suse.com/sles-12.4.xml.in

-- 
2.12.3



From carnold at suse.com  Wed May 22 20:15:04 2019
From: carnold at suse.com (Charles Arnold)
Date: Wed, 22 May 2019 14:15:04 -0600
Subject: [Libosinfo] [PATCH osinfo-db 1/2] Add SLES version 12.4 to the
	database
In-Reply-To: <20190522201505.22465-1-carnold@suse.com>
References: <20190522201505.22465-1-carnold@suse.com>
Message-ID: <20190522201505.22465-2-carnold@suse.com>

---
 data/os/suse.com/sles-12.4.xml.in | 65 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 data/os/suse.com/sles-12.4.xml.in

diff --git a/data/os/suse.com/sles-12.4.xml.in b/data/os/suse.com/sles-12.4.xml.in
new file mode 100644
index 0000000..d038cf4
--- /dev/null
+++ b/data/os/suse.com/sles-12.4.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/sles/12.4">
+    <short-id>sles12sp4</short-id>
+    <_name>SUSE Linux Enterprise Server 12 SP4</_name>
+    <version>12.4</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/12.3"/>
+    <derives-from id="http://suse.com/sles/12.3"/>
+
+    <release-date>2018-12-12</release-date>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLE-12-SP4-Server-DVD-x86_64</volume-id>
+      </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-12-SP4-Server-DVD-aarch64</volume-id>
+      </iso>
+      <kernel>boot/aarch64/linux</kernel>
+      <initrd>boot/aarch64/initrd</initrd>
+    </media>
+
+    <media arch="ppc64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLE-12-SP4-Server-DVD-ppc64le</volume-id>
+      </iso>
+      <kernel>boot/ppc64le/linux</kernel>
+      <initrd>boot/ppc64le/initrd</initrd>
+    </media>
+
+    <media arch="s390x">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLE-12-SP4-Server-DVD-s390x</volume-id>
+      </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.12.3



From fidencio at redhat.com  Fri May 24 09:01:32 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 24 May 2019 11:01:32 +0200
Subject: [Libosinfo] [PATCH osinfo-db 0/2] Add suse linux enterprise
 version 12.4 to the database
In-Reply-To: <20190522201505.22465-1-carnold@suse.com>
References: <20190522201505.22465-1-carnold@suse.com>
Message-ID: <CAAY6Xse_RjEk1h3+bZCkgZrwgHy+=8Mdh04dSpsioTNHT=HnnQ@mail.gmail.com>

Charles,

On Wed, May 22, 2019 at 10:15 PM Charles Arnold <carnold at suse.com> wrote:
>
> Add description files for SLES and SLED version 12.4
>
> Charles Arnold (2):
>   Add SLES version 12.4 to the database
>   Add SLED version 12.4 to the database

Patches are good and I'm going to push them.
Before pushing the patches, tho, I'll also propose an update to the
unknown entries.

Last but not least, would be really nice to have the test files
(`isoinfo -d -i iso`) added to our osinfo-db tests.

So, consider those two patches Reviewed-by: Fabiano Fid?ncio
<fidencio at redhat.com> and those will be pushed together with the
update of the unknown entries (when they get a review).

Best Regards & Thanks for the contributions!
-- 
Fabiano Fid?ncio



From fidencio at redhat.com  Fri May 24 09:05:57 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 24 May 2019 11:05:57 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Update sles/sled unknown entries
Message-ID: <20190524090559.6133-1-fidencio@redhat.com>

After the addition of sles/sled 12.4, let's update the unknown entries'
regular expression to match 12.5+.

*: https://www.redhat.com/archives/libosinfo/2019-May/msg00148.html

Fabiano Fid?ncio (2):
  sled-12-unknown: Update regex after 12.4 addition
  sles-12-unknown: Update regex after 12.4 addition

 data/os/suse.com/sled-12-unknown.xml.in | 2 +-
 data/os/suse.com/sles-12-unknown.xml.in | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Fri May 24 09:05:58 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 24 May 2019 11:05:58 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] sled-12-unknown: Update regex
	after 12.4 addition
In-Reply-To: <20190524090559.6133-1-fidencio@redhat.com>
References: <20190524090559.6133-1-fidencio@redhat.com>
Message-ID: <20190524090559.6133-2-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/suse.com/sled-12-unknown.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/suse.com/sled-12-unknown.xml.in b/data/os/suse.com/sled-12-unknown.xml.in
index d3fb3bc..9df7b18 100644
--- a/data/os/suse.com/sled-12-unknown.xml.in
+++ b/data/os/suse.com/sled-12-unknown.xml.in
@@ -14,7 +14,7 @@
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>SLE-12-SP[4-9]-Desktop-DVD-x86_64</volume-id>
+        <volume-id>SLE-12-SP[5-9]-Desktop-DVD-x86_64</volume-id>
       </iso>
       <kernel>boot/x86_64/loader/linux</kernel>
       <initrd>boot/x86_64/loader/initrd</initrd>
-- 
2.21.0



From fidencio at redhat.com  Fri May 24 09:05:59 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 24 May 2019 11:05:59 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] sles-12-unknown: Update regex
	after 12.4 addition
In-Reply-To: <20190524090559.6133-1-fidencio@redhat.com>
References: <20190524090559.6133-1-fidencio@redhat.com>
Message-ID: <20190524090559.6133-3-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/suse.com/sles-12-unknown.xml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/os/suse.com/sles-12-unknown.xml.in b/data/os/suse.com/sles-12-unknown.xml.in
index 0b69493..fe4b181 100644
--- a/data/os/suse.com/sles-12-unknown.xml.in
+++ b/data/os/suse.com/sles-12-unknown.xml.in
@@ -14,7 +14,7 @@
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>SLE-12-SP[4-9]-Server-DVD-x86_64</volume-id>
+        <volume-id>SLE-12-SP[5-9]-Server-DVD-x86_64</volume-id>
       </iso>
       <kernel>boot/x86_64/loader/linux</kernel>
       <initrd>boot/x86_64/loader/initrd</initrd>
@@ -23,7 +23,7 @@
     <media arch="aarch64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>SLE-12-SP[4-9]-Server-DVD-aarch64</volume-id>
+        <volume-id>SLE-12-SP[5-9]-Server-DVD-aarch64</volume-id>
       </iso>
       <kernel>boot/aarch64/linux</kernel>
       <initrd>boot/aarch64/initrd</initrd>
@@ -32,7 +32,7 @@
     <media arch="ppc64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>SLE-12-SP[4-9]-Server-DVD-ppc64le</volume-id>
+        <volume-id>SLE-12-SP[5-9]-Server-DVD-ppc64le</volume-id>
       </iso>
       <kernel>boot/ppc64le/linux</kernel>
       <initrd>boot/ppc64le/initrd</initrd>
@@ -41,7 +41,7 @@
     <media arch="s390x">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>SLE-12-SP[4-9]-Server-DVD-s390x</volume-id>
+        <volume-id>SLE-12-SP[5-9]-Server-DVD-s390x</volume-id>
       </iso>
       <kernel>boot/s390x/linux</kernel>
       <initrd>boot/s390x/initrd</initrd>
-- 
2.21.0



From carnold at suse.com  Fri May 24 16:16:25 2019
From: carnold at suse.com (Charles Arnold)
Date: Fri, 24 May 2019 10:16:25 -0600
Subject: [Libosinfo] [PATCH osinfo-db 0/2] Add SLE12-SP4 isodata
Message-ID: <20190524161627.9163-1-carnold@suse.com>

Add for both SLES and SLED

Charles Arnold (2):
  Add SLES12-SP4 isodata
  Add SLED12-SP4 isodata

 ...-12-SP4-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 ...-12-SP4-Server-DVD-aarch64-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 ...-12-SP4-Server-DVD-ppc64le-GM-DVD1.iso.txt | 16 ++++++++++
 ...LE-12-SP4-Server-DVD-s390x-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 ...E-12-SP4-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 5 files changed, 132 insertions(+)
 create mode 100644 tests/isodata/sled/sled12sp4/SLE-12-SP4-Desktop-DVD-x86_64-GM-DVD1.iso.txt
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-aarch64-GM-DVD1.iso.txt
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-ppc64le-GM-DVD1.iso.txt
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-s390x-GM-DVD1.iso.txt
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-x86_64-GM-DVD1.iso.txt

-- 
2.21.0



From carnold at suse.com  Fri May 24 16:16:26 2019
From: carnold at suse.com (Charles Arnold)
Date: Fri, 24 May 2019 10:16:26 -0600
Subject: [Libosinfo] [PATCH osinfo-db 1/2] Add SLES12-SP4 isodata
In-Reply-To: <20190524161627.9163-1-carnold@suse.com>
References: <20190524161627.9163-1-carnold@suse.com>
Message-ID: <20190524161627.9163-2-carnold@suse.com>

---
 ...-12-SP4-Server-DVD-aarch64-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 ...-12-SP4-Server-DVD-ppc64le-GM-DVD1.iso.txt | 16 ++++++++++
 ...LE-12-SP4-Server-DVD-s390x-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 ...E-12-SP4-Server-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 4 files changed, 103 insertions(+)
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-aarch64-GM-DVD1.iso.txt
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-ppc64le-GM-DVD1.iso.txt
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-s390x-GM-DVD1.iso.txt
 create mode 100644 tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-x86_64-GM-DVD1.iso.txt

diff --git a/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-aarch64-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-aarch64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..251defb
--- /dev/null
+++ b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-aarch64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP4-Server-DVD-aarch64045
+Volume set id: 
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP4-Server-DVD-aarch64-Build0456-Media1
+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: 1824027
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'SUSE LINUX GmbH'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect CCC
+        Bootoff 1033C 66364
diff --git a/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-ppc64le-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-ppc64le-GM-DVD1.iso.txt
new file mode 100644
index 0000000..1c3b360
--- /dev/null
+++ b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-ppc64le-GM-DVD1.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP4-Server-DVD-ppc64le045
+Volume set id: 
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP4-Server-DVD-ppc64le-Build0456-Media1
+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: 2026710
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-s390x-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-s390x-GM-DVD1.iso.txt
new file mode 100644
index 0000000..4106095
--- /dev/null
+++ b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-s390x-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP4-Server-DVD-s390x04561
+Volume set id: 
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP4-Server-DVD-s390x-Build0456-Media1
+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: 2047145
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'SUSE LINUX GmbH'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 283 643
diff --git a/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..8658e3e
--- /dev/null
+++ b/tests/isodata/sles/sles12sp4/SLE-12-SP4-Server-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP4-Server-DVD-x86_640456
+Volume set id: 
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP4-Server-DVD-x86_64-Build0456-Media1
+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: 2105275
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'SUSE LINUX GmbH'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 1550 5456
-- 
2.21.0



From carnold at suse.com  Fri May 24 16:16:27 2019
From: carnold at suse.com (Charles Arnold)
Date: Fri, 24 May 2019 10:16:27 -0600
Subject: [Libosinfo] [PATCH osinfo-db 2/2] Add SLED12-SP4 isodata
In-Reply-To: <20190524161627.9163-1-carnold@suse.com>
References: <20190524161627.9163-1-carnold@suse.com>
Message-ID: <20190524161627.9163-3-carnold@suse.com>

---
 ...-12-SP4-Desktop-DVD-x86_64-GM-DVD1.iso.txt | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tests/isodata/sled/sled12sp4/SLE-12-SP4-Desktop-DVD-x86_64-GM-DVD1.iso.txt

diff --git a/tests/isodata/sled/sled12sp4/SLE-12-SP4-Desktop-DVD-x86_64-GM-DVD1.iso.txt b/tests/isodata/sled/sled12sp4/SLE-12-SP4-Desktop-DVD-x86_64-GM-DVD1.iso.txt
new file mode 100644
index 0000000..ee12e73
--- /dev/null
+++ b/tests/isodata/sled/sled12sp4/SLE-12-SP4-Desktop-DVD-x86_64-GM-DVD1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: SLE-12-SP4-Desktop-DVD-x86_64038
+Volume set id: 
+Publisher id: SUSE LINUX GmbH
+Data preparer id: KIWI - http://opensuse.github.com/kiwi
+Application id: SLE-12-SP4-Desktop-DVD-x86_64-Build0380-Media1
+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: 2289040
+El Torito VD version 1 found, boot catalog is in sector 20
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'SUSE LINUX GmbH'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 1574 5492
-- 
2.21.0



From carnold at suse.com  Fri May 24 16:20:44 2019
From: carnold at suse.com (Charles Arnold)
Date: Fri, 24 May 2019 10:20:44 -0600
Subject: [Libosinfo] [PATCH osinfo-db 0/2] Add suse linux enterprise
 version 12.4 to the database
In-Reply-To: <CAAY6Xse_RjEk1h3+bZCkgZrwgHy+=8Mdh04dSpsioTNHT=HnnQ@mail.gmail.com>
References: <20190522201505.22465-1-carnold@suse.com>
	<CAAY6Xse_RjEk1h3+bZCkgZrwgHy+=8Mdh04dSpsioTNHT=HnnQ@mail.gmail.com>
Message-ID: <5CE819DC020000910015158F@prv-mh.provo.novell.com>

>>> On 5/24/2019 at 03:01 AM, Fabiano Fid?ncio <fidencio at redhat.com> wrote: 
> Charles,
> 
> On Wed, May 22, 2019 at 10:15 PM Charles Arnold <carnold at suse.com> wrote:
>>
>> Add description files for SLES and SLED version 12.4
>>
>> Charles Arnold (2):
>>   Add SLES version 12.4 to the database
>>   Add SLED version 12.4 to the database
> 
> Patches are good and I'm going to push them.
> Before pushing the patches, tho, I'll also propose an update to the
> unknown entries.
> 
> Last but not least, would be really nice to have the test files
> (`isoinfo -d -i iso`) added to our osinfo-db tests.

Thanks for the reminder. I've sent those files to the mailing list.

- Charles



From fidencio at redhat.com  Mon May 27 08:13:54 2019
From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=)
Date: Mon, 27 May 2019 10:13:54 +0200
Subject: [Libosinfo] [PATCH osinfo-db 0/2] Add suse linux enterprise
 version 12.4 to the database
In-Reply-To: <20190522201505.22465-1-carnold@suse.com>
References: <20190522201505.22465-1-carnold@suse.com>
Message-ID: <443e4977dc7d0afaaa188436775712b24121b78b.camel@redhat.com>

On Wed, 2019-05-22 at 14:15 -0600, Charles Arnold wrote:
> Add description files for SLES and SLED version 12.4
> 
> Charles Arnold (2):
>   Add SLES version 12.4 to the database
>   Add SLED version 12.4 to the database
> 
>  data/os/suse.com/sled-12.4.xml.in | 38 +++++++++++++++++++++++
>  data/os/suse.com/sles-12.4.xml.in | 65
> +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 103 insertions(+)
>  create mode 100644 data/os/suse.com/sled-12.4.xml.in
>  create mode 100644 data/os/suse.com/sles-12.4.xml.in
> 

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>



From ptoscano at redhat.com  Mon May 27 08:20:41 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Mon, 27 May 2019 10:20:41 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Update sles/sled unknown
	entries
In-Reply-To: <20190524090559.6133-1-fidencio@redhat.com>
References: <20190524090559.6133-1-fidencio@redhat.com>
Message-ID: <1675316.NpI0pOxyqp@lindworm.usersys.redhat.com>

On Friday, 24 May 2019 11:05:57 CEST Fabiano Fid?ncio wrote:
> After the addition of sles/sled 12.4, let's update the unknown entries'
> regular expression to match 12.5+.
> 
> *: https://www.redhat.com/archives/libosinfo/2019-May/msg00148.html
> 
> Fabiano Fid?ncio (2):
>   sled-12-unknown: Update regex after 12.4 addition
>   sles-12-unknown: Update regex after 12.4 addition
> 
>  data/os/suse.com/sled-12-unknown.xml.in | 2 +-
>  data/os/suse.com/sles-12-unknown.xml.in | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)

The changes look OK to me, although I would hold them until sles/sled
12.4 is added, and thus updating upgrades/derives-from at the same
time.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190527/b46a9805/attachment.sig>

From ptoscano at redhat.com  Mon May 27 08:21:21 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Mon, 27 May 2019 10:21:21 +0200
Subject: [Libosinfo] [PATCH] opensuse: update openSUSE Leap 15.1 data after
	release
Message-ID: <20190527082121.13023-1-ptoscano@redhat.com>

- remove the prerelease status
- add the release date
- add the URLs of the ISOs
- switch the tree URL to https
- update the isodata test data
---
 data/os/opensuse.org/opensuse-15.1.xml.in                | 9 +++++++--
 ...dia.iso.txt => openSUSE-Leap-15.1-DVD-x86_64.iso.txt} | 8 ++++----
 ...openSUSE-Leap-15.1-GNOME-Live-x86_64-Current.iso.txt} | 4 ++--
 ...> openSUSE-Leap-15.1-KDE-Live-x86_64-Current.iso.txt} | 4 ++--
 ...dia.iso.txt => openSUSE-Leap-15.1-NET-x86_64.iso.txt} | 6 +++---
 ... openSUSE-Leap-15.1-Rescue-CD-x86_64-Current.iso.txt} | 4 ++--
 6 files changed, 20 insertions(+), 15 deletions(-)
 rename tests/isodata/opensuse/opensuse15.1/{openSUSE-Leap-15.1-DVD-x86_64-Build438.2-Media.iso.txt => openSUSE-Leap-15.1-DVD-x86_64.iso.txt} (81%)
 rename tests/isodata/opensuse/opensuse15.1/{openSUSE-Leap-15.1-GNOME-Live-x86_64-Snapshot6.7-Media.iso.txt => openSUSE-Leap-15.1-GNOME-Live-x86_64-Current.iso.txt} (93%)
 rename tests/isodata/opensuse/opensuse15.1/{openSUSE-Leap-15.1-KDE-Live-x86_64-Snapshot6.7-Media.iso.txt => openSUSE-Leap-15.1-KDE-Live-x86_64-Current.iso.txt} (93%)
 rename tests/isodata/opensuse/opensuse15.1/{openSUSE-Leap-15.1-NET-x86_64-Build438.2-Media.iso.txt => openSUSE-Leap-15.1-NET-x86_64.iso.txt} (84%)
 rename tests/isodata/opensuse/opensuse15.1/{openSUSE-Leap-15.1-Rescue-CD-x86_64-Snapshot6.7-Media.iso.txt => openSUSE-Leap-15.1-Rescue-CD-x86_64-Current.iso.txt} (93%)

diff --git a/data/os/opensuse.org/opensuse-15.1.xml.in b/data/os/opensuse.org/opensuse-15.1.xml.in
index 2e4b8a7..19016ca 100644
--- a/data/os/opensuse.org/opensuse-15.1.xml.in
+++ b/data/os/opensuse.org/opensuse-15.1.xml.in
@@ -11,7 +11,7 @@
     <upgrades id="http://opensuse.org/opensuse/15.0"/>
     <derives-from id="http://opensuse.org/opensuse/15.0"/>
 
-    <release-status>prerelease</release-status>
+    <release-date>2019-05-22</release-date>
 
     <variant id="netinst">
       <_name>openSUSE Leap 15.1</_name>
@@ -19,6 +19,7 @@
 
     <!-- DVD -->
     <media arch="x86_64">
+      <url>https://download.opensuse.org/distribution/leap/15.1/iso/openSUSE-Leap-15.1-DVD-x86_64.iso</url>
       <iso>
         <volume-id>openSUSE-Leap-15.1-DVD-x86_64*</volume-id>
         <system-id>LINUX</system-id>
@@ -31,6 +32,7 @@
     <!-- Network -->
     <media arch="x86_64">
       <variant id="netinst"/>
+      <url>https://download.opensuse.org/distribution/leap/15.1/iso/openSUSE-Leap-15.1-NET-x86_64.iso</url>
       <iso>
         <volume-id>openSUSE-Leap-15.1-NET-x86_64*</volume-id>
         <system-id>LINUX</system-id>
@@ -42,6 +44,7 @@
 
     <!-- Live GNOME -->
     <media arch="x86_64" live="true" installer-script="false">
+      <url>https://download.opensuse.org/distribution/leap/15.1/live/openSUSE-Leap-15.1-GNOME-Live-x86_64-Current.iso</url>
       <iso>
         <volume-id>openSUSE_Leap_15.1_GNOME_Live</volume-id>
         <publisher-id>SUSE LINUX GMBH</publisher-id>
@@ -52,6 +55,7 @@
 
     <!-- Live KDE -->
     <media arch="x86_64" live="true" installer-script="false">
+      <url>https://download.opensuse.org/distribution/leap/15.1/live/openSUSE-Leap-15.1-KDE-Live-x86_64-Current.iso</url>
       <iso>
         <volume-id>openSUSE_Leap_15.1_KDE_Live</volume-id>
         <publisher-id>SUSE LINUX GMBH</publisher-id>
@@ -62,6 +66,7 @@
 
     <!-- Live Rescue CD -->
     <media arch="x86_64" live="true" installer-script="false">
+      <url>https://download.opensuse.org/distribution/leap/15.1/live/openSUSE-Leap-15.1-Rescue-CD-x86_64-Current.iso</url>
       <iso>
         <volume-id>openSUSE_Leap_15.1_Rescue_CD</volume-id>
         <publisher-id>SUSE LINUX GMBH</publisher-id>
@@ -71,7 +76,7 @@
     </media>
 
     <tree arch="x86_64">
-      <url>http://download.opensuse.org/pub/opensuse/distribution/leap/15.1/repo/oss/</url>
+      <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.1/repo/oss/</url>
       <treeinfo>
         <family>openSUSE Leap</family>
         <version>15.1</version>
diff --git a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-DVD-x86_64-Build438.2-Media.iso.txt b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-DVD-x86_64.iso.txt
similarity index 81%
rename from tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-DVD-x86_64-Build438.2-Media.iso.txt
rename to tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-DVD-x86_64.iso.txt
index 9f26538..9715a95 100644
--- a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-DVD-x86_64-Build438.2-Media.iso.txt
+++ b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-DVD-x86_64.iso.txt
@@ -1,17 +1,17 @@
 CD-ROM is in ISO 9660 format
 System id: LINUX
-Volume id: openSUSE-Leap-15.1-DVD-x86_64438
+Volume id: openSUSE-Leap-15.1-DVD-x86_64470
 Volume set id: 
 Publisher id: SUSE LINUX GmbH
 Data preparer id: KIWI - http://opensuse.github.com/kiwi
-Application id: openSUSE-Leap-15.1-DVD-x86_64-Build438.2-Media
+Application id: openSUSE-Leap-15.1-DVD-x86_64-Build470.1-Media
 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: 2009268
+Volume size is: 1980737
 El Torito VD version 1 found, boot catalog is in sector 20
 Joliet with UCS level 3 found
 Rock Ridge signatures version 1 found
@@ -26,4 +26,4 @@ Eltorito validation header:
         Load segment 0
         Sys type 0
         Nsect 4
-        Bootoff 14A0 5280
+        Bootoff 14A8 5288
diff --git a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-GNOME-Live-x86_64-Snapshot6.7-Media.iso.txt b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-GNOME-Live-x86_64-Current.iso.txt
similarity index 93%
rename from tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-GNOME-Live-x86_64-Snapshot6.7-Media.iso.txt
rename to tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-GNOME-Live-x86_64-Current.iso.txt
index 44ca5f6..acf7dce 100644
--- a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-GNOME-Live-x86_64-Snapshot6.7-Media.iso.txt
+++ b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-GNOME-Live-x86_64-Current.iso.txt
@@ -4,14 +4,14 @@ Volume id: openSUSE_Leap_15.1_GNOME_Live
 Volume set id: 
 Publisher id: SUSE LINUX GMBH
 Data preparer id: KIWI - HTTP://SUSE.GITHUB.COM/KIWI
-Application id: 0X04060D7E
+Application id: 0XFAB80218
 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: 448512
+Volume size is: 460800
 El Torito VD version 1 found, boot catalog is in sector 262
 Joliet with UCS level 3 found
 Rock Ridge signatures version 1 found
diff --git a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-KDE-Live-x86_64-Snapshot6.7-Media.iso.txt b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-KDE-Live-x86_64-Current.iso.txt
similarity index 93%
rename from tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-KDE-Live-x86_64-Snapshot6.7-Media.iso.txt
rename to tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-KDE-Live-x86_64-Current.iso.txt
index a35c59f..33d2829 100644
--- a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-KDE-Live-x86_64-Snapshot6.7-Media.iso.txt
+++ b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-KDE-Live-x86_64-Current.iso.txt
@@ -4,14 +4,14 @@ Volume id: openSUSE_Leap_15.1_KDE_Live
 Volume set id: 
 Publisher id: SUSE LINUX GMBH
 Data preparer id: KIWI - HTTP://SUSE.GITHUB.COM/KIWI
-Application id: 0XE857B132
+Application id: 0X970F5E35
 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: 441856
+Volume size is: 453632
 El Torito VD version 1 found, boot catalog is in sector 262
 Joliet with UCS level 3 found
 Rock Ridge signatures version 1 found
diff --git a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-NET-x86_64-Build438.2-Media.iso.txt b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-NET-x86_64.iso.txt
similarity index 84%
rename from tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-NET-x86_64-Build438.2-Media.iso.txt
rename to tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-NET-x86_64.iso.txt
index 8e5b0c6..20f8709 100644
--- a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-NET-x86_64-Build438.2-Media.iso.txt
+++ b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-NET-x86_64.iso.txt
@@ -1,17 +1,17 @@
 CD-ROM is in ISO 9660 format
 System id: LINUX
-Volume id: openSUSE-Leap-15.1-NET-x86_64438
+Volume id: openSUSE-Leap-15.1-NET-x86_64470
 Volume set id: 
 Publisher id: SUSE LINUX GmbH
 Data preparer id: KIWI - http://opensuse.github.com/kiwi
-Application id: openSUSE-Leap-15.1-NET-x86_64-Build438.2-Media
+Application id: openSUSE-Leap-15.1-NET-x86_64-Build470.1-Media
 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: 63610
+Volume size is: 63937
 El Torito VD version 1 found, boot catalog is in sector 20
 Joliet with UCS level 3 found
 Rock Ridge signatures version 1 found
diff --git a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-Rescue-CD-x86_64-Snapshot6.7-Media.iso.txt b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-Rescue-CD-x86_64-Current.iso.txt
similarity index 93%
rename from tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-Rescue-CD-x86_64-Snapshot6.7-Media.iso.txt
rename to tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-Rescue-CD-x86_64-Current.iso.txt
index 6dfe358..7ad0ae2 100644
--- a/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-Rescue-CD-x86_64-Snapshot6.7-Media.iso.txt
+++ b/tests/isodata/opensuse/opensuse15.1/openSUSE-Leap-15.1-Rescue-CD-x86_64-Current.iso.txt
@@ -4,14 +4,14 @@ Volume id: openSUSE_Leap_15.1_Rescue_CD
 Volume set id: 
 Publisher id: SUSE LINUX GMBH
 Data preparer id: KIWI - HTTP://SUSE.GITHUB.COM/KIWI
-Application id: 0XED90FDBD
+Application id: 0X28CDECCF
 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: 316928
+Volume size is: 314368
 El Torito VD version 1 found, boot catalog is in sector 262
 Joliet with UCS level 3 found
 Rock Ridge signatures version 1 found
-- 
2.21.0



From fidencio at redhat.com  Mon May 27 08:56:09 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 27 May 2019 10:56:09 +0200
Subject: [Libosinfo] [osinfo-db PATCH] dragonflybsd-5.4.2: Remove dead links
Message-ID: <20190527085609.25272-1-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
Pushed under test breakage rule
---
 data/os/dragonflybsd.org/dragonflybsd-5.4.2.xml.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/os/dragonflybsd.org/dragonflybsd-5.4.2.xml.in b/data/os/dragonflybsd.org/dragonflybsd-5.4.2.xml.in
index 5706baa..7b08a4e 100644
--- a/data/os/dragonflybsd.org/dragonflybsd-5.4.2.xml.in
+++ b/data/os/dragonflybsd.org/dragonflybsd-5.4.2.xml.in
@@ -13,7 +13,10 @@
     <release-date>2019-04-22</release-date>
 
     <media arch="x86_64">
-      <url>http://mirror-master.dragonflybsd.org/iso-images/dfly-x86_64-5.4.2_REL.iso</url>
+      <!--
+        osinfo-db doesn't support compressed ISOs.
+      <url>http://mirror-master.dragonflybsd.org/iso-images/dfly-x86_64-5.4.2_REL.iso.bz2</url>
+        -->
       <iso>
         <system-id>DragonFly</system-id>
         <volume-id>DragonFly v5.4.2</volume-id>
-- 
2.21.0



From fidencio at redhat.com  Mon May 27 08:57:32 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Mon, 27 May 2019 10:57:32 +0200
Subject: [Libosinfo] [PATCH] opensuse: update openSUSE Leap 15.1 data
 after release
In-Reply-To: <20190527082121.13023-1-ptoscano@redhat.com>
References: <20190527082121.13023-1-ptoscano@redhat.com>
Message-ID: <CAAY6XsewzspqwSS-HqNgwbx2SbcxsBjTzZJrfzY-Sv7s4zVfTQ@mail.gmail.com>

On Mon, May 27, 2019 at 10:23 AM Pino Toscano <ptoscano at redhat.com> wrote:
>
> - remove the prerelease status
> - add the release date
> - add the URLs of the ISOs
> - switch the tree URL to https
> - update the isodata test data

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>



From fidencio at redhat.com  Mon May 27 08:58:51 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Mon, 27 May 2019 10:58:51 +0200
Subject: [Libosinfo] [osinfo-db PATCH] drangonflybsd: Add 5.4.3
Message-ID: <20190527085851.25832-1-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 .../dragonflybsd-5.4.3.xml.in                 | 23 +++++++++++++++
 .../dfly-x86_64-5.4.3_REL.iso.txt             | 29 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 data/os/dragonflybsd.org/dragonflybsd-5.4.3.xml.in
 create mode 100644 tests/isodata/dragonflybsd/dragonflybsd5.4.3/dfly-x86_64-5.4.3_REL.iso.txt

diff --git a/data/os/dragonflybsd.org/dragonflybsd-5.4.3.xml.in b/data/os/dragonflybsd.org/dragonflybsd-5.4.3.xml.in
new file mode 100644
index 0000000..645a1b1
--- /dev/null
+++ b/data/os/dragonflybsd.org/dragonflybsd-5.4.3.xml.in
@@ -0,0 +1,23 @@
+<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://dragonflybsd.org/dragonflybsd/5.4.3">
+    <short-id>dragonflybsd5.4.3</short-id>
+    <_name>DragonFlyBSD 5.4.3</_name>
+    <version>5.4.3</version>
+    <family>dragonflybsd</family>
+    <distro>dragonflybsd</distro>
+    <_vendor>DragonFlyBSD Project</_vendor>
+    <upgrades id="http://dragonflybsd.org/dragonflybsd/5.4.2"/>
+
+    <release-date>2019-05-20</release-date>
+
+    <media arch="x86_64">
+      <url>http://mirror-master.dragonflybsd.org/iso-images/dfly-x86_64-5.4.3_REL.iso</url>
+      <iso>
+        <system-id>DragonFly</system-id>
+        <volume-id>DragonFly v5.4.3</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/tests/isodata/dragonflybsd/dragonflybsd5.4.3/dfly-x86_64-5.4.3_REL.iso.txt b/tests/isodata/dragonflybsd/dragonflybsd5.4.3/dfly-x86_64-5.4.3_REL.iso.txt
new file mode 100644
index 0000000..28f9618
--- /dev/null
+++ b/tests/isodata/dragonflybsd/dragonflybsd5.4.3/dfly-x86_64-5.4.3_REL.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: DragonFly
+Volume id: DragonFly v5.4.3
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 528504
+El Torito VD version 1 found, boot catalog is in sector 6902
+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 1AF7 6903
-- 
2.21.0



From ptoscano at redhat.com  Wed May 29 07:11:42 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Wed, 29 May 2019 09:11:42 +0200
Subject: [Libosinfo] [osinfo-db PATCH] fedora: fix EOL date of Fedora 27
Message-ID: <20190529071143.2929-1-ptoscano@redhat.com>

https://lists.fedoraproject.org/archives/list/devel-announce at lists.fedoraproject.org/thread/ZSXRUH7JFXQNYP6JOAFTAUMSTLV6VMGO/
---
 data/os/fedoraproject.org/fedora-27.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in
index 1baa5fa..eb80f5e 100644
--- a/data/os/fedoraproject.org/fedora-27.xml.in
+++ b/data/os/fedoraproject.org/fedora-27.xml.in
@@ -12,7 +12,7 @@
     <derives-from id="http://fedoraproject.org/fedora/26"/>
 
     <release-date>2017-11-14</release-date>
-    <eol-date>2019-11-30</eol-date>
+    <eol-date>2018-11-30</eol-date>
 
     <variant id="workstation">
       <_name>Fedora 27 Workstation</_name>
-- 
2.21.0



From ptoscano at redhat.com  Wed May 29 07:11:43 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Wed, 29 May 2019 09:11:43 +0200
Subject: [Libosinfo] [osinfo-db PATCH] fedora: add EOL date of Fedora 28
Message-ID: <20190529071143.2929-2-ptoscano@redhat.com>

https://lists.fedoraproject.org/archives/list/devel-announce at lists.fedoraproject.org/thread/RKGVIOHNF4HYC2FXEG7VRHMG7ARXGGRA/
---
 data/os/fedoraproject.org/fedora-28.xml.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/os/fedoraproject.org/fedora-28.xml.in b/data/os/fedoraproject.org/fedora-28.xml.in
index 6e21a0d..339bb9f 100644
--- a/data/os/fedoraproject.org/fedora-28.xml.in
+++ b/data/os/fedoraproject.org/fedora-28.xml.in
@@ -12,6 +12,7 @@
     <derives-from id="http://fedoraproject.org/fedora/27"/>
 
     <release-date>2018-05-01</release-date>
+    <eol-date>2019-05-29</eol-date>
 
     <variant id="workstation">
       <_name>Fedora 28 Workstation</_name>
-- 
2.21.0



From fidencio at redhat.com  Wed May 29 07:28:12 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 29 May 2019 09:28:12 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/3] Misc fixes for rhel-7 & 8 related
	to ppc64le
Message-ID: <20190529072815.22840-1-fidencio@redhat.com>

The series cover:
- Anchoring ppc64 arch entries for treeinfo, so those do not match
  ppc64le;
- Adding ppc64le resources (same as the ones for ppc64) for rhel-7;
- Adjusting rhel-8.0 resources to use ppc64le as arch, instead of using
  ppc64 (as there are no ppc64 ISOs for rhel-8.0);

Fabiano Fid?ncio (3):
  rhel-7.[2-6]: Anchor ppc64 arch for treeinfo
  rhel-7.[2-6]: Add ppc64le resources
  rhel-8.0: Fix typo in resources' architecture name

 data/os/redhat.com/rhel-7.2.xml.in | 17 ++++++++++++++++-
 data/os/redhat.com/rhel-7.3.xml.in | 17 ++++++++++++++++-
 data/os/redhat.com/rhel-7.4.xml.in | 17 ++++++++++++++++-
 data/os/redhat.com/rhel-7.5.xml.in | 17 ++++++++++++++++-
 data/os/redhat.com/rhel-7.6.xml.in | 17 ++++++++++++++++-
 data/os/redhat.com/rhel-8.0.xml.in |  2 +-
 6 files changed, 81 insertions(+), 6 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Wed May 29 07:28:13 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 29 May 2019 09:28:13 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/3] rhel-7.[2-6]: Anchor ppc64 arch
	for treeinfo
In-Reply-To: <20190529072815.22840-1-fidencio@redhat.com>
References: <20190529072815.22840-1-fidencio@redhat.com>
Message-ID: <20190529072815.22840-2-fidencio@redhat.com>

Otherwise ppc64 could also match ppc64le.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-7.2.xml.in | 2 +-
 data/os/redhat.com/rhel-7.3.xml.in | 2 +-
 data/os/redhat.com/rhel-7.4.xml.in | 2 +-
 data/os/redhat.com/rhel-7.5.xml.in | 2 +-
 data/os/redhat.com/rhel-7.6.xml.in | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 4296811..b26d4b5 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -69,7 +69,7 @@
       <treeinfo>
         <family>Red Hat Enterprise Linux</family>
         <version>^7.2$</version>
-        <arch>ppc64</arch>
+        <arch>ppc64$</arch>
       </treeinfo>
     </tree>
 
diff --git a/data/os/redhat.com/rhel-7.3.xml.in b/data/os/redhat.com/rhel-7.3.xml.in
index a7a3fc3..f01d1e4 100644
--- a/data/os/redhat.com/rhel-7.3.xml.in
+++ b/data/os/redhat.com/rhel-7.3.xml.in
@@ -55,7 +55,7 @@
       <treeinfo>
         <family>Red Hat Enterprise Linux</family>
         <version>^7.3$</version>
-        <arch>ppc64</arch>
+        <arch>ppc64$</arch>
       </treeinfo>
     </tree>
 
diff --git a/data/os/redhat.com/rhel-7.4.xml.in b/data/os/redhat.com/rhel-7.4.xml.in
index 33f836f..ce32050 100644
--- a/data/os/redhat.com/rhel-7.4.xml.in
+++ b/data/os/redhat.com/rhel-7.4.xml.in
@@ -55,7 +55,7 @@
       <treeinfo>
         <family>Red Hat Enterprise Linux</family>
         <version>^7.4$</version>
-        <arch>ppc64</arch>
+        <arch>ppc64$</arch>
       </treeinfo>
     </tree>
 
diff --git a/data/os/redhat.com/rhel-7.5.xml.in b/data/os/redhat.com/rhel-7.5.xml.in
index e60f46a..1768ab4 100644
--- a/data/os/redhat.com/rhel-7.5.xml.in
+++ b/data/os/redhat.com/rhel-7.5.xml.in
@@ -55,7 +55,7 @@
       <treeinfo>
         <family>Red Hat Enterprise Linux</family>
         <version>^7.5$</version>
-        <arch>ppc64</arch>
+        <arch>ppc64$</arch>
       </treeinfo>
     </tree>
 
diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in
index bceaa72..57b7588 100644
--- a/data/os/redhat.com/rhel-7.6.xml.in
+++ b/data/os/redhat.com/rhel-7.6.xml.in
@@ -55,7 +55,7 @@
       <treeinfo>
         <family>Red Hat Enterprise Linux</family>
         <version>^7.6$</version>
-        <arch>ppc64</arch>
+        <arch>ppc64$</arch>
       </treeinfo>
     </tree>
 
-- 
2.21.0



From fidencio at redhat.com  Wed May 29 07:28:14 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 29 May 2019 09:28:14 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/3] rhel-7.[2-6]: Add ppc64le
	resources
In-Reply-To: <20190529072815.22840-1-fidencio@redhat.com>
References: <20190529072815.22840-1-fidencio@redhat.com>
Message-ID: <20190529072815.22840-3-fidencio@redhat.com>

Those are exactly the same as the ones used for ppc64.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-7.2.xml.in | 15 +++++++++++++++
 data/os/redhat.com/rhel-7.3.xml.in | 15 +++++++++++++++
 data/os/redhat.com/rhel-7.4.xml.in | 15 +++++++++++++++
 data/os/redhat.com/rhel-7.5.xml.in | 15 +++++++++++++++
 data/os/redhat.com/rhel-7.6.xml.in | 15 +++++++++++++++
 5 files changed, 75 insertions(+)

diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index b26d4b5..d071a1c 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -112,6 +112,21 @@
       </recommended>
     </resources>
 
+    <resources arch="ppc64le">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
     <resources arch="all">
       <minimum>
         <n-cpus>1</n-cpus>
diff --git a/data/os/redhat.com/rhel-7.3.xml.in b/data/os/redhat.com/rhel-7.3.xml.in
index f01d1e4..e17dd7c 100644
--- a/data/os/redhat.com/rhel-7.3.xml.in
+++ b/data/os/redhat.com/rhel-7.3.xml.in
@@ -98,6 +98,21 @@
       </recommended>
     </resources>
 
+    <resources arch="ppc64le">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
     <resources arch="all">
       <minimum>
         <n-cpus>1</n-cpus>
diff --git a/data/os/redhat.com/rhel-7.4.xml.in b/data/os/redhat.com/rhel-7.4.xml.in
index ce32050..c208ba7 100644
--- a/data/os/redhat.com/rhel-7.4.xml.in
+++ b/data/os/redhat.com/rhel-7.4.xml.in
@@ -98,6 +98,21 @@
       </recommended>
     </resources>
 
+    <resources arch="ppc64le">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
     <resources arch="all">
       <minimum>
         <n-cpus>1</n-cpus>
diff --git a/data/os/redhat.com/rhel-7.5.xml.in b/data/os/redhat.com/rhel-7.5.xml.in
index 1768ab4..3dda7e2 100644
--- a/data/os/redhat.com/rhel-7.5.xml.in
+++ b/data/os/redhat.com/rhel-7.5.xml.in
@@ -98,6 +98,21 @@
       </recommended>
     </resources>
 
+    <resources arch="ppc64le">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>4000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
     <resources arch="all">
       <minimum>
         <n-cpus>1</n-cpus>
diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in
index 57b7588..50ddd40 100644
--- a/data/os/redhat.com/rhel-7.6.xml.in
+++ b/data/os/redhat.com/rhel-7.6.xml.in
@@ -98,6 +98,21 @@
       </recommended>
     </resources>
 
+    <resources arch="ppc64le">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>4000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
     <resources arch="all">
       <minimum>
         <n-cpus>1</n-cpus>
-- 
2.21.0



From fidencio at redhat.com  Wed May 29 07:28:15 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 29 May 2019 09:28:15 +0200
Subject: [Libosinfo] [osinfo-db PATCH 3/3] rhel-8.0: Fix typo in resources'
	architecture name
In-Reply-To: <20190529072815.22840-1-fidencio@redhat.com>
References: <20190529072815.22840-1-fidencio@redhat.com>
Message-ID: <20190529072815.22840-4-fidencio@redhat.com>

rhel-8.0 doesn't have any ppc64 media/tree. The correct architecture
name, matching with existent medias and trees for the os, is ppc64le.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/redhat.com/rhel-8.0.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in
index 157c498..29f66b8 100644
--- a/data/os/redhat.com/rhel-8.0.xml.in
+++ b/data/os/redhat.com/rhel-8.0.xml.in
@@ -112,7 +112,7 @@
       </treeinfo>
     </tree>
 
-    <resources arch="ppc64">
+    <resources arch="ppc64le">
       <minimum>
         <n-cpus>1</n-cpus>
         <cpu>1000000000</cpu>
-- 
2.21.0



From fidencio at redhat.com  Wed May 29 12:15:33 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 29 May 2019 14:15:33 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Fix infinite loop on libosinfo
	side & add tests to avoid this to happen again
Message-ID: <20190529121535.18391-1-fidencio@redhat.com>

This series fixes the infinite loop caused by a typo in openbsd-6.3
entry and also adds a test avoiding this issue to happen in the future.

Fabiano Fid?ncio (2):
  openbsd-6.3: Fix derives-from
  tests: Add test_related

 data/os/openbsd.org/openbsd-6.3.xml.in |  2 +-
 tests/test_related.py                  | 12 ++++++++++++
 tests/util.py                          |  5 ++++-
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_related.py

-- 
2.21.0



From fidencio at redhat.com  Wed May 29 12:15:34 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 29 May 2019 14:15:34 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] openbsd-6.3: Fix derives-from
In-Reply-To: <20190529121535.18391-1-fidencio@redhat.com>
References: <20190529121535.18391-1-fidencio@redhat.com>
Message-ID: <20190529121535.18391-2-fidencio@redhat.com>

The OS derives from OpenBSD 6.2 and not 6.3. More than that, having a
distro deriving from itself will cause an infinite loop on osinfo-db
functions recurring on the derives-from field.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/openbsd.org/openbsd-6.3.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/os/openbsd.org/openbsd-6.3.xml.in b/data/os/openbsd.org/openbsd-6.3.xml.in
index e52b1b9..bf892ea 100644
--- a/data/os/openbsd.org/openbsd-6.3.xml.in
+++ b/data/os/openbsd.org/openbsd-6.3.xml.in
@@ -9,7 +9,7 @@
     <distro>openbsd</distro>
     <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/6.2'/>
-    <derives-from id='http://openbsd.org/openbsd/6.3'/>
+    <derives-from id='http://openbsd.org/openbsd/6.2'/>
 
     <release-date>2018-04-02</release-date>
     <eol-date>2019-05-03</eol-date>
-- 
2.21.0



From fidencio at redhat.com  Wed May 29 12:15:35 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Wed, 29 May 2019 14:15:35 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] tests: Add test_related
In-Reply-To: <20190529121535.18391-1-fidencio@redhat.com>
References: <20190529121535.18391-1-fidencio@redhat.com>
Message-ID: <20190529121535.18391-3-fidencio@redhat.com>

test_related ensures that an OS entry is not inheriting from itself (or
from another OS which would end up inheriting from itself), avoiding
them to have an infinite loop on libosinfo side.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tests/test_related.py | 12 ++++++++++++
 tests/util.py         |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_related.py

diff --git a/tests/test_related.py b/tests/test_related.py
new file mode 100644
index 0000000..aab4cc8
--- /dev/null
+++ b/tests/test_related.py
@@ -0,0 +1,12 @@
+# This work is licensed under the GNU GPLv2 or later.
+# See the COPYING file in the top-level directory.
+
+from . import util
+
+
+ at util.os_parametrize('osxml', filter_related=True)
+def test_related(osxml):
+    related = util.DataFiles.getosxml_related(osxml)
+
+    for os in related:
+        assert os is not osxml
diff --git a/tests/util.py b/tests/util.py
index b5dcd8b..d2f2763 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -62,7 +62,8 @@ class _Files():
                 p.startswith(os.path.join(self.datadir, dirname))]
 
     def oses(self, filter_media=False, filter_trees=False, filter_images=False,
-            filter_devices=False, filter_resources=False, filter_dates=False):
+            filter_devices=False, filter_resources=False, filter_dates=False,
+            filter_related=False):
         """
         Return a list of osinfo.Os objects
 
@@ -86,6 +87,8 @@ class _Files():
             oses = [o for o in oses if o.resources_list]
         if filter_dates:
             oses = [o for o in oses if o.release_date or o.eol_date]
+        if filter_related:
+            oses = [o for o in oses if self.getosxml_related(o)]
         return oses
 
     def getosxml_related(self, osxml):
-- 
2.21.0



From ptoscano at redhat.com  Wed May 29 13:28:14 2019
From: ptoscano at redhat.com (Pino Toscano)
Date: Wed, 29 May 2019 15:28:14 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] openbsd-6.3: Fix derives-from
In-Reply-To: <20190529121535.18391-2-fidencio@redhat.com>
References: <20190529121535.18391-1-fidencio@redhat.com>
	<20190529121535.18391-2-fidencio@redhat.com>
Message-ID: <5221532.pcPHyHz462@lindworm.usersys.redhat.com>

On Wednesday, 29 May 2019 14:15:34 CEST Fabiano Fid?ncio wrote:
> The OS derives from OpenBSD 6.2 and not 6.3. More than that, having a
> distro deriving from itself will cause an infinite loop on osinfo-db
> functions recurring on the derives-from field.
> 
> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
> ---
>  data/os/openbsd.org/openbsd-6.3.xml.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/data/os/openbsd.org/openbsd-6.3.xml.in b/data/os/openbsd.org/openbsd-6.3.xml.in
> index e52b1b9..bf892ea 100644
> --- a/data/os/openbsd.org/openbsd-6.3.xml.in
> +++ b/data/os/openbsd.org/openbsd-6.3.xml.in
> @@ -9,7 +9,7 @@
>      <distro>openbsd</distro>
>      <_vendor>OpenBSD Project</_vendor>
>      <upgrades id='http://openbsd.org/openbsd/6.2'/>
> -    <derives-from id='http://openbsd.org/openbsd/6.3'/>
> +    <derives-from id='http://openbsd.org/openbsd/6.2'/>

Oops. Sorry for the mistake, and good eye that spotted it.

Thanks,
-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190529/48f35b40/attachment.sig>

From felipeborges at gnome.org  Wed May 29 15:06:52 2019
From: felipeborges at gnome.org (Felipe Borges)
Date: Wed, 29 May 2019 15:06:52 +0000
Subject: [Libosinfo] [PATCH] android-x86: Update to stable release
Message-ID: <20190529150652.23512-1-felipeborges@gnome.org>

https://www.android-x86.org/releases/releasenote-8-1-r1.html
---
 data/os/android-x86.org/android-x86-8.1.xml.in            | 8 ++++----
 ...oid-x86-8.1-rc2.iso.txt => android-x86-8.1-r1.iso.txt} | 2 +-
 ...6_64-8.1-rc2.iso.txt => android-x86_64-8.1-r1.iso.txt} | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/isodata/android-x86/android-x86-8.1/{android-x86-8.1-rc2.iso.txt => android-x86-8.1-r1.iso.txt} (97%)
 rename tests/isodata/android-x86/android-x86-8.1/{android-x86_64-8.1-rc2.iso.txt => android-x86_64-8.1-r1.iso.txt} (97%)

diff --git a/data/os/android-x86.org/android-x86-8.1.xml.in b/data/os/android-x86.org/android-x86-8.1.xml.in
index d41f264..4a4147e 100644
--- a/data/os/android-x86.org/android-x86-8.1.xml.in
+++ b/data/os/android-x86.org/android-x86-8.1.xml.in
@@ -10,21 +10,21 @@
     <distro>android-x86</distro>
     <codename>oreo-x86</codename>
 
-    <release-status>prerelease</release-status>
+    <release-date>2019-01-15</release-date>
 
     <media arch="x86_64" live="true">
-      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86_64-8.1-rc2.iso</url>
+      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86_64-8.1-r1.iso</url>
       <iso>
         <volume-id>Android-x86 LiveCD</volume-id>
         <system-id>LINUX</system-id>
-        <volume-size>899870720</volume-size>
+        <volume-size>896534528</volume-size>
       </iso>
       <kernel>kernel</kernel>
       <initrd>initrd.img</initrd>
     </media>
 
     <media arch="i686" live="true">
-      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86-8.1-rc2.iso</url>
+      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86-8.1-r1.iso</url>
       <iso>
         <volume-id>Android-x86 LiveCD</volume-id>
         <system-id>LINUX</system-id>
diff --git a/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-rc2.iso.txt b/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-r1.iso.txt
similarity index 97%
rename from tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-rc2.iso.txt
rename to tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-r1.iso.txt
index 9bba50d..16832c8 100644
--- a/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-rc2.iso.txt
+++ b/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-r1.iso.txt
@@ -11,7 +11,7 @@ Bibliographic File id:
 Volume set size is: 1
 Volume set sequence number is: 1
 Logical block size is: 2048
-Volume size is: 439390
+Volume size is: 345425
 El Torito VD version 1 found, boot catalog is in sector 54
 Joliet with UCS level 3 found
 Rock Ridge signatures version 1 found
diff --git a/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-rc2.iso.txt b/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-r1.iso.txt
similarity index 97%
rename from tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-rc2.iso.txt
rename to tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-r1.iso.txt
index 9bba50d..1ad2259 100644
--- a/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-rc2.iso.txt
+++ b/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-r1.iso.txt
@@ -11,7 +11,7 @@ Bibliographic File id:
 Volume set size is: 1
 Volume set sequence number is: 1
 Logical block size is: 2048
-Volume size is: 439390
+Volume size is: 437761
 El Torito VD version 1 found, boot catalog is in sector 54
 Joliet with UCS level 3 found
 Rock Ridge signatures version 1 found
-- 
2.21.0



From fidencio at redhat.com  Thu May 30 09:55:19 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Thu, 30 May 2019 11:55:19 +0200
Subject: [Libosinfo] [osinfo-db-tools PATCH] test_osinfo_db_path: Unset
	XDG_CONFIG_HOME envvar
Message-ID: <20190530095519.23412-1-fidencio@redhat.com>

Similarly to what's been done as part of 1df4c0dbede91, let's just unset
XDG_CONFIG_HOME environment variable in our tests, in case those were
externally set for some reason.

https://gitlab.com/libosinfo/osinfo-db-tools/issues/3

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 tests/test_osinfo_db_path.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_osinfo_db_path.py b/tests/test_osinfo_db_path.py
index d813c34..b0b6aff 100755
--- a/tests/test_osinfo_db_path.py
+++ b/tests/test_osinfo_db_path.py
@@ -44,6 +44,8 @@ def test_osinfo_db_path_user():
     """
     if "OSINFO_USER_DIR" in os.environ:
         del os.environ["OSINFO_USER_DIR"]
+    if "XDG_CONFIG_HOME" in os.environ:
+        del os.environ["XDG_CONFIG_HOME"]
     cmd = [util.Tools.db_path, util.ToolsArgs.USER]
     output = util.get_output(cmd)
     expected_output = os.path.join(os.environ["HOME"], ".config",
-- 
2.21.0



From fidencio at redhat.com  Fri May 31 09:00:45 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 31 May 2019 11:00:45 +0200
Subject: [Libosinfo] [PATCH] android-x86: Update to stable release
In-Reply-To: <20190529150652.23512-1-felipeborges@gnome.org>
References: <20190529150652.23512-1-felipeborges@gnome.org>
Message-ID: <CAAY6Xscr9X-J3MQs2sT0byXu0+-vG_W67uyep4VMPKvC+=haSg@mail.gmail.com>

Felipe,

On Wed, May 29, 2019 at 5:07 PM Felipe Borges <felipeborges at gnome.org> wrote:
>
> https://www.android-x86.org/releases/releasenote-8-1-r1.html
> ---
>  data/os/android-x86.org/android-x86-8.1.xml.in            | 8 ++++----
>  ...oid-x86-8.1-rc2.iso.txt => android-x86-8.1-r1.iso.txt} | 2 +-
>  ...6_64-8.1-rc2.iso.txt => android-x86_64-8.1-r1.iso.txt} | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
>  rename tests/isodata/android-x86/android-x86-8.1/{android-x86-8.1-rc2.iso.txt => android-x86-8.1-r1.iso.txt} (97%)
>  rename tests/isodata/android-x86/android-x86-8.1/{android-x86_64-8.1-rc2.iso.txt => android-x86_64-8.1-r1.iso.txt} (97%)
>
> diff --git a/data/os/android-x86.org/android-x86-8.1.xml.in b/data/os/android-x86.org/android-x86-8.1.xml.in
> index d41f264..4a4147e 100644
> --- a/data/os/android-x86.org/android-x86-8.1.xml.in
> +++ b/data/os/android-x86.org/android-x86-8.1.xml.in
> @@ -10,21 +10,21 @@
>      <distro>android-x86</distro>
>      <codename>oreo-x86</codename>
>
> -    <release-status>prerelease</release-status>
> +    <release-date>2019-01-15</release-date>
>
>      <media arch="x86_64" live="true">
> -      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86_64-8.1-rc2.iso</url>
> +      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86_64-8.1-r1.iso</url>
>        <iso>
>          <volume-id>Android-x86 LiveCD</volume-id>
>          <system-id>LINUX</system-id>
> -        <volume-size>899870720</volume-size>
> +        <volume-size>896534528</volume-size>
>        </iso>
>        <kernel>kernel</kernel>
>        <initrd>initrd.img</initrd>
>      </media>
>
>      <media arch="i686" live="true">
> -      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86-8.1-rc2.iso</url>
> +      <url>http://cznic.dl.osdn.jp/android-x86/69704/android-x86-8.1-r1.iso</url>
>        <iso>
>          <volume-id>Android-x86 LiveCD</volume-id>
>          <system-id>LINUX</system-id>

Down here volume-size for the i686 ISO has to be updated as well:
-        <volume-size>711997440</volume-size>
+        <volume-size>707430400</volume-size>


> diff --git a/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-rc2.iso.txt b/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-r1.iso.txt
> similarity index 97%
> rename from tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-rc2.iso.txt
> rename to tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-r1.iso.txt
> index 9bba50d..16832c8 100644
> --- a/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-rc2.iso.txt
> +++ b/tests/isodata/android-x86/android-x86-8.1/android-x86-8.1-r1.iso.txt
> @@ -11,7 +11,7 @@ Bibliographic File id:
>  Volume set size is: 1
>  Volume set sequence number is: 1
>  Logical block size is: 2048
> -Volume size is: 439390
> +Volume size is: 345425
>  El Torito VD version 1 found, boot catalog is in sector 54
>  Joliet with UCS level 3 found
>  Rock Ridge signatures version 1 found
> diff --git a/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-rc2.iso.txt b/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-r1.iso.txt
> similarity index 97%
> rename from tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-rc2.iso.txt
> rename to tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-r1.iso.txt
> index 9bba50d..1ad2259 100644
> --- a/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-rc2.iso.txt
> +++ b/tests/isodata/android-x86/android-x86-8.1/android-x86_64-8.1-r1.iso.txt
> @@ -11,7 +11,7 @@ Bibliographic File id:
>  Volume set size is: 1
>  Volume set sequence number is: 1
>  Logical block size is: 2048
> -Volume size is: 439390
> +Volume size is: 437761
>  El Torito VD version 1 found, boot catalog is in sector 54
>  Joliet with UCS level 3 found
>  Rock Ridge signatures version 1 found
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo

I'll do the change before pushing!
Thanks for the contribution!

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>
-- 
Fabiano Fid?ncio



From fidencio at redhat.com  Fri May 31 09:18:43 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 31 May 2019 11:18:43 +0200
Subject: [Libosinfo] [osinfo-db PATCH] fedora: add EOL date of Fedora 28
In-Reply-To: <20190529071143.2929-2-ptoscano@redhat.com>
References: <20190529071143.2929-2-ptoscano@redhat.com>
Message-ID: <CAAY6XsfJXzoySzqcaZ1G72enxZY1PqsjKA+Sg09e5CxuBh_9fQ@mail.gmail.com>

Pino,

I'll just re-word a little bit the commit message to "fedora28: Add
EOL date" ...

On Wed, May 29, 2019 at 9:11 AM Pino Toscano <ptoscano at redhat.com> wrote:
>
> https://lists.fedoraproject.org/archives/list/devel-announce at lists.fedoraproject.org/thread/RKGVIOHNF4HYC2FXEG7VRHMG7ARXGGRA/
> ---
>  data/os/fedoraproject.org/fedora-28.xml.in | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/data/os/fedoraproject.org/fedora-28.xml.in b/data/os/fedoraproject.org/fedora-28.xml.in
> index 6e21a0d..339bb9f 100644
> --- a/data/os/fedoraproject.org/fedora-28.xml.in
> +++ b/data/os/fedoraproject.org/fedora-28.xml.in
> @@ -12,6 +12,7 @@
>      <derives-from id="http://fedoraproject.org/fedora/27"/>
>
>      <release-date>2018-05-01</release-date>
> +    <eol-date>2019-05-29</eol-date>
>
>      <variant id="workstation">
>        <_name>Fedora 28 Workstation</_name>
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>
Thanks for the contribution!

Best Regards,
--
Fabiano Fid?ncio



From fidencio at redhat.com  Fri May 31 09:19:25 2019
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Fri, 31 May 2019 11:19:25 +0200
Subject: [Libosinfo] [osinfo-db PATCH] fedora: fix EOL date of Fedora 27
In-Reply-To: <20190529071143.2929-1-ptoscano@redhat.com>
References: <20190529071143.2929-1-ptoscano@redhat.com>
Message-ID: <CAAY6XseJCNwe4jGb0x4cx7H20h48aU+_F=rkdvEWic_=RFXV+Q@mail.gmail.com>

Pino,

I'll just re-word the commit message a little bit to: "fedora27: Fix EOL date"

On Wed, May 29, 2019 at 9:12 AM Pino Toscano <ptoscano at redhat.com> wrote:
>
> https://lists.fedoraproject.org/archives/list/devel-announce at lists.fedoraproject.org/thread/ZSXRUH7JFXQNYP6JOAFTAUMSTLV6VMGO/
> ---
>  data/os/fedoraproject.org/fedora-27.xml.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in
> index 1baa5fa..eb80f5e 100644
> --- a/data/os/fedoraproject.org/fedora-27.xml.in
> +++ b/data/os/fedoraproject.org/fedora-27.xml.in
> @@ -12,7 +12,7 @@
>      <derives-from id="http://fedoraproject.org/fedora/26"/>
>
>      <release-date>2017-11-14</release-date>
> -    <eol-date>2019-11-30</eol-date>
> +    <eol-date>2018-11-30</eol-date>
>
>      <variant id="workstation">
>        <_name>Fedora 27 Workstation</_name>
> --
> 2.21.0
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo

Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com>
Thanks for the contribution!

Best Regards,
--
Fabiano Fid?ncio



From fidencio at redhat.com  Fri May 31 09:44:21 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 31 May 2019 11:44:21 +0200
Subject: [Libosinfo] [osinfo-db PATCH 0/2] Fix dead URLs
Message-ID: <20190531094423.29886-1-fidencio@redhat.com>

These two patches have been pushed already.

Fabiano Fid?ncio (2):
  fedora28: Update URLs after EOL
  centos7: Comment out CentOS-7-x86_64-DVD.iso URL

 data/os/centos.org/centos-7.0.xml.in       |  2 ++
 data/os/fedoraproject.org/fedora-28.xml.in | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

-- 
2.21.0



From fidencio at redhat.com  Fri May 31 09:44:22 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 31 May 2019 11:44:22 +0200
Subject: [Libosinfo] [osinfo-db PATCH 1/2] fedora28: Update URLs after EOL
In-Reply-To: <20190531094423.29886-1-fidencio@redhat.com>
References: <20190531094423.29886-1-fidencio@redhat.com>
Message-ID: <20190531094423.29886-2-fidencio@redhat.com>

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/fedoraproject.org/fedora-28.xml.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/os/fedoraproject.org/fedora-28.xml.in b/data/os/fedoraproject.org/fedora-28.xml.in
index 339bb9f..095f4ee 100644
--- a/data/os/fedoraproject.org/fedora-28.xml.in
+++ b/data/os/fedoraproject.org/fedora-28.xml.in
@@ -32,7 +32,7 @@
     <!-- Live -->
     <media arch="x86_64" live="true" installer-script="false">
       <variant id="workstation"/>
-      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-28-1.1.iso</url>
+      <url>https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/28/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-28-1.1.iso</url>
       <iso>
         <volume-id>Fedora-WS-Live-28.*</volume-id>
         <system-id>LINUX</system-id>
@@ -44,7 +44,7 @@
     <!-- Network Installer !-->
     <media arch="x86_64">
       <variant id="workstation-netinst"/>
-      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-28-1.1.iso</url>
+      <url>https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/28/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-28-1.1.iso</url>
       <iso>
         <volume-id>Fedora-WS-dvd-x86_64-28</volume-id>
         <system-id>LINUX</system-id>
@@ -61,7 +61,7 @@
     <!-- DVD -->
     <media arch="x86_64">
       <variant id="server"/>
-      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/Server/x86_64/iso/Fedora-Server-dvd-x86_64-28-1.1.iso</url>
+      <url>https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/28/Server/x86_64/iso/Fedora-Server-dvd-x86_64-28-1.1.iso</url>
       <iso>
         <volume-id>Fedora-S-dvd-x86_64-28</volume-id>
         <system-id>LINUX</system-id>
@@ -77,7 +77,7 @@
     <!-- Network Installer !-->
     <media arch="x86_64">
       <variant id="server-netinst"/>
-      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/Server/x86_64/iso/Fedora-Server-netinst-x86_64-28-1.1.iso</url>
+      <url>https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/28/Server/x86_64/iso/Fedora-Server-netinst-x86_64-28-1.1.iso</url>
       <iso>
         <volume-id>Fedora-S-dvd-x86_64-28</volume-id>
         <system-id>LINUX</system-id>
@@ -91,7 +91,7 @@
     </media>
 
     <tree arch="x86_64">
-      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/Server/x86_64/os/</url>
+      <url>https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/28/Server/x86_64/os/</url>
       <variant id="server"/>
       <treeinfo>
         <family>Fedora</family>
@@ -101,11 +101,11 @@
     </tree>
 
     <image arch="x86_64" format="qcow2" cloud-init="true">
-      <url>https://dl.fedoraproject.org/pub/fedora/linux/releases/28/Cloud/x86_64/images/Fedora-Cloud-Base-28-1.1.x86_64.qcow2</url>
+      <url>https://dl.fedoraproject.org/pub/archive/fedora/linux/releases/28/Cloud/x86_64/images/Fedora-Cloud-Base-28-1.1.x86_64.qcow2</url>
     </image>
 
     <image arch="aarch64" format="qcow2" cloud-init="true">
-      <url>https://dl.fedoraproject.org/pub/fedora/linux/releases/28/Cloud/aarch64/images/Fedora-Cloud-Base-28-1.1.aarch64.qcow2</url>
+      <url>https://dl.fedoraproject.org/pub/archive/fedora/linux/releases/28/Cloud/aarch64/images/Fedora-Cloud-Base-28-1.1.aarch64.qcow2</url>
     </image>
 
     <!-- No install media or tree is provided for Fedora 28 Cloud variant -->
-- 
2.21.0



From fidencio at redhat.com  Fri May 31 09:44:23 2019
From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=)
Date: Fri, 31 May 2019 11:44:23 +0200
Subject: [Libosinfo] [osinfo-db PATCH 2/2] centos7: Comment out
	CentOS-7-x86_64-DVD.iso URL
In-Reply-To: <20190531094423.29886-1-fidencio@redhat.com>
References: <20190531094423.29886-1-fidencio@redhat.com>
Message-ID: <20190531094423.29886-3-fidencio@redhat.com>

CentOS servers have been under attack and they decided to forbid access
to this ISO.

Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com>
---
 data/os/centos.org/centos-7.0.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index e6d7fe8..7c07595 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -21,7 +21,9 @@
     </variant>
 
     <media arch="x86_64">
+      <!-- Due to attacks, CentOS decided to forbid access to this image
       <url>https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD.iso</url>
+      -->
       <iso>
         <system-id>LINUX</system-id>
         <volume-id>CentOS 7 x86_64</volume-id>
-- 
2.21.0