[Libosinfo] [osinfo-db][PATCH 1/3] silverblue: Split Team Silverblue and Fedora entries

[Fabiano Fidêncio]

On Sun, Jun 3, 2018 at 7:02 PM, Fabiano Fidêncio <fabiano at fidencio.org> wrote:
> From: Felipe Borges <felipeborges at gnome.org>
>
> Fedora Atomic Workstation has been renamed into Team Silverblue.
> See https://teamsilverblue.org/
>
> Despite being a variant of Fedora, Team Silverblue has its own
> branding, such as its public facing name and logo.
>
> Signed-off-by: Felipe Borges <felipeborges at gnome.org>
> ---
>  data/os/fedoraproject.org/fedora-28.xml.in     | 15 ---------
>  data/os/fedoraproject.org/silverblue-28.xml.in | 45 ++++++++++++++++++++++++++
>  2 files changed, 45 insertions(+), 15 deletions(-)
>  create mode 100644 data/os/fedoraproject.org/silverblue-28.xml.in
>
> diff --git a/data/os/fedoraproject.org/fedora-28.xml.in b/data/os/fedoraproject.org/fedora-28.xml.in
> index cda279c..7774a80 100644
> --- a/data/os/fedoraproject.org/fedora-28.xml.in
> +++ b/data/os/fedoraproject.org/fedora-28.xml.in
> @@ -19,9 +19,6 @@
>      <variant id="workstation-netinst">
>        <_name>Fedora 28 Workstation</_name>
>      </variant>
> -    <variant id="workstation-atomic">
> -      <_name>Fedora 28 Workstation</_name>
> -    </variant>
>      <variant id="server">
>        <_name>Fedora 28 Server</_name>
>      </variant>
> @@ -43,18 +40,6 @@
>        <initrd>isolinux/initrd.img</initrd>
>      </media>
>
> -    <!-- Atomic -->
> -    <media arch="x86_64">
> -      <variant id="workstation-atomic"/>
> -      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/AtomicWorkstation/x86_64/iso/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso</url>
> -      <iso>
> -        <volume-id>Fedora-AW-ostree-x86_64-28</volume-id>
> -        <system-id>LINUX</system-id>
> -      </iso>
> -      <kernel>isolinux/vmlinuz</kernel>
> -      <initrd>isolinux/initrd.img</initrd>
> -    </media>
> -
>      <!-- Network Installer !-->
>      <media arch="x86_64">
>        <variant id="workstation-netinst"/>
> diff --git a/data/os/fedoraproject.org/silverblue-28.xml.in b/data/os/fedoraproject.org/silverblue-28.xml.in
> new file mode 100644
> index 0000000..2239403
> --- /dev/null
> +++ b/data/os/fedoraproject.org/silverblue-28.xml.in
> @@ -0,0 +1,45 @@
> +<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/28">
> +    <short-id>silverblue28</short-id>
> +    <_name>Team Silverblue 28</_name>

Matthias suggested to use "Fedora Silverblue 28" instead of "Team
Silverblue 28" here.

> +    <version>28</version>
> +    <_vendor>Fedora Project</_vendor>
> +    <family>linux</family>
> +    <distro>fedora</distro>
> +    <derives-from id="http://fedoraproject.org/fedora/27"/>
> +
> +    <release-date>2018-05-01</release-date>
> +
> +    <variant id="workstation">
> +      <_name>Team Silverblue 28</_name>

And also here.

> +    </variant>
> +
> +    <media arch="x86_64">
> +      <variant id="workstation"/>
> +      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/AtomicWorkstation/x86_64/iso/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso</url>
> +      <iso>
> +        <volume-id>Fedora-AW-ostree-x86_64-28</volume-id>
> +        <system-id>LINUX</system-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>
> +        <ram>2147483648</ram>
> +        <storage>21474836480</storage>
> +      </recommended>
> +    </resources>
> +
> +  </os>
> +</libosinfo>
> --
> 2.14.3
>

I will wait and just submit a v2 after someone reviews this one.

-- 
Fabiano Fidêncio