Re: [Libosinfo] [osinfo-db PATCH] centos: Fix typo in the installation-url template

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Mon, Apr 15, 2019 at 12:56:49PM +0200, Fabiano Fidêncio wrote:
> The typo was introduced as part of b6f5ea9e6da.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/install-script/centos.org/centos-kickstart-desktop.xml.in | 2 +-
>  data/install-script/centos.org/centos-kickstart-jeos.xml.in| 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> 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 6771283..c215115 100644
> --- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
> +++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
> @@ -96,7 +96,7 @@
>  
>
>  
> -
> +
>
>  
>  
> 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 c58809b..8349928 100644
> --- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
> +++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
> @@ -88,7 +88,7 @@
>  
>
>  
> -
> +
>
>  
>  
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db-tools PATCH] readme: Add json-glib as dependency

[Christophe Fergeau]

Sure, 
Acked-by: Christophe Fergeau 

On Fri, Mar 08, 2019 at 10:39:19AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  README | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/README b/README
> index 411ceb2..b0faebb 100644
> --- a/README
> +++ b/README
> @@ -19,6 +19,7 @@ Dependencies
>  - Required:
>- gobject-2.0
>- gio-2.0
> +  - json-glib
>- libarchive3
>- libxml-2.0
>- libxslt-1.0
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] ubuntu14.04: Add desktop installer script to desktop medias

[Christophe Fergeau]

On Fri, Mar 08, 2019 at 10:06:43AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
> After realising that 14.04 is still going on, I gave an
> express-installation a try for the desktop profile (for the desktop
> medias) and it just works as expected!

Why not put this in the commit log though?

> ---
>  data/os/ubuntu.com/ubuntu-14.04.xml.in | 6 ++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in 
> b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> index dccb815..11e9d9e 100644
> --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> @@ -59,6 +59,9 @@
>
>casper/vmlinuz
>casper/initrd.lz
> +  
> +
> +  
>  
>  
>
> http://releases.ubuntu.com/14.04/ubuntu-14.04.6-desktop-amd64.iso
> @@ -67,6 +70,9 @@
>
>casper/vmlinuz.efi
>casper/initrd.lz
> +  
> +
> +  
>  
>  
>  
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] ubuntu14.04: Add desktop installer script to desktop medias

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Fri, Mar 08, 2019 at 10:06:43AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
> After realising that 14.04 is still going on, I gave an
> express-installation a try for the desktop profile (for the desktop
> medias) and it just works as expected!
> ---
>  data/os/ubuntu.com/ubuntu-14.04.xml.in | 6 ++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in 
> b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> index dccb815..11e9d9e 100644
> --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> @@ -59,6 +59,9 @@
>
>casper/vmlinuz
>casper/initrd.lz
> +  
> +
> +  
>  
>  
>
> http://releases.ubuntu.com/14.04/ubuntu-14.04.6-desktop-amd64.iso
> @@ -67,6 +70,9 @@
>
>casper/vmlinuz.efi
>casper/initrd.lz
> +  
> +
> +  
>  
>  
>  
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH] centos7: Add CentOS 7 entry

[Christophe Fergeau]

On Tue, Mar 05, 2019 at 08:03:38PM +0100, Fabiano Fidêncio wrote:
> "centos7" is the preferred way to display and advertise CentOS 7, mainly
> because CentOS does not support pointing releases at all.
> 
> After talking with Jim Perrin, a CentOS board member, we've decided that
> the change from centos7.0 to centos7 would be the way to go.
> 
> As we can't break backward compatibility, we can't just rename
> centos-7.0.xml.in to centos-7.xml.in and adjust the bits accordingly.
> Knowing that, the path to take is creating a new centos-7.xml.in entry
> that contains exactly the same content of centos-7.0.xml.in, adjust the
> bits in the new entry and change centos-7.0 to "clone" centos-7.

Hmm, I would mark centos-7 as upgrading centos-7.0, maybe mark
centos-7.0 as EOL'ed (as we'd be at centos-7.6 by now), and only
maintain centos-7 from now on.

> 
> Although this is not the most elegant solution, it ensures we properly
> advertise CentOS in the way its community wants and also do not break
> backward compatibility.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/centos.org/centos-7.0.xml.in |  4 +-
>  data/os/centos.org/centos-7.xml.in   | 86 
> 
>  2 files changed, 89 insertions(+), 1 deletion(-)
>  create mode 100644 data/os/centos.org/centos-7.xml.in
> 
> diff --git a/data/os/centos.org/centos-7.0.xml.in 
> b/data/os/centos.org/centos-7.0.xml.in
> index 7fc6d8d..bbfeb48 100644
> --- a/data/os/centos.org/centos-7.0.xml.in
> +++ b/data/os/centos.org/centos-7.0.xml.in
> @@ -1,6 +1,8 @@
>  
>  
> +
> +  

Yes and no, I think we want to remove the system-id/volume-id bits from
this file, as otherwise what a given centos ISO is going to match is
going to be undeterministic (unless you fixed this recently?)

Christophe

>http://centos.org/centos/7.0;>
>  centos7.0
>  <_name>CentOS 7.0
> @@ -9,7 +11,7 @@
>  linux
>  centos
>  http://centos.org/centos/6.5"/>
> -http://redhat.com/rhel/7.6"/>
> +http://centos.org/centos/7"/>
>  
>  2014-07-07
>  
> diff --git a/data/os/centos.org/centos-7.xml.in 
> b/data/os/centos.org/centos-7.xml.in
> new file mode 100644
> index 000..382bbc6
> --- /dev/null
> +++ b/data/os/centos.org/centos-7.xml.in
> @@ -0,0 +1,86 @@
> +
> +
> +
> +  
> +  http://centos.org/centos/7;>
> +centos7
> +<_name>CentOS 7
> +7
> +<_vendor>CentOS
> +linux
> +centos
> +http://centos.org/centos/6.6"/>
> +http://redhat.com/rhel/7.6"/>
> +
> +2014-07-07
> +
> +
> +  <_name>CentOS 7 (GNOME)
> +
> +
> +  <_name>CentOS 7 (KDE)
> +
> +
> +
> +  
> https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD.iso
> +  
> +LINUX
> +CentOS 7 x86_64
> +  
> +  isolinux/vmlinuz
> +  isolinux/initrd.img
> +
> +
> +
> +  
> +  
> https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso
> +  
> +LINUX
> +CentOS-7-x86_64-LiveGNOME*
> +  
> +  isolinux/vmlinuz0
> +  isolinux/initrd0.img
> +
> +
> +
> +  
> +  
> https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveKDE.iso
> +  
> +LINUX
> +CentOS-7-x86_64-LiveKDE*
> +  
> +  isolinux/vmlinuz0
> +  isolinux/initrd0.img
> +
> +
> +
> +  http://mirror.centos.org/centos-7/7/os/x86_64/
> +  
> +CentOS
> +^7$
> +x86_64
> +  
> +
> +
> +
> +  
> +1
> +10
> +1073741824
> +10737418240
> +  
> +
> +  
> +10
> +1073741824
> +10737418240
> +  
> +
> +
> +
> +  
> +  
> +
> +  
> +
> -- 
> 1.8.3.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging pattern where vapi files are in -devel

[Christophe Fergeau]

On Tue, Mar 05, 2019 at 02:58:54PM +0100, Fabiano Fidêncio wrote:
> On Tue, 2019-03-05 at 14:52 +0100, Christophe Fergeau wrote:
> > I'm not sure I'd make that one conditional on the fedora version.
> > With
> > the Obsoletes + Provides, upgrades will work fine, so this could be
> > done
> > on any fedora version.
> > (I would not have made that change in the first place, but I guess
> > now is too late ;)
> 
> The change made on Fedora dist-git doesn't include the conditionals as
> it was done only for F30+.
> 
> Would you prefer to have the checks completely dropped?

Yes, I don't think it is important that we generate the subpackage on
f29, is it?

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 7/7] mingw, spec: Fix the Source URL

[Christophe Fergeau]

Reviewed-by: Christophe Fergeau 

On Tue, Mar 05, 2019 at 10:37:55AM +0100, Fabiano Fidêncio wrote:
> https://releases.pagure.org/libosinfo/... instead of
> https://releases.pagure.io/libosinfo/...
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  libosinfo.spec.in   | 2 +-
>  mingw-libosinfo.spec.in | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 3cf73ff..6a2f2c3 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -5,7 +5,7 @@ Name: libosinfo
>  Version: @VERSION@
>  Release: 1%{?dist}
>  License: LGPLv2+
> -Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> +Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
>  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>  URL: https://libosinfo.org/
>  BuildRequires: gcc
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index 14b4c60..cfcc04e 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -5,7 +5,7 @@ Version: @VERSION@
>  Release: 1%{?dist}
>  Summary: MinGW Windows port of a library for managing OS information for 
> virtualization
>  License: LGPLv2+
> -Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
> +Source: https://releases.pagure.org/libosinfo/libosinfo-%{version}.tar.gz
>  URL: https://libosinfo.org/
>  
>  BuildArch: noarch
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 6/7] mingw: Use %find_Lang macro

[Christophe Fergeau]

On Tue, Mar 05, 2019 at 10:37:54AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  mingw-libosinfo.spec.in | 10 ++
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index e99885c..14b4c60 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -89,7 +89,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
>  rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
>  rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
>  
> -%files -n mingw32-libosinfo
> +%find_lang osinfo-db-tools
> +grep "%{mingw32_datadir}" libosinfo.lang > mingw32-libosinfo.lang
> +grep "%{mingw64_datadir}" libosinfo.lang > mingw64-libosinfo.lang
> +

Probably can be %mingw_find_lang?

> +%files -n mingw32-libosinfo -f mingw32-libosinfo.lang
>  %doc AUTHORS ChangeLog COPYING.LIB NEWS README
>  %{mingw32_bindir}/osinfo-detect.exe
>  %{mingw32_bindir}/osinfo-install-script.exe
> @@ -103,9 +107,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
>  %dir %{mingw32_datadir}/libosinfo
>  %{mingw32_datadir}/libosinfo/usb.ids
>  %{mingw32_datadir}/libosinfo/pci.ids
> -%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
>  
> -%files -n mingw64-libosinfo
> +%files -n mingw64-libosinfo -f mingw64-libosinfo.lang
>  %doc AUTHORS ChangeLog COPYING.LIB NEWS README
>  %{mingw64_bindir}/osinfo-detect.exe
>  %{mingw64_bindir}/osinfo-install-script.exe
> @@ -119,6 +122,5 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
>  %dir %{mingw64_datadir}/libosinfo
>  %{mingw64_datadir}/libosinfo/usb.ids
>  %{mingw64_datadir}/libosinfo/pci.ids
> -%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
>  
>  %changelog
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging pattern where vapi files are in -devel

[Christophe Fergeau]

I'm not sure I'd make that one conditional on the fedora version. With
the Obsoletes + Provides, upgrades will work fine, so this could be done
on any fedora version.
(I would not have made that change in the first place, but I guess
now is too late ;)

On Tue, Mar 05, 2019 at 10:37:53AM +0100, Fabiano Fidêncio wrote:
> This commit brings upstream the changes done on Fedora on
> 42b96ea66d7b3e.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  libosinfo.spec.in | 14 ++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 6aae7d7..3cf73ff 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -14,7 +14,9 @@ BuildRequires: glib2-devel
>  BuildRequires: libxml2-devel >= 2.6.0
>  BuildRequires: libxslt-devel >= 1.0.0
>  BuildRequires: vala
> +%if 0%{?fedora} < 30
>  BuildRequires: vala-tools
> +%endif
>  BuildRequires: libcurl-devel
>  BuildRequires: /usr/bin/pod2man
>  BuildRequires: hwdata
> @@ -34,6 +36,11 @@ Summary: Libraries, includes, etc. to compile with the 
> libosinfo library
>  Requires: %{name} = %{version}-%{release}
>  Requires: pkgconfig
>  Requires: glib2-devel
> +%if 0%{?fedora} >= 30
> +# -vala subpackage removed in F30
> +Obsoletes: libosinfo-vala < 1.3.0-3
> +Provides: libosinfo-vala = %{version}-%{release}
> +%endif
>  
>  %description devel
>  libosinfo is a library that allows virtualization provisioning tools to
> @@ -42,6 +49,7 @@ combination.
>  
>  Libraries, includes, etc. to compile with the libosinfo library
>  
> +%if 0%{?fedora} < 30
>  %package vala
>  Summary: Vala bindings
>  Requires: %{name} = %{version}-%{release}
> @@ -52,6 +60,7 @@ determine the optimal device settings for a 
> hypervisor/operating system
>  combination.
>  
>  This package provides the Vala bindings for libosinfo library.
> +%endif
>  
>  %prep
>  %setup -q
> @@ -101,7 +110,12 @@ fi
>  %{_datadir}/gir-1.0/Libosinfo-1.0.gir
>  %{_datadir}/gtk-doc/html/Libosinfo
>  
> +%if 0%{?fedora} < 30
>  %files vala
> +%else
> +%dir %{_datadir}/vala
> +%dir %{_datadir}/vala/vapi
> +%endif
>  %{_datadir}/vala/vapi/libosinfo-1.0.vapi
>  
>  %changelog
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 4/7] spec: Add "BuildRequires: gcc"

[Christophe Fergeau]

Reviewed-by: Christophe Fergeau 

On Tue, Mar 05, 2019 at 10:37:52AM +0100, Fabiano Fidêncio wrote:
> Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  libosinfo.spec.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 648b56e..6aae7d7 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -8,6 +8,7 @@ License: LGPLv2+
>  Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
>  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>  URL: https://libosinfo.org/
> +BuildRequires: gcc
>  BuildRequires: gettext-devel
>  BuildRequires: glib2-devel
>  BuildRequires: libxml2-devel >= 2.6.0
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 3/7] mingw, spec: Remove obsolete Group tag

[Christophe Fergeau]

Reviewed-by: Christophe Fergeau 

On Tue, Mar 05, 2019 at 10:37:51AM +0100, Fabiano Fidêncio wrote:
> This commit brings upstream the changes done on Fedora on
> 61fea0d48407c0ee,
> 
> References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  libosinfo.spec.in   | 3 ---
>  mingw-libosinfo.spec.in | 1 -
>  2 files changed, 4 deletions(-)
> 
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 8dc4d2b..648b56e 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -5,7 +5,6 @@ Name: libosinfo
>  Version: @VERSION@
>  Release: 1%{?dist}
>  License: LGPLv2+
> -Group: Development/Libraries
>  Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
>  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>  URL: https://libosinfo.org/
> @@ -31,7 +30,6 @@ combination.
>  
>  %package devel
>  Summary: Libraries, includes, etc. to compile with the libosinfo library
> -Group: Development/Libraries
>  Requires: %{name} = %{version}-%{release}
>  Requires: pkgconfig
>  Requires: glib2-devel
> @@ -45,7 +43,6 @@ Libraries, includes, etc. to compile with the libosinfo 
> library
>  
>  %package vala
>  Summary: Vala bindings
> -Group: Development/Libraries
>  Requires: %{name} = %{version}-%{release}
>  
>  %description vala
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index 35ed983..e99885c 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -5,7 +5,6 @@ Version: @VERSION@
>  Release: 1%{?dist}
>  Summary: MinGW Windows port of a library for managing OS information for 
> virtualization
>  License: LGPLv2+
> -Group: Development/Libraries
>  Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
>  URL: https://libosinfo.org/
>  
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 2/7] spec: Remove needless use of %defattr

[Christophe Fergeau]

Related to 
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_permissions

Reviewed-by: Christophe Fergeau 

On Tue, Mar 05, 2019 at 10:37:50AM +0100, Fabiano Fidêncio wrote:
> This commit is bringing upstream the change done on Fedora on
> 4a678b2f4d59,
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  libosinfo.spec.in | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 57f8d94..8dc4d2b 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -82,7 +82,6 @@ fi
>  %ldconfig_scriptlets
>  
>  %files -f %{name}.lang
> -%defattr(-, root, root)
>  %doc AUTHORS ChangeLog COPYING.LIB NEWS README
>  %{_bindir}/osinfo-detect
>  %{_bindir}/osinfo-query
> @@ -94,7 +93,6 @@ fi
>  %{_libdir}/girepository-1.0/Libosinfo-1.0.typelib
>  
>  %files devel
> -%defattr(-, root, root)
>  %doc examples/demo.js
>  %doc examples/demo.py
>  %{_libdir}/%{name}-1.0.so
> @@ -106,7 +104,6 @@ fi
>  %{_datadir}/gtk-doc/html/Libosinfo
>  
>  %files vala
> -%defattr(-, root, root)
>  %{_datadir}/vala/vapi/libosinfo-1.0.vapi
>  
>  %changelog
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 1/7] spec: Switch to %ldconfig_scriptlets

[Christophe Fergeau]

On Tue, Mar 05, 2019 at 10:37:49AM +0100, Fabiano Fidêncio wrote:
> This commit is bringing upstream the change done on Fedora on
> af0ce7aab60e.

Feature is documented at 
https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets
I'm not sure el7 will have it, but I don't know what we aim to support
with this spec file.

Reviewed-by: Christophe Fergeau 

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  libosinfo.spec.in | 7 +--
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index fd7e55c..57f8d94 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -79,12 +79,7 @@ then
>exit 1
>  fi
>  
> -%clean
> -rm -fr %{buildroot}
> -
> -%post -p /sbin/ldconfig
> -
> -%postun -p /sbin/ldconfig
> +%ldconfig_scriptlets
>  
>  %files -f %{name}.lang
>  %defattr(-, root, root)
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db-tools PATCH 3/4] mingw, spec: Remove obsolete Group tag

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Tue, Mar 05, 2019 at 10:42:28AM +0100, Fabiano Fidêncio wrote:
> References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag

And « The Group: tag is not required in any live Fedora or EPEL release.
RHEL5 did need it, but EPEL5 did not as it was supplied automatically
via magic in the epel-rpm-macros package. The Packaging Guidelines have
indicated that the Group: tag should not be used since March of 2017. »
might be worth quoting in the log.


> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  mingw-osinfo-db-tools.spec.in | 1 -
>  osinfo-db-tools.spec.in   | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
> index 14e275c..2724257 100644
> --- a/mingw-osinfo-db-tools.spec.in
> +++ b/mingw-osinfo-db-tools.spec.in
> @@ -5,7 +5,6 @@ Version: @VERSION@
>  Release: 1%{?dist}%{?extra_release}
>  Summary: MinGW Windows port of a library for managing OS information for 
> virtualization
>  License: LGPLv2+
> -Group: Development/Libraries
>  Source: 
> https://releases.pagure.io/libosinfo/osinfo-db-tools-%{version}.tar.gz
>  URL: https://libosinfo.org
>  
> diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
> index c1b0659..7a12e85 100644
> --- a/osinfo-db-tools.spec.in
> +++ b/osinfo-db-tools.spec.in
> @@ -5,7 +5,6 @@ Name: osinfo-db-tools
>  Version: @VERSION@
>  Release: 1%{?dist}%{?extra_release}
>  License: GPLv2+
> -Group: Development/Libraries
>  Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
>  URL: https://libosinfo.org
>  BuildRequires: gcc
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db-tools PATCH 1/4] mingw: Use %find_lang macro

[Christophe Fergeau]

On Tue, Mar 05, 2019 at 10:42:26AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  mingw-osinfo-db-tools.spec.in | 10 ++
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
> index 486492f..14e275c 100644
> --- a/mingw-osinfo-db-tools.spec.in
> +++ b/mingw-osinfo-db-tools.spec.in
> @@ -74,22 +74,24 @@ information about operating systems for use with 
> virtualization
>  rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
>  rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
>  
> -%files -n mingw32-osinfo-db-tools
> +%find_lang osinfo-db-tools
> +grep "%{mingw32_datadir}" osinfo-db-tools.lang > mingw32-osinfo-db-tools.lang
> +grep "%{mingw64_datadir}" osinfo-db-tools.lang > mingw64-osinfo-db-tools.lang

Why not %mingw_find_lang ?

> +
> +%files -n mingw32-osinfo-db-tools -f mingw32-osinfo-db-tools.lang
>  %doc AUTHORS ChangeLog NEWS README
>  %license COPYING
>  %{mingw32_bindir}/osinfo-db-export.exe
>  %{mingw32_bindir}/osinfo-db-import.exe
>  %{mingw32_bindir}/osinfo-db-path.exe
>  %{mingw32_bindir}/osinfo-db-validate.exe
> -%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
>  
> -%files -n mingw64-osinfo-db-tools
> +%files -n mingw64-osinfo-db-tools -f mingw64-osinfo-db-tools.lang
>  %doc AUTHORS ChangeLog NEWS README
>  %license COPYING
>  %{mingw64_bindir}/osinfo-db-export.exe
>  %{mingw64_bindir}/osinfo-db-import.exe
>  %{mingw64_bindir}/osinfo-db-path.exe
>  %{mingw64_bindir}/osinfo-db-validate.exe
> -%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
>  
>  %changelog
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 2/4] media: Don't assume identifiers are null terminated

[Christophe Fergeau]

On Thu, Feb 14, 2019 at 11:05:39AM +0100, Fabiano Fidêncio wrote:
> On Thu, Feb 14, 2019 at 10:57 AM Christophe Fergeau 
> wrote:
> 
> > Hey,
> >
> > On Wed, Feb 13, 2019 at 08:19:25PM +0100, Fabiano Fidêncio wrote:
> > > Identifiers as volume-id, application, publisher, and system are not
> > > null terminated and cannot be assumed as so.
> > >
> > > By assuming those are null terminated strings, libosinfo ends up not
> > > counting the last character of a MAX_* string and, consequently, not
> > > properly identifying medias that have their identifiers with the MAX_*
> > > size.
> > >
> > > One example is the ubuntu-18.04.1.0-live-server-amd64.iso media, which
> > > has as volume-id 'Ubuntu-Server 18.04.1+ LTS amd64'. As the volume-id
> > > has exactly 32 characters it's never been matched as when reading the
> > > media's volume-id it'd be read as 'Ubuntu-Server 18.04.1+ LTS amd6'.
> >
> > I don't think we have any test case for that code, do we?
> >
> 
> We don't have any specific test case for this code. But the whole
> test-isodetect relies on this (and that's the way I found out the issue
> when adding the new test data).
> 
> Do you want a specific test for this or are you fine with the patch 4
> covering this case?

Ideally we would have a test case for this code, but this is just
something to add to the bottom of the project todo ;)

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 1/4] ubuntu: Improve the volume-id regex

[Christophe Fergeau]

On Thu, Feb 14, 2019 at 11:03:57AM +0100, Fabiano Fidêncio wrote:
> On Thu, Feb 14, 2019 at 10:46 AM Christophe Fergeau 
> wrote:
> 
> > On Wed, Feb 13, 2019 at 08:19:24PM +0100, Fabiano Fidêncio wrote:
> > > The first release of Ubuntu ISOs usually have their volume-id as, for
> > > instance:
> > > Ubuntu-Server 18.04 LTS amd64
> > >
> > > Whenever a new release is done, a new digit is added as, for instance:
> > > Ubuntu-Server 18.04.1 LTS amd64
> > >
> > > However, at least with 18.04, they had a new release for the server
> > > media that looks like:
> > > Ubuntu-Server 18.04.1+ LTS amd64
> > >
> > > This '+' addition breaks the current used regular expression to match
> > > the media's volume-id. In order to take a safer path, let's expand all
> > > the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead,
> > > being able then to also match the '+'.
> > >
> > > The command used to change all the entries is:
> > > sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.xml.in
> > >
> > > Signed-off-by: Fabiano Fidêncio 
> > > ---
> > >  data/os/ubuntu.com/ubuntu-10.04.xml.in |  4 ++--
> > >  data/os/ubuntu.com/ubuntu-12.04.xml.in |  8 
> > >  data/os/ubuntu.com/ubuntu-14.04.xml.in |  8 
> > >  data/os/ubuntu.com/ubuntu-14.10.xml.in |  8 
> > >  data/os/ubuntu.com/ubuntu-15.04.xml.in |  8 
> > >  data/os/ubuntu.com/ubuntu-15.10.xml.in |  8 
> > >  data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++---
> > >  data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++
> > >  data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++---
> > >  data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +--
> > >  data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 -
> > >  data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +--
> > >  data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 -
> > >  data/os/ubuntu.com/ubuntu-6.06.xml.in  | 28 +-
> > >  data/os/ubuntu.com/ubuntu-8.04.xml.in  | 12 +--
> > >  data/os/ubuntu.com/ubuntu-9.04.xml.in  |  8 
> >
> > A bunch of the older releases don't look for xx.yy.zz in the volume id,
> > but only for xx.yy. Your patch is missing these. It's not clear to me if
> > it's intentional that we don't have these matches for these releases, or
> > if it's just something that was overlooked.
> >
> 
> I guess it's been overlooked for a few years :-)
> I'll do the changes on those files as well to keep them as the others.
> 
> Do you want to see a v2 of this patch?

Feel free to push directly.

Christophe

> 
> [snip]


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 3/4] tests: Add ubuntu 18.04.1 test data

[Christophe Fergeau]

Feel free to squash 3/4 and 4/4

Reviewed-by: Christophe Fergeau 

On Wed, Feb 13, 2019 at 08:19:26PM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  .../ubuntu-18.04.1-desktop-amd64.iso.txt  | 29 +++
>  1 file changed, 29 insertions(+)
>  create mode 100644 
> tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt
> 
> diff --git 
> a/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt 
> b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt
> new file mode 100644
> index 000..f2ca3de
> --- /dev/null
> +++ b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Ubuntu 18.04.1 LTS amd64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, 
> LIBISOFS-1.2.4, LIBBURN-1.2.4
> +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: 953784
> +El Torito VD version 1 found, boot catalog is in sector 191
> +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 E3B56 932694
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 2/4] media: Don't assume identifiers are null terminated

[Christophe Fergeau]

Hey,

On Wed, Feb 13, 2019 at 08:19:25PM +0100, Fabiano Fidêncio wrote:
> Identifiers as volume-id, application, publisher, and system are not
> null terminated and cannot be assumed as so.
> 
> By assuming those are null terminated strings, libosinfo ends up not
> counting the last character of a MAX_* string and, consequently, not
> properly identifying medias that have their identifiers with the MAX_*
> size.
> 
> One example is the ubuntu-18.04.1.0-live-server-amd64.iso media, which
> has as volume-id 'Ubuntu-Server 18.04.1+ LTS amd64'. As the volume-id
> has exactly 32 characters it's never been matched as when reading the
> media's volume-id it'd be read as 'Ubuntu-Server 18.04.1+ LTS amd6'.

I don't think we have any test case for that code, do we?

> ---
>  osinfo/osinfo_media.c | 37 +++--
>  1 file changed, 23 insertions(+), 14 deletions(-)
> 
> diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
> index 9f77504..eaf67e2 100644
> --- a/osinfo/osinfo_media.c
> +++ b/osinfo/osinfo_media.c
> @@ -137,6 +137,11 @@ struct _CreateFromLocationAsyncData {
>  
>  gsize offset;
>  gsize length;
> +
> +gchar *volume;
> +gchar *system;
> +gchar *application;
> +gchar *publisher;
>  };
>  
>  static void create_from_location_async_data_free
> @@ -144,6 +149,10 @@ static void create_from_location_async_data_free
>  {
> g_object_unref(data->file);
> g_object_unref(data->res);
> +   g_free(data->volume);
> +   g_free(data->system);
> +   g_free(data->application);
> +   g_free(data->publisher);
>  
> g_slice_free(CreateFromLocationAsyncData, data);
>  }
> @@ -809,18 +818,18 @@ 
> create_from_location_async_data(CreateFromLocationAsyncData *data)
>  OSINFO_MEDIA_PROP_URL,
>  uri);
>  g_free(uri);
> -if (!is_str_empty(data->pvd.volume))
> +if (!is_str_empty(data->volume))
>  osinfo_entity_set_param(OSINFO_ENTITY(media),
>  OSINFO_MEDIA_PROP_VOLUME_ID,
> -data->pvd.volume);
> -if (!is_str_empty(data->pvd.system))
> +data->volume);
> +if (!is_str_empty(data->system))
>  osinfo_entity_set_param(OSINFO_ENTITY(media),
>  OSINFO_MEDIA_PROP_SYSTEM_ID,
> -data->pvd.system);
> -if (!is_str_empty(data->pvd.publisher))
> +data->system);
> +if (!is_str_empty(data->publisher))
>  osinfo_entity_set_param(OSINFO_ENTITY(media),
>  OSINFO_MEDIA_PROP_PUBLISHER_ID,
> -data->pvd.publisher);
> +data->publisher);
>  if (!is_str_empty(data->pvd.application))
>  osinfo_entity_set_param(OSINFO_ENTITY(media),
>  OSINFO_MEDIA_PROP_APPLICATION_ID,
> @@ -1159,19 +1168,19 @@ static void on_pvd_read(GObject *source,
>  return;
>  }
>  
> -data->pvd.volume[MAX_VOLUME - 1] = 0;
> -g_strchomp(data->pvd.volume);
> +data->volume = g_strndup(data->pvd.volume, MAX_VOLUME);
> +g_strchomp(data->volume);
>  
> -data->pvd.system[MAX_SYSTEM - 1] = 0;
> -g_strchomp(data->pvd.system);
> +data->system = g_strndup(data->pvd.system, MAX_SYSTEM);
> +g_strchomp(data->system);
>  
> -data->pvd.publisher[MAX_PUBLISHER - 1] = 0;
> -g_strchomp(data->pvd.publisher);
> +data->publisher = g_strndup(data->pvd.publisher, MAX_PUBLISHER);
> +g_strchomp(data->publisher);
>  
> -data->pvd.application[MAX_APPLICATION - 1] = 0;
> +data->application = g_strndup(data->pvd.application, MAX_APPLICATION);
>  g_strchomp(data->pvd.application);

This should be g_strchomp(data->application);

Reviewed-by: Christophe Fergeau 

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 1/4] ubuntu: Improve the volume-id regex

[Christophe Fergeau]

On Wed, Feb 13, 2019 at 08:19:24PM +0100, Fabiano Fidêncio wrote:
> The first release of Ubuntu ISOs usually have their volume-id as, for
> instance:
> Ubuntu-Server 18.04 LTS amd64
> 
> Whenever a new release is done, a new digit is added as, for instance:
> Ubuntu-Server 18.04.1 LTS amd64
> 
> However, at least with 18.04, they had a new release for the server
> media that looks like:
> Ubuntu-Server 18.04.1+ LTS amd64
> 
> This '+' addition breaks the current used regular expression to match
> the media's volume-id. In order to take a safer path, let's expand all
> the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead,
> being able then to also match the '+'.
> 
> The command used to change all the entries is:
> sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.xml.in
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/ubuntu.com/ubuntu-10.04.xml.in |  4 ++--
>  data/os/ubuntu.com/ubuntu-12.04.xml.in |  8 
>  data/os/ubuntu.com/ubuntu-14.04.xml.in |  8 
>  data/os/ubuntu.com/ubuntu-14.10.xml.in |  8 
>  data/os/ubuntu.com/ubuntu-15.04.xml.in |  8 
>  data/os/ubuntu.com/ubuntu-15.10.xml.in |  8 
>  data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++---
>  data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++
>  data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++---
>  data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +--
>  data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 -
>  data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +--
>  data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 -
>  data/os/ubuntu.com/ubuntu-6.06.xml.in  | 28 +-
>  data/os/ubuntu.com/ubuntu-8.04.xml.in  | 12 +--
>  data/os/ubuntu.com/ubuntu-9.04.xml.in  |  8 

A bunch of the older releases don't look for xx.yy.zz in the volume id,
but only for xx.yy. Your patch is missing these. It's not clear to me if
it's intentional that we don't have these matches for these releases, or
if it's just something that was overlooked.

These releases are:
ubuntu-10.10.xml.in
ubuntu-11.04.xml.in
ubuntu-11.10.xml.in
ubuntu-12.10.xml.in
ubuntu-13.04.xml.in
ubuntu-13.10.xml.in
ubuntu-4.10.xml.in
ubuntu-5.04.xml.in
ubuntu-5.10.xml.in
ubuntu-6.10.xml.in
ubuntu-7.04.xml.in
ubuntu-7.10.xml.in
ubuntu-8.10.xml.in
ubuntu-9.10.xml.in

Apart from this, looks good to me,
Reviewed-by: Christophe Fergeau 


>  16 files changed, 90 insertions(+), 90 deletions(-)
> 
> diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in 
> b/data/os/ubuntu.com/ubuntu-10.04.xml.in
> index 6a0d759..2a53801 100644
> --- a/data/os/ubuntu.com/ubuntu-10.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in
> @@ -32,7 +32,7 @@
>  
>
> http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso
>
> -Ubuntu 10.04(.\d)? LTS i386
> +Ubuntu 10.04(.\d\+?)? LTS i386
>  LINUX
>
>casper/vmlinuz
> @@ -41,7 +41,7 @@
>  
>
> http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso
>
> -Ubuntu 10.04(.\d)? LTS amd64
> +Ubuntu 10.04(.\d\+?)? LTS amd64
>  LINUX
>
>casper/vmlinuz
> diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in 
> b/data/os/ubuntu.com/ubuntu-12.04.xml.in
> index b81df0a..0093f16 100644
> --- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
> @@ -32,7 +32,7 @@
>  
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso
>
> -Ubuntu-Server 12.04(.\d)? LTS i386
> +Ubuntu-Server 12.04(.\d\+?)? LTS i386
>
>install/vmlinuz
>install/initrd.gz
> @@ -40,7 +40,7 @@
>  
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso
>
> -Ubuntu-Server 12.04(.\d)? LTS amd64
> +Ubuntu-Server 12.04(.\d\+?)? LTS amd64
>
>install/vmlinuz
>install/initrd.gz
> @@ -48,7 +48,7 @@
>  
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso
>
> -Ubuntu 12.04(.\d)? LTS i386
> +Ubuntu 12.04(.\d\+?)? LTS i386
>
>casper/vmlinuz
>casper/initrd.lz
> @@ -56,7 +56,7 @@
>  
>
> http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso
>
> -Ubuntu 12.04(.\d)? LTS amd64
> +Ubuntu 12.04(.\d\+?)? LTS amd64
>
>casper/vmlinuz
>casper/initrd.lz
> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in 
> b/data/os/ubuntu.com/ubuntu-14.04.xml.in
> index 40394bb..5e095b6 

Re: [Libosinfo] [libosinfo PATCH] media: Make _supports_installer_sript() aware of media installers

[Christophe Fergeau]

I'd add a call to osinfo_media_supports_installer_script to
test_loaded_installer_script

Apart from this,
Acked-by: Christophe Fergeau 

On Thu, Feb 07, 2019 at 08:39:17AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
> This has been written atop of
> https://www.redhat.com/archives/libosinfo/2019-February/msg00028.html
> ---
>  osinfo/osinfo_media.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
> index 6720736..9f77504 100644
> --- a/osinfo/osinfo_media.c
> +++ b/osinfo/osinfo_media.c
> @@ -1661,7 +1661,8 @@ gboolean 
> osinfo_media_supports_installer_script(OsinfoMedia *media)
>  os = osinfo_media_get_os(media);
>  list = osinfo_os_get_install_script_list(os);
>  
> -if (osinfo_list_get_length(OSINFO_LIST(list)) == 0) {
> +if (osinfo_list_get_length(OSINFO_LIST(list)) == 0 &&
> +osinfo_list_get_length(OSINFO_LIST(media->priv->scripts)) == 0) {
>  ret = FALSE;
>  goto cleanup;
>  }
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 1/3] schema: Add installer to the media

[Christophe Fergeau]

On Wed, Feb 06, 2019 at 04:54:06PM +0100, Fabiano Fidêncio wrote:
> Having the instsaller tied to the OS is something that has been shown

s/instsaller/installer
Apart from this, the series looks good to me,

Acked-by: Christophe Fergeau 

> not optimal, unfortunately.
> 
> An OS may have a few different medias and each media may support a
> specific type of script or, even, not support an installer script at
> all. With this in mind, let's have the installer scripts tied to the
> medias themselves.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  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 5e6f5e7..6fc03a1 100644
> --- a/data/schema/osinfo.rng.in
> +++ b/data/schema/osinfo.rng.in
> @@ -412,6 +412,11 @@
>  
>
>  
> +
> +  
> +
> +  
> +
>
>  
>
> -- 
> 2.20.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 2/5] Revert "centos7: Remove "upgrades" field"

[Christophe Fergeau]

On Wed, Jan 09, 2019 at 11:42:31AM +0100, Fabiano Fidêncio wrote:
> The upgrade feature does *not* inidcate whether the upgrade path is
> supported or not. It indicates that this realease is considered a newer
> version than the listed versions.

'indicate', 'release'

> 
> This reverts commit 335cd8c70e0edadaaa1b5aefa8f138b5839a9639.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/centos.org/centos-7.0.xml.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/data/os/centos.org/centos-7.0.xml.in 
> b/data/os/centos.org/centos-7.0.xml.in
> index c3f45a2..20422f2 100644
> --- a/data/os/centos.org/centos-7.0.xml.in
> +++ b/data/os/centos.org/centos-7.0.xml.in
> @@ -8,6 +8,7 @@
>  <_vendor>CentOS
>  linux
>  centos
> +http://centos.org/centos/6.5"/>

Shouldn't it be latest centos 6 release though?
For the revert, 
Acked-by: Christophe Fergeau 
as this can be done in another commit

Christophe

>  http://redhat.com/rhel/7.6"/>
>  
>  2014-07-07
> -- 
> 2.19.2
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH] centos7: Remove "upgrades" field

[Christophe Fergeau]

On Fri, Jan 04, 2019 at 01:39:50PM +0100, Fabiano Fidêncio wrote:
> After a conversation with Fabian Arrotin, from CentOS project, I've
> learned that there's no supported upgrade from CentOS 6 to CentOS7.
> 
> Knowing that, let's just drop the "upgrades" field from centos7 entry.

Fine with me, thanks for figuring this out,

Acked-by: Christophe Fergeau 

Christophe

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/centos.org/centos-7.0.xml.in | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/data/os/centos.org/centos-7.0.xml.in 
> b/data/os/centos.org/centos-7.0.xml.in
> index 20422f2..c3f45a2 100644
> --- a/data/os/centos.org/centos-7.0.xml.in
> +++ b/data/os/centos.org/centos-7.0.xml.in
> @@ -8,7 +8,6 @@
>  <_vendor>CentOS
>  linux
>  centos
> -http://centos.org/centos/6.5"/>
>  http://redhat.com/rhel/7.6"/>
>  
>  2014-07-07
> -- 
> 2.19.2
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 1/4] dragonflybsd: Fix release date

[Christophe Fergeau]

for the series, 
Acked-by: Christophe Fergeau 

On Thu, Jan 03, 2019 at 04:20:32PM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/dragonflybsd.org/dragonflybsd-5.4.0.xml.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/data/os/dragonflybsd.org/dragonflybsd-5.4.0.xml.in 
> b/data/os/dragonflybsd.org/dragonflybsd-5.4.0.xml.in
> index fe0af87..23e32c4 100644
> --- a/data/os/dragonflybsd.org/dragonflybsd-5.4.0.xml.in
> +++ b/data/os/dragonflybsd.org/dragonflybsd-5.4.0.xml.in
> @@ -10,7 +10,7 @@
>  <_vendor>DragonFlyBSD Project
>  http://dragonflybsd.org/dragonflybsd/5.4.0"/>
>  
> -2018-12-02
> +2018-12-03
>  
>  
> 2.19.2
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH] centos7: adjust "clones" to 7.6

[Christophe Fergeau]

On Thu, Jan 03, 2019 at 11:10:52AM +0100, Fabiano Fidêncio wrote:
> Latest CentOS7 clones the Latest RHEL7, which is 7.6 (instead of 7.5).

Ok,
Reviewed-by: Christophe Fergeau 
Do upgrades from centos 6.5 to latest centos7 still work? :)

Christophe

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/centos.org/centos-7.0.xml.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/data/os/centos.org/centos-7.0.xml.in 
> b/data/os/centos.org/centos-7.0.xml.in
> index 0971c22..abca580 100644
> --- a/data/os/centos.org/centos-7.0.xml.in
> +++ b/data/os/centos.org/centos-7.0.xml.in
> @@ -10,7 +10,7 @@
>  linux
>  centos
>  http://centos.org/centos/6.5"/>
> -http://redhat.com/rhel/7.5"/>
> +http://redhat.com/rhel/7.6"/>
>  
>  2014-07-07
>  
> -- 
> 2.19.2
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH] loader: refuse to load non-compliant named files

[Christophe Fergeau]

Hey, looks good to me,

Acked-by: Christophe Fergeau 

On Thu, Jan 03, 2019 at 03:56:27PM +0100, Fabiano Fidêncio wrote:
> There was a period of grace needed for backwards compatibility. After 3+
> years, we can safely remove the code instroduced as part of 09ae3cf09
> (which was released on 0.3.0).
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_loader.c | 15 +++
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
> index 77ca5ea..372871e 100644
> --- a/osinfo/osinfo_loader.c
> +++ b/osinfo/osinfo_loader.c
> @@ -523,6 +523,7 @@ static gboolean osinfo_loader_check_id(const gchar 
> *relpath,
>  gchar *reldir;
>  gboolean extension;
>  gsize i;
> +gboolean ret = FALSE;
>  
>  if (!relpath)
>  return TRUE;
> @@ -555,17 +556,15 @@ static gboolean osinfo_loader_check_id(const gchar 
> *relpath,
>  if (!g_str_equal(extension ? reldir : relpath, name)) {
>  g_warning("Entity %s should be in file %s not %s",
>id, name, extension ? reldir : relpath);
> -g_free(reldir);
> -g_free(name);
> -return TRUE; /* In future switch to FALSE to refuse
> -  * to load non-compliant named files.
> -  * Need a period of grace for backcompat
> -  * first though... Switch ETA Jan 2017
> -  */
> +goto cleanup;
>  }
> +
> +ret = TRUE;
> +
> + cleanup:
>  g_free(reldir);
>  g_free(name);
> -return TRUE;
> +return ret;
>  }
>  
>  
> -- 
> 2.19.2
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] endlessos: Add Endless OS 3.4

[Christophe Fergeau]

On Thu, Dec 20, 2018 at 12:12:47PM +0100, Fabiano Fidêncio wrote:
> > The changes in the commit message or in the language-map?
> > 
> > As I mentioned previously, the images are not the same. If I want to
> > test a specific app, It might be included in the Mexican version and
> > not in the Guatemalan, even though both share the same language.
> 
> The commit message changes.
> Christophe, are you okay with the changes in the commit message
> considering Felipe's explanation?
> 
> If yes, I'll add the changes, check the tests and push the patches.
> 

Still not 100% clear to me if each image listed in that commit has a
unique set of apps compared to the others, or if some are just different
language variations of the same image.
But for now, it's probably fine to go with different variants, we can
always adjust if needed.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH v2 0/2] tree: cleanup non-fatal errors

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Mon, Dec 10, 2018 at 03:52:42PM +0100, Fabiano Fidêncio wrote:
> The first patch just cleanups a little bit load_key_info(), preparing
> the field for the second patch.
> 
> The second patch cleanups the non-fatal errors.
> 
> - Changes since v1:
>   https://www.redhat.com/archives/libosinfo/2018-December/msg0.html
>   - Addressed Christophe's comments
> 
> Fabiano Fidêncio (2):
>   tree: cleanup load_key_info()
>   tree: cleanup non-fatal errors in load_key_info()
> 
>  osinfo/osinfo_tree.c | 70 ++--
>  1 file changed, 42 insertions(+), 28 deletions(-)
> 
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH v2 2/2] tree: cleanup non-fatal errors in load_key_info()

[Christophe Fergeau]

On Mon, Dec 10, 2018 at 03:52:44PM +0100, Fabiano Fidêncio wrote:
> There are errors which are not fatal and just ignored in load_keyinfo.
> However, as those have not been cleaned up, we could see messages like:
> (lt-osinfo-detect:20658): GLib-WARNING **: GError set over the top of a
> previous GError or uninitialized memory.
> This indicates a bug in someone's code. You must ensure an error is NULL
> before it's set.
> The overwriting error message was: Key file does not have key “boot.iso”
> in group “images-x86_64”
> 
> In order to avoid this, let's just call g_clear_error() after an
> situations where an error may have been set but it can just be ignored.

Extra 'an' I think ('an situations')

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_tree.c | 7 +++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
> index de53714..52b3474 100644
> --- a/osinfo/osinfo_tree.c
> +++ b/osinfo/osinfo_tree.c
> @@ -526,21 +526,25 @@ static OsinfoTree *load_keyinfo(const gchar *location,
>  if (!(family = g_key_file_get_string(file, "general", "family", error))) 
> {
>  if (!is_unknown_group_or_key_error(*error))
>  goto cleanup;
> +g_clear_error(error);
>  }
>  
>  if (!(variant = g_key_file_get_string(file, "general", "variant", 
> error))) {
>  if (!is_unknown_group_or_key_error(*error))
>  goto cleanup;
> +g_clear_error(error);
>  }
>  
>  if (!(version = g_key_file_get_string(file, "general", "version", 
> error))) {
>  if (!is_unknown_group_or_key_error(*error))
>  goto cleanup;
> +g_clear_error(error);
>  }
>  
>  if (!(arch = g_key_file_get_string(file, "general", "arch", error))) {
>  if (!is_unknown_group_or_key_error(*error))
>  goto cleanup;
> +g_clear_error(error);
>  }
>  
>  
> @@ -550,16 +554,19 @@ static OsinfoTree *load_keyinfo(const gchar *location,
>  if (!(kernel = g_key_file_get_string(file, group, "kernel", error))) 
> {
>  if (!is_unknown_group_or_key_error(*error))
>  goto cleanup;
> +g_clear_error(error);
>  }
>  
>  if (!(initrd = g_key_file_get_string(file, group, "initrd", error))) 
> {
>  if (!is_unknown_group_or_key_error(*error))
>  goto cleanup;
> +g_clear_error(error);
>  }
>  
>  if (!(bootiso = g_key_file_get_string(file, group, "boot.iso", 
> error))) {
>  if (!is_unknown_group_or_key_error(*error))
>  goto cleanup;
> +g_clear_error(error);
>  }
>  }
>  
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH] os: Fix _find_install_script() annotation

[Christophe Fergeau]

On Mon, Dec 10, 2018 at 03:15:54PM +0100, Fabiano Fidêncio wrote:
> osinfo_os_find_install_script() returns an object which its ownsership
> is not transferred.

'which ownership is not transferred" I think.

Acked-by: Christophe Fergeau 

Christophe

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_os.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
> index 02c1415..d69dd9f 100644
> --- a/osinfo/osinfo_os.c
> +++ b/osinfo/osinfo_os.c
> @@ -996,7 +996,7 @@ void osinfo_os_add_maximum_resources(OsinfoOs *os,
>   * @profile: the install script profile that must be either
>   * OSINFO_INSTALL_SCRIPT_PROFILE_DESKTOP or 
> OSINFO_INSTALL_SCRIPT_PROFILE_JEOS
>   *
> - * Returns: (transfer full): A new #OsinfoInstallScript for the @os @profile
> + * Returns: (transfer none): A new #OsinfoInstallScript for the @os @profile
>   */
>  OsinfoInstallScript *osinfo_os_find_install_script(OsinfoOs *os, const gchar 
> *profile)
>  {
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 2/3] test-os: Cover osinfo_tree_has_treeinfo()

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Mon, Dec 10, 2018 at 01:37:36PM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  .../dbdata/os/fedoraproject.org/fedora-16.xml |  4 +++
>  tests/test-os.c   | 29 ++-
>  2 files changed, 25 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/dbdata/os/fedoraproject.org/fedora-16.xml 
> b/tests/dbdata/os/fedoraproject.org/fedora-16.xml
> index c67ce23..758c45a 100644
> --- a/tests/dbdata/os/fedoraproject.org/fedora-16.xml
> +++ b/tests/dbdata/os/fedoraproject.org/fedora-16.xml
> @@ -28,5 +28,9 @@
>  i386
>
>  
> +
> +
> +  
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/x86_64/os/
> +
>
>  
> diff --git a/tests/test-os.c b/tests/test-os.c
> index 1756e59..7c0a198 100644
> --- a/tests/test-os.c
> +++ b/tests/test-os.c
> @@ -70,6 +70,8 @@ test_loader(void)
>  OsinfoTreeList *treelist;
>  OsinfoTree *tree;
>  GError *error = NULL;
> +gsize i = 0;
> +gint treelist_len;
>  const char *str;
>  
>  loader = osinfo_loader_new();
> @@ -131,14 +133,25 @@ test_loader(void)
>  str = osinfo_product_get_short_id(OSINFO_PRODUCT(os));
>  g_assert_cmpstr(str, ==, "fedora16");
>  treelist = osinfo_os_get_tree_list(os);
> -g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(treelist)), ==, 1);
> -tree = OSINFO_TREE(osinfo_list_get_nth(OSINFO_LIST(treelist), 0));
> -str = osinfo_tree_get_treeinfo_family(tree);
> -g_assert_cmpstr(str, ==, "Fedora");
> -str = osinfo_tree_get_treeinfo_version(tree);
> -g_assert_cmpstr(str, ==, "16");
> -str = osinfo_tree_get_treeinfo_arch(tree);
> -g_assert_cmpstr(str, ==, "i386");
> +treelist_len = osinfo_list_get_length(OSINFO_LIST(treelist));
> +g_assert_cmpint(treelist_len, ==, 2);
> +
> +for (i = 0; i < treelist_len; i++) {
> +tree = OSINFO_TREE(osinfo_list_get_nth(OSINFO_LIST(treelist), i));
> +
> +str = osinfo_tree_get_architecture(tree);
> +if (g_str_equal(str, "i686")) {
> +g_assert_true(osinfo_tree_has_treeinfo(tree));
> +str = osinfo_tree_get_treeinfo_family(tree);
> +g_assert_cmpstr(str, ==, "Fedora");
> +str = osinfo_tree_get_treeinfo_version(tree);
> +g_assert_cmpstr(str, ==, "16");
> +str = osinfo_tree_get_treeinfo_arch(tree);
> +g_assert_cmpstr(str, ==, "i386");
> +} else {
> +g_assert_false(osinfo_tree_has_treeinfo(tree));
> +}
> +}
>  
>  g_object_unref(loader);
>  }
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 3/3] db: improve _guess_os_from_tree checks

[Christophe Fergeau]

On Mon, Dec 10, 2018 at 02:05:06PM +0100, Fabiano Fidêncio wrote:
> On Mon, Dec 10, 2018 at 1:57 PM Christophe Fergeau  
> wrote:
> >
> > Hey,
> >
> > On Sun, Dec 02, 2018 at 04:37:59PM +0100, Fabiano Fidêncio wrote:
> > > Do not check against a distro that has all the treeinfo attribute as
> > > NULL as match_regex() would just match whatever we compare to it.
> >
> > When can this happen?
> 
> When testing *any* distro :-)
> 
> For instance, in osinfo_db_guess_from_os_tree() we go through the list
> of OSes testing against the one we passed, right? So, here the one
> passed is the "regex" for the match_regex() and the info we get from
> the OS is the "pattern".
> Considering this ... we end up testing, for instance, against Fedora 6
> which doesn't have the treeinfo fields. Then, if you take a look at
> match_regex() code, you'll find out that we just return "true" in case
> the pattern is NULL.
> 
> So, in the end, we should only try to match the treeinfo when the
> system we're trying to match to provides treeinfo.

I believe this last paragraph is what I was asking :) If we are trying
to match something which does not have treeinfo defined, we'll be
getting NULL for all the calls (and what I was trying to understand was
if we would be getting NULL values only in odd/invalid databases, or
even in the nominal case, now I understand it's the latter).

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 3/3] db: improve _guess_os_from_tree checks

[Christophe Fergeau]

On Mon, Dec 10, 2018 at 01:37:37PM +0100, Fabiano Fidêncio wrote:
> From: Fabiano Fidêncio 
> 
> Do not check against a distro that has all the treeinfo attribute as
> NULL as match_regex() would just match whatever we compare to it.

I'd rework the commit log a bit now that it uses
osinfo_tree_has_treeinfo();

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_db.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index fa14c6d..bf73e25 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -763,6 +763,9 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
>  const gchar *os_version = 
> osinfo_tree_get_treeinfo_version(os_tree);
>  const gchar *os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
>  
> +if (!osinfo_tree_has_treeinfo(os_tree))
> +continue;

and here, we first assume treeinfo is available by calling
osinfo_tree_get_treeinfo_*, and then we check if the ostree actually has
treeinfo. I'd move the osinfo_tree_get_treeinfo_* calls later.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 2/3] test-os: expand test_loader() to cover loading treeinfo

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Sun, Dec 02, 2018 at 04:37:58PM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  tests/dbdata/os/fedoraproject.org/fedora-16.xml |  9 +
>  tests/test-os.c | 18 ++
>  2 files changed, 27 insertions(+)
> 
> diff --git a/tests/dbdata/os/fedoraproject.org/fedora-16.xml 
> b/tests/dbdata/os/fedoraproject.org/fedora-16.xml
> index 88ef431..c67ce23 100644
> --- a/tests/dbdata/os/fedoraproject.org/fedora-16.xml
> +++ b/tests/dbdata/os/fedoraproject.org/fedora-16.xml
> @@ -19,5 +19,14 @@
>isolinux/vmlinuz
>isolinux/initrd.img
>  
> +
> +
> +  
> http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/i386/os/
> +  
> +Fedora
> +16
> +i386
> +  
> +
>
>  
> diff --git a/tests/test-os.c b/tests/test-os.c
> index 0b586b2..1756e59 100644
> --- a/tests/test-os.c
> +++ b/tests/test-os.c
> @@ -67,6 +67,8 @@ test_loader(void)
>  OsinfoLoader *loader;
>  OsinfoDb *db;
>  OsinfoOs *os;
> +OsinfoTreeList *treelist;
> +OsinfoTree *tree;
>  GError *error = NULL;
>  const char *str;
>  
> @@ -124,6 +126,20 @@ test_loader(void)
>"*(osinfo_entity_get_param_value_enum): should not 
> be reached*");
>  g_assert_cmpint(osinfo_os_get_release_status(os), ==, 
> OSINFO_RELEASE_STATUS_RELEASED);
>  
> +os = osinfo_db_get_os(db, "http://fedoraproject.org/fedora/16;);
> +g_assert_nonnull(os);
> +str = osinfo_product_get_short_id(OSINFO_PRODUCT(os));
> +g_assert_cmpstr(str, ==, "fedora16");
> +treelist = osinfo_os_get_tree_list(os);
> +g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(treelist)), ==, 1);
> +tree = OSINFO_TREE(osinfo_list_get_nth(OSINFO_LIST(treelist), 0));
> +str = osinfo_tree_get_treeinfo_family(tree);
> +g_assert_cmpstr(str, ==, "Fedora");
> +str = osinfo_tree_get_treeinfo_version(tree);
> +g_assert_cmpstr(str, ==, "16");
> +str = osinfo_tree_get_treeinfo_arch(tree);
> +g_assert_cmpstr(str, ==, "i386");
> +
>  g_object_unref(loader);
>  }
>  
> @@ -908,6 +924,8 @@ main(int argc, char *argv[])
>  osinfo_filter_get_type();
>  osinfo_resources_get_type();
>  osinfo_resourceslist_get_type();
> +osinfo_tree_get_type();
> +osinfo_treelist_get_type();
>  
>  return g_test_run();
>  }
> -- 
> 1.8.3.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 3/3] db: improve _guess_os_from_tree checks

[Christophe Fergeau]

Hey,

On Sun, Dec 02, 2018 at 04:37:59PM +0100, Fabiano Fidêncio wrote:
> Do not check against a distro that has all the treeinfo attribute as
> NULL as match_regex() would just match whatever we compare to it.

When can this happen?

Christophe

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_db.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
> index fa14c6d..3bdc4c8 100644
> --- a/osinfo/osinfo_db.c
> +++ b/osinfo/osinfo_db.c
> @@ -763,6 +763,9 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
>  const gchar *os_version = 
> osinfo_tree_get_treeinfo_version(os_tree);
>  const gchar *os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
>  
> +if (os_family == NULL && os_variant == NULL && os_version == 
> NULL && os_arch == NULL)
> +continue;
> +
>  if (match_regex(os_family, tree_family) &&
>  match_regex(os_variant, tree_variant) &&
>  match_regex(os_version, tree_version) &&
> -- 
> 1.8.3.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 1/3] loader: properly load the treeinfo attributes

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

(and since "treeinfo-" is a compile-time constant, gcc should be able to
replace this with 9 at compile-time).

On Sun, Dec 02, 2018 at 04:37:57PM +0100, Fabiano Fidêncio wrote:
> treeinfo attributes haven't been loaded properly due to the change done
> in ab2ab35f, changing the hardcoded 9 to sizeof("treeinfo-").
> 
> The problem here is that size("treeinfo-") is 10, causing that any
> comparison to fail.
> 
> Let's change the sizeof("treeinfo-") to strlen("treeinfo-").
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_loader.c | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
> index 030062b..b6b6bd2 100644
> --- a/osinfo/osinfo_loader.c
> +++ b/osinfo/osinfo_loader.c
> @@ -1222,22 +1222,22 @@ static OsinfoTree *osinfo_loader_tree(OsinfoLoader 
> *loader,
>  continue;
>  
>  if (g_str_equal((const gchar *)nodes[i]->name,
> -OSINFO_TREE_PROP_TREEINFO_FAMILY + 
> sizeof("treeinfo-")))
> +OSINFO_TREE_PROP_TREEINFO_FAMILY + 
> strlen("treeinfo-")))
>  osinfo_entity_set_param(OSINFO_ENTITY(tree),
>  OSINFO_TREE_PROP_TREEINFO_FAMILY,
>  (const gchar 
> *)nodes[i]->children->content);
>  else if (g_str_equal((const gchar *)nodes[i]->name,
> - OSINFO_TREE_PROP_TREEINFO_VARIANT + 
> sizeof("treeinfo-")))
> + OSINFO_TREE_PROP_TREEINFO_VARIANT + 
> strlen("treeinfo-")))
>  osinfo_entity_set_param(OSINFO_ENTITY(tree),
>  OSINFO_TREE_PROP_TREEINFO_VARIANT,
>  (const gchar 
> *)nodes[i]->children->content);
>  else if (g_str_equal((const gchar *)nodes[i]->name,
> - OSINFO_TREE_PROP_TREEINFO_VERSION + 
> sizeof("treeinfo-")))
> + OSINFO_TREE_PROP_TREEINFO_VERSION + 
> strlen("treeinfo-")))
>  osinfo_entity_set_param(OSINFO_ENTITY(tree),
>  OSINFO_TREE_PROP_TREEINFO_VERSION,
>  (const gchar 
> *)nodes[i]->children->content);
>  else if (g_str_equal((const gchar *)nodes[i]->name,
> - OSINFO_TREE_PROP_TREEINFO_ARCH + 
> sizeof("treeinfo-")))
> + OSINFO_TREE_PROP_TREEINFO_ARCH + 
> strlen("treeinfo-")))
>  osinfo_entity_set_param(OSINFO_ENTITY(tree),
>  OSINFO_TREE_PROP_TREEINFO_ARCH,
>  (const gchar 
> *)nodes[i]->children->content);
> -- 
> 1.8.3.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH] tree: cleanup non-fatal errors

[Christophe Fergeau]

Hey,

On Sat, Dec 01, 2018 at 09:54:21AM +0100, Fabiano Fidêncio wrote:
> There are errors which are not fatal and just ignored in load_keyinfo.
> However, as those have not been cleaned up, we could see messages like:
> (lt-osinfo-detect:20658): GLib-WARNING **: GError set over the top of a
> previous GError or uninitialized memory.
> This indicates a bug in someone's code. You must ensure an error is NULL
> before it's set.
> The overwriting error message was: Key file does not have key “boot.iso”
> in group “images-x86_64”
> 
> In order to avoid this, let's just call g_clear_error() after an
> situations where an error may have been set but it can just be ignored.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_tree.c | 8 
>  1 file changed, 8 insertions(+)
> 
> diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
> index da01c8b..3082eab 100644
> --- a/osinfo/osinfo_tree.c
> +++ b/osinfo/osinfo_tree.c
> @@ -491,26 +491,31 @@ static OsinfoTree *load_keyinfo(const gchar *location,
>  if (!g_key_file_load_from_data(file, content, length,
> G_KEY_FILE_NONE, error))
>  goto cleanup;
> +g_clear_error(error);

I don't think we'll be getting a non-NULL *error when
g_key_file_load_from_data() returns success, so this g_clear_error() is
a bit odd. I'd remove it, or use a g_warn_if_fail() if this could really
happen.

>  
>  if (!(family = g_key_file_get_string(file, "general", "family", error)) 
> &&
>  (*error && (*error)->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&
>   (*error)->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND))
>  goto cleanup;
> +g_clear_error(error);

3 slight imperfections with that code (all theoritical issues):
- if g_key_file_get_string() is sucessful, we still attempt to clean-up
  the GError, I don't think this should ever happen
- the existing code is not checking the error domain, so if
  g_key_file_get_string was returning errors from different domains, we
  could mistakenly ignore errors
- if family is NULL but *error is NULL too, we'd ignore the failure, I
  think this is an oversight in the way the code is written

Maybe something like this patch would be better:
(potentially split in a preparatory one + your patch on top)

diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index da01c8ba..e1d86caa 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -472,6 +472,12 @@ static gboolean is_str_empty(const gchar *str) {
 }


+static gboolean is_unknown_group_or_key_error(const GError *error)
+{
+return (g_error_matches(error, G_KEY_FILE_ERROR, 
G_KEY_FILE_ERROR_KEY_NOT_FOUND) ||
+g_error_matches(error, G_KEY_FILE_ERROR, 
G_KEY_FILE_ERROR_GROUP_NOT_FOUND));
+}
+
 static OsinfoTree *load_keyinfo(const gchar *location,
 const gchar *content,
 gsize length,
@@ -488,48 +494,63 @@ static OsinfoTree *load_keyinfo(const gchar *location,
 gchar *bootiso = NULL;
 gchar *group = NULL;

+g_return_val_if_fail(error != NULL, NULL);
+
 if (!g_key_file_load_from_data(file, content, length,
G_KEY_FILE_NONE, error))
 goto cleanup;

-if (!(family = g_key_file_get_string(file, "general", "family", error)) &&
-(*error && (*error)->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&
- (*error)->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND))
-goto cleanup;
+if (!(family = g_key_file_get_string(file, "general", "family", error))) {
+if (!is_unknown_group_or_key_error(*error))
+goto cleanup;
+else
+g_clear_error(error);
+}

-if (!(variant = g_key_file_get_string(file, "general", "variant", error)) 
&&
-(*error && (*error)->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&
- (*error)->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND))
-goto cleanup;
+if (!(variant = g_key_file_get_string(file, "general", "variant", error))) 
{
+if (!is_unknown_group_or_key_error(*error))
+goto cleanup;
+else
+g_clear_error(error);
+}

-if (!(version = g_key_file_get_string(file, "general", "version", error)) 
&&
-(*error && (*error)->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&
- (*error)->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND))
-goto cleanup;
-
-if (!(arch = g_key_file_get_string(file, "general", "arch", error)) &&
-(*error && (*error)->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND &&
- (*error)->code != G_KEY_FILE_ERROR_GROUP_NOT_FOUND))
-goto cleanup;
+if (!(version = g_key_file_get_string(file, "general", "version", error))) 
{
+if (!is_unknown_group_or_key_error(*error))
+goto cleanup;
+else
+g_clear_error(error);
+}

+if (!(arch = g_key_file_get_string(file, "general", "arch", error))) {
+if (!is_unknown_group_or_key_error(*error))
+

Re: [Libosinfo] [libosinfo PATCH 3/3] test-os: Add tests for osinfo_os_find_install_script()

[Christophe Fergeau]

I was about to ask about this when seeing the first patch ;)
For what it's worth, I made some slight changes to an existing test in
order to test your changes (before seeing this patch ;), wondering if
this could be useful (I think the only difference is that it adds testing for
 tags in the database)

For your test,
Acked-by: Christophe Fergeau 

The changes I made:

diff --git a/tests/dbdata/os/fedoraproject.org/fedora-16.xml 
b/tests/dbdata/os/fedoraproject.org/fedora-16.xml
index 88ef4319..90ba9a86 100644
--- a/tests/dbdata/os/fedoraproject.org/fedora-16.xml
+++ b/tests/dbdata/os/fedoraproject.org/fedora-16.xml
@@ -19,5 +19,8 @@
   isolinux/vmlinuz
   isolinux/initrd.img
 
+
+  

Re: [Libosinfo] [libosinfo PATCH 2/3] os: Deal with a NULL profile on _find_install_script()

[Christophe Fergeau]

On Fri, Nov 23, 2018 at 01:49:54PM +0100, Fabiano Fidêncio wrote:
> Let's ensure we're not going to crash in case a NULL profile is passed
> for osinfo_find_install_script().
> 
> Also, document which are the expected values for @profile
> ---
>  osinfo/osinfo_os.c | 16 
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
> index 9328820..314b4d8 100644
> --- a/osinfo/osinfo_os.c
> +++ b/osinfo/osinfo_os.c
> @@ -956,17 +956,25 @@ void osinfo_os_add_maximum_resources(OsinfoOs *os,
>  /**
>   * osinfo_os_find_install_script:
>   * @os:  an operating system
> - * @profile: the install script profile
> + * @profile: the install script profile that must be either
> + * OSINFO_INSTALL_SCRIPT_PROFILE_DESKTOP or 
> OSINFO_INSTALL_SCRIPT_PROFILE_JEOS
>   *
>   * Returns: (transfer full): A new #OsinfoInstallScript for the @os @profile
>   */
>  OsinfoInstallScript *osinfo_os_find_install_script(OsinfoOs *os, const gchar 
> *profile)
>  {
> -g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
> -GList *scripts = 
> osinfo_list_get_elements(OSINFO_LIST(os->priv->scripts));
> -GList *tmp = scripts;
> +GList *scripts;
> +GList *tmp;
>  OsinfoInstallScript *script = NULL;
>  
> +g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
> +
> +scripts = osinfo_list_get_elements(OSINFO_LIST(os->priv->scripts));
> +tmp = scripts;
> +
> +if (profile == NULL)
> +return script;
> +

Since 'NULL' is not a valid value, shouldn't this be
g_return_val_if_fail (profile != NULL, NULL);
?

>  while (tmp) {
>  script = tmp->data;
>  if (g_str_equal(profile, osinfo_install_script_get_profile(script)))
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH 1/3] os: Fix typo in _find_install_script()

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Fri, Nov 23, 2018 at 01:49:53PM +0100, Fabiano Fidêncio wrote:
> osinfo_find_install_script() doesn't work as expected due to a typo when
> getting the elements of the script list as an OsinfoList must be passed
> instead of an OsinfoOs.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_os.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
> index 303fe73..9328820 100644
> --- a/osinfo/osinfo_os.c
> +++ b/osinfo/osinfo_os.c
> @@ -963,7 +963,7 @@ void osinfo_os_add_maximum_resources(OsinfoOs *os,
>  OsinfoInstallScript *osinfo_os_find_install_script(OsinfoOs *os, const gchar 
> *profile)
>  {
>  g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
> -GList *scripts = osinfo_list_get_elements(OSINFO_LIST(os));
> +GList *scripts = 
> osinfo_list_get_elements(OSINFO_LIST(os->priv->scripts));
>  GList *tmp = scripts;
>  OsinfoInstallScript *script = NULL;
>  
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

[Libosinfo] [libosinfo] build: Use EXTRA_..._DEPENDENCIES rather than _DEPENDENCIES

[Christophe Fergeau]

This allows us to use the dependencies automatically generated by
automake while appending the additional one that we need.

https://www.gnu.org/software/automake/manual/automake.html#index-EXTRA_005fmaude_005fDEPENDENCIES-1

« The EXTRA_*_DEPENDENCIES variable may be useful for cases where you
merely want to augment the automake-generated _DEPENDENCIES variable
rather than replacing it. »

Signed-off-by: Christophe Fergeau 
---
 osinfo/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
index 5749c597..a9a65427 100644
--- a/osinfo/Makefile.am
+++ b/osinfo/Makefile.am
@@ -36,7 +36,7 @@ libosinfo_1_0_la_LDFLAGS = \
 -version-info $(LIBOSINFO_VERSION_INFO) \
$(NO_UNDEFINED_FLAGS)
 
-libosinfo_1_0_la_DEPENDENCIES = libosinfo.syms libosinfo-impl.la
+EXTRA_libosinfo_1_0_la_DEPENDENCIES = libosinfo.syms
 
 noinst_LTLIBRARIES = libosinfo-impl.la
 
-- 
2.19.1

___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH v2 1/2] osinfo: Create an intermediate convenience library

[Christophe Fergeau]

On Wed, Nov 21, 2018 at 09:08:05AM +, Daniel P. Berrangé wrote:
> On Wed, Nov 21, 2018 at 09:44:47AM +0100, Christophe Fergeau wrote:
> > > -nodist_libosinfo_1_0_la_SOURCES =\
> > > +nodist_libosinfo_impl_la_SOURCES =   \
> > >osinfo_enum_types.c\
> > >$(NULL)
> > >  
> > > +lib_LTLIBRARIES = libosinfo-1.0.la
> > > +
> > > +libosinfo_1_0_la_SOURCES =
> > > +
> > > +libosinfo_1_0_la_LIBADD = libosinfo-impl.la
> > > +libosinfo_1_0_la_LIBADD += $(libosinfo_impl_la_LIBADD)
> > > +
> > > +libosinfo_1_0_la_LDFLAGS = \
> > > + $(COVERAGE_LDFLAGS) \
> > > + $(VERSION_SCRIPT_FLAGS)$(LIBOSINFO_VERSION_FILE) \
> > > +-version-info $(LIBOSINFO_VERSION_INFO) \
> > > + $(NO_UNDEFINED_FLAGS)
> > > +
> > > +libosinfo_1_0_la_DEPENDENCIES = libosinfo.syms libosinfo-impl.la
> > 
> > Here, I would expect libtool to be able to infer the libosinfo-impl.la
> > dependency from 'libosinfo_1_0_la_LIBADD = libosinfo-impl.la' above
> 
> IIRC there is a problem - if you specify _DEPENDENCIES = ... at all,
> as needed for the libosinfo.syms file, then I believe it discards the
> default dependancy on libosinfo-impl.la

Ah right, we need EXTRA_..._DEPENDENCIES = libosinfo.syms
https://www.gnu.org/software/automake/manual/automake.html#index-EXTRA_005fmaude_005fDEPENDENCIES-1
https://gitlab.freedesktop.org/spice/spice-gtk/commit/ed876b4cc

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH v2 1/2] osinfo: Create an intermediate convenience library

[Christophe Fergeau]

Ok, 2 more comments actually,

On Tue, Nov 20, 2018 at 03:11:23PM +0100, Fabiano Fidêncio wrote:
> Let's create libosinfo-impl.la which is nothing else than
> libosinfo-1.0.la without stripping out its non-public symbols.
> 
> libosinfo-impl.la can be used to link directly against our tests (as
> those may use private functions that we do *not* want to expose), while
> the "official" one (libosinfo-1.0.la) will remain the same.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/Makefile.am | 48 ++
>  1 file changed, 27 insertions(+), 21 deletions(-)
> 
> diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
> index 058653a..60b601f 100644
> --- a/osinfo/Makefile.am
> +++ b/osinfo/Makefile.am
> @@ -24,9 +24,9 @@ endif
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = libosinfo-1.0.pc
>  
> -lib_LTLIBRARIES = libosinfo-1.0.la
> +noinst_LTLIBRARIES = libosinfo-impl.la

I would keep libosinfo-1.0.la near the top as that is the most
interesting output from that Makefile.am (ie what actually gets
installed).

> -nodist_libosinfo_1_0_la_SOURCES =\
> +nodist_libosinfo_impl_la_SOURCES =   \
>osinfo_enum_types.c\
>$(NULL)
>  
> +lib_LTLIBRARIES = libosinfo-1.0.la
> +
> +libosinfo_1_0_la_SOURCES =
> +
> +libosinfo_1_0_la_LIBADD = libosinfo-impl.la
> +libosinfo_1_0_la_LIBADD += $(libosinfo_impl_la_LIBADD)
> +
> +libosinfo_1_0_la_LDFLAGS = \
> + $(COVERAGE_LDFLAGS) \
> + $(VERSION_SCRIPT_FLAGS)$(LIBOSINFO_VERSION_FILE) \
> +-version-info $(LIBOSINFO_VERSION_INFO) \
> + $(NO_UNDEFINED_FLAGS)
> +
> +libosinfo_1_0_la_DEPENDENCIES = libosinfo.syms libosinfo-impl.la

Here, I would expect libtool to be able to infer the libosinfo-impl.la
dependency from 'libosinfo_1_0_la_LIBADD = libosinfo-impl.la' above

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH v2 1/2] osinfo: Create an intermediate convenience library

[Christophe Fergeau]

Hey,

On Tue, Nov 20, 2018 at 03:11:23PM +0100, Fabiano Fidêncio wrote:
> Let's create libosinfo-impl.la which is nothing else than
> libosinfo-1.0.la without stripping out its non-public symbols.
> 
> libosinfo-impl.la can be used to link directly against our tests (as
> those may use private functions that we do *not* want to expose), while
> the "official" one (libosinfo-1.0.la) will remain the same.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
> -nodist_libosinfo_1_0_la_SOURCES =\
> +nodist_libosinfo_impl_la_SOURCES =   \
>osinfo_enum_types.c\
>$(NULL)
>  
> +lib_LTLIBRARIES = libosinfo-1.0.la
> +
> +libosinfo_1_0_la_SOURCES =
> +
> +libosinfo_1_0_la_LIBADD = libosinfo-impl.la
> +libosinfo_1_0_la_LIBADD += $(libosinfo_impl_la_LIBADD)

I don't think you need to append $(libosinfo_impl_la_LIBADD) to
libosinfo_1_0_la_LIBADD, libtool should figure what it needs from
libosinfo-impl.la which is already listed. Apart from this, looks good
to me.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH v2 4/4] rhel: Add RHEL unknown info

[Christophe Fergeau]

On Thu, Nov 15, 2018 at 10:43:24PM +0100, Fabiano Fidêncio wrote:
> From: Fabiano Fidêncio 
> 
> In a similar way of what's done on openSUSE and Fedora, let's have an
> "unknown" entry for RHEL that would cover any possible future releases
> while the proper release is not added to our db.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/redhat.com/rhel-unknown.xml.in | 80 ++
>  1 file changed, 80 insertions(+)
>  create mode 100644 data/os/redhat.com/rhel-unknown.xml.in
> 
> diff --git a/data/os/redhat.com/rhel-unknown.xml.in 
> b/data/os/redhat.com/rhel-unknown.xml.in
> new file mode 100644
> index 000..180c666
> --- /dev/null
> +++ b/data/os/redhat.com/rhel-unknown.xml.in
> @@ -0,0 +1,80 @@
> +
> +
> +  http://redhat.com/rhel/unknown;>
> +rhel-unknown
> +<_name>Red Hat Enterprise Linux Unknown
> +unknown
> +<_vendor>Red Hat, Inc
> +linux
> +rhel
> +http://redhat.com/rhel/8-unknown"/>

I guess I would mark it as updating rhel 8.0, not an unreleased version
of RHEL8. Apart from that, this looks good to me,

Reviewed-by: Christophe Fergeau 


> +
> +
> +  
> +LINUX
> +
> RHEL-(9|[1-9][0-9])-([0-9]|[1-9][0-9]).*x86_64$
> +  
> +  isolinux/vmlinuz
> +  isolinux/initrd.img
> +
> +
> +
> +   
> + LINUX
> + 
> RHEL-(9|[1-9][0-9])-([0-9]|[1-9][0-9]).*aarch64$
> +   
> + 
> +
> +
> +   
> + PPC
> + 
> RHEL-(9|[1-9][0-9])-([0-9]|[1-9][0-9]).*ppc64$
> +   
> + 
> +
> +
> +   
> + PPC
> + 
> RHEL[_-](9|[1-9][0-9])[_-]([0-9]|[1-9][0-9]).*ppc64le$
> +   
> + 
> +
> +
> +   
> + LINUX
> + 
> RHEL-(9|[1-9][0-9])-([0-9]|[1-9][0-9]).*s390x$
> +   
> + 
> +
> +
> +  
> +1
> +10
> +2147483648
> +10737418240
> +  
> +
> +  
> +40
> +2147483648
> +21474836480
> +  
> +
> +
> +
> +  
> +1
> +10
> +1073741824
> +10737418240
> +  
> +
> +  
> +10
> +1073741824
> +10737418240
> +  
> +
> +  
> +
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH] rhel: Add rhel8.0 data

[Christophe Fergeau]

On Thu, Nov 15, 2018 at 04:22:19PM +0100, Fabiano Fidêncio wrote:
> https://www.redhat.com/en/blog/powering-its-future-while-preserving-present-introducing-red-hat-enterprise-linux-8-beta
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/redhat.com/rhel-8.0.xml.in | 77 ++
>  1 file changed, 77 insertions(+)
>  create mode 100644 data/os/redhat.com/rhel-8.0.xml.in
> 
> diff --git a/data/os/redhat.com/rhel-8.0.xml.in 
> b/data/os/redhat.com/rhel-8.0.xml.in
> new file mode 100644
> index 000..5b3648d
> --- /dev/null
> +++ b/data/os/redhat.com/rhel-8.0.xml.in
> @@ -0,0 +1,77 @@
> +
> +
> +  http://redhat.com/rhel/8.0;>
> +rhel8.0
> +<_name>Red Hat Enterprise Linux 8.0
> +8.0
> +<_vendor>Red Hat, Inc
> +linux
> +rhel
> +http://redhat.com/rhel/7.6"/>
> +
> +prerelease
> +
> +
> +  
> +LINUX
> +RHEL-8-0-BaseOS-x86_64
> +  
> +  isolinux/vmlinuz
> +  isolinux/initrd.img
> +
> +
> +
> +  
> +PPC
> +    RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le

Why the different volume-id for ppc64le compared to other arches? Looks
good apart from this

Reviewed-by: Christophe Fergeau 

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo PATCH] os: Don't leak scripts list

[Christophe Fergeau]

hey,

On Wed, Nov 07, 2018 at 09:54:15PM +0100, Fabiano Fidêncio wrote:
> osinfo_list_get_elements() calls g_hash_table_get_values() which returns
> a GList that must be freed after used.
> 
> For more info, please, refer to:
> https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#g-hash-table-get-values
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  osinfo/osinfo_os.c | 11 ---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
> index 4f74331..f89861b 100644
> --- a/osinfo/osinfo_os.c
> +++ b/osinfo/osinfo_os.c
> @@ -611,16 +611,21 @@ OsinfoInstallScript 
> *osinfo_os_find_install_script(OsinfoOs *os, const gchar *pr
>  g_return_val_if_fail(OSINFO_IS_OS(os), NULL);
>  GList *scripts = osinfo_list_get_elements(OSINFO_LIST(os));
>  GList *tmp = scripts;
> +OsinfoInstallScript *s = NULL;
>  
>  while (tmp) {
>  OsinfoInstallScript *script = tmp->data;
> -if (g_str_equal(profile, osinfo_install_script_get_profile(script)))
> -return script;
> +if (g_str_equal(profile, osinfo_install_script_get_profile(script))) 
> {
> +s = script;
> +break;
> +}

Do we really need both 's' and 'script'? I think you could move 'script'
declaration out of the while() block, and achieve the same result?

Looks good apart from this.

Christophe

>  
>  tmp = tmp->next;
>  }
>  
> -return NULL;
> +g_list_free(scripts);
> +
> +return s;
>  }
>  
>  
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH] fedora29: Fix variant-id name

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Thu, Nov 01, 2018 at 06:41:54PM +0100, Fabiano Fidêncio wrote:
> server-netinst -> everything-netinst
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/fedoraproject.org/fedora-29.xml.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/data/os/fedoraproject.org/fedora-29.xml.in 
> b/data/os/fedoraproject.org/fedora-29.xml.in
> index dba6da2..49cef8f 100644
> --- a/data/os/fedoraproject.org/fedora-29.xml.in
> +++ b/data/os/fedoraproject.org/fedora-29.xml.in
> @@ -85,7 +85,7 @@
>  
>  
>  
> -  
> +  
>
> https://download.fedoraproject.org/pub/fedora/linux/releases/29/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-29-1.2.iso
>
>  Fedora-E-dvd-x86_64-29
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db, libosinfo PATCH 0/5] Add Fedora29 / Silverblue 29 (Beta) info

[Christophe Fergeau]

On Tue, Oct 09, 2018 at 06:06:50AM -0400, Jeremy Bicha wrote:
> On Tue, Oct 9, 2018 at 5:34 AM Fabiano Fidêncio  wrote:
> > My rationale for this is that in a few weeks the official ISOs will be 
> > released and we'd just remove the prerelease tag and add the release date.
> 
> This is somewhat similar to what I did with Ubuntu 18.10 recently. The
> URLs point to the daily iso build which is really the recommended way
> to get Ubuntu's development release. Before my change, the pre-release
> Ubuntu iso's weren't recognized at all so you don't get any of the
> pre-configured RAM and disk sizes in Boxes. It's also a problem if
> developers always run the development release and so don't see how the
> behavior is different with recognized stable release iso's.
> 
> It's a bit different for Fedora because I believe Fedora does have
> generic recognition for these pre-release ISOs in osinfo-db.

Yep, for fedora/opensuse, there are 'catch-all'
fedora-unknown/opensuse-unknown OSes.

> 
> Anyway, I would support the Fedora proposal here.

Yes, thanks for pointing out the ubuntu situation, it would indeed be
odd to accept the patches for ubuntu and not the similar ones for fedora.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [Patch] bump default ubuntu RAM size

[Christophe Fergeau]

On Mon, Oct 08, 2018 at 04:25:21PM +0200, Didier Roche wrote:
> Le 08/10/2018 à 13:21, Fabiano Fidêncio a écrit :
> > On Mon, 2018-10-08 at 13:12 +0200, Didier Roche wrote:
> > > 
> > > Yes, we can be more fine-grained, basically:
> > > * 16.04 -> Min and recommended is 2Gb (this was bumped when our
> > > 16.04.x
> > > maintenance image started to include snapd)
> > > * 18.04 and onward: 2Gb min, 4Gb recommended.
> > > However, if we bump recommended in that file to 4Gb, GNOME Boxes
> > > will
> > > set that as a default, which we aren't really keen on (the 4Gb
> > > recommended is a large estimate for people using a lot of tabs in
> > > their
> > > browser, which isn't our GNOME Boxes typical usage we are targeting
> > > at).
> > > 
> > > Does it makes sense?
> > 
> > On one hand it does, on the other hand ... I'd still prefer to have the
> > recommended amount of RAM properly set in osinfo-db.
> > 
> > AFAIR, in Boxes the user can change the amount of RAM to the minimum
> > one if their decide to do so.
> > 
> > Also, the recommended disk size has been increased, right? Would be
> > nice to have it changed as well.
> > 
> 
> It's a bit tricky because the configuration is shared between Ubuntu desktop
> & server.

Ah, it probably would make sense to be able to override these depending
on the type of image that we are dealing with. Maybe adding a 'variant'
attribute to the  tag would do the trick.

> 
> We discussed that at length within the desktop team, and it seems the
> conscensus is to separate the physical install recommendations vs
> virtualised one. Will Cooke (manager of the desktop team) has just updated
> the wiki page: 
> https://help.ubuntu.com/community/Installation/SystemRequirements?action=diff=110=109.
> I hope that facilitate that patch which is increasing a non working
> configuration.

To me it's really unexpected that requirements for a 2.5 years old image
change like that :) But that's your project decision, libosinfo can just
follow suit...

Acked-by: Christophe Fergeau 


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db, libosinfo PATCH 0/5] Add Fedora29 / Silverblue 29 (Beta) info

[Christophe Fergeau]

On Tue, Oct 09, 2018 at 11:34:29AM +0200, Fabiano Fidêncio wrote:
> On Tuesday, October 9, 2018, Christophe Fergeau  wrote:
> 
> > Hey
> > Series looks good to me, though I'm still not fully convinced we want to
> > add 'transient' ISOs like these.
> 
> 
> Okay, I will wait for a second opinion then before pushing the patches.
> 
> My rationale for this is that in a few weeks the official ISOs will be
> released and we'd just remove the prerelease tag and add the release date.

and update the URLs and update the test data. No strong opposition btw,
and I agree it's nice if at release time f29 info is already there
(which will work in that case because the volume id does not mention
'beta').

Christophe

> 
> 
> >
> > Reviewed-by: Christophe Fergeau 
> >
> > On Mon, Oct 08, 2018 at 05:15:55PM +0200, Fabiano Fidêncio wrote:
> > > This patch series add support for Fedora29/Silverblue29 (Beta).
> > >
> > > osinfo-db:
> > > Fabiano Fidêncio (2):
> > >   fedora: Add fedora29 (Beta) info
> > >   silverblue: Add silverblue29 (Beta) data
> > >   fedora: Adjust unkown regex
> > >
> > >  data/os/fedoraproject.org/fedora-29.xml.in| 124 ++
> > >  .../os/fedoraproject.org/silverblue-29.xml.in |  44 +++
> > >  data/os/fedoraproject.org/fedora-unknown.xml.in | 8 
> > >  3 files changed, 172 insertions(+), 4 deletions(-)
> > >  create mode 100644 data/os/fedoraproject.org/fedora-29.xml.in
> > >  create mode 100644 data/os/fedoraproject.org/silverblue-29.xml.in
> > >
> > >
> > > libosinfo:
> > > Fabiano Fidêncio (2):
> > >   fedora: Add fedora29 (Beta) isodata
> > >   silverblue: Add silverblue29 (Beta) isodata
> > >
> > >  ...dora-Server-dvd-x86_64-29_Beta-1.5.iso.txt | 29 +++
> > >  ...-Server-netinst-x86_64-29_Beta-1.5.iso.txt | 29 +++
> > >  ...orkstation-Live-x86_64-29_Beta-1.5.iso.txt | 29 +++
> > >  ...station-netinst-x86_64-29_Beta-1.5.iso.txt | 29 +++
> > >  ...lverblue-ostree-x86_64-29_Beta-1.5.iso.txt | 29 +++
> > >  5 files changed, 145 insertions(+)
> > >  create mode 100644 tests/isodata/fedora/fedora29/
> > Fedora-Server-dvd-x86_64-29_Beta-1.5.iso.txt
> > >  create mode 100644 tests/isodata/fedora/fedora29/
> > Fedora-Server-netinst-x86_64-29_Beta-1.5.iso.txt
> > >  create mode 100644 tests/isodata/fedora/fedora29/
> > Fedora-Workstation-Live-x86_64-29_Beta-1.5.iso.txt
> > >  create mode 100644 tests/isodata/fedora/fedora29/
> > Fedora-Workstation-netinst-x86_64-29_Beta-1.5.iso.txt
> > >  create mode 100644 tests/isodata/fedora/silverblue29/Fedora-
> > Silverblue-ostree-x86_64-29_Beta-1.5.iso.txt
> > >
> > > --
> > > 2.19.1
> > >
> > > ___
> > > Libosinfo mailing list
> > > Libosinfo@redhat.com
> > > https://www.redhat.com/mailman/listinfo/libosinfo
> >

> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo



signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db, libosinfo PATCH 0/5] Add Fedora29 / Silverblue 29 (Beta) info

[Christophe Fergeau]

Hey
Series looks good to me, though I'm still not fully convinced we want to
add 'transient' ISOs like these.

Reviewed-by: Christophe Fergeau 

On Mon, Oct 08, 2018 at 05:15:55PM +0200, Fabiano Fidêncio wrote:
> This patch series add support for Fedora29/Silverblue29 (Beta).
> 
> osinfo-db:
> Fabiano Fidêncio (2):
>   fedora: Add fedora29 (Beta) info
>   silverblue: Add silverblue29 (Beta) data
>   fedora: Adjust unkown regex
> 
>  data/os/fedoraproject.org/fedora-29.xml.in| 124 ++
>  .../os/fedoraproject.org/silverblue-29.xml.in |  44 +++
>  data/os/fedoraproject.org/fedora-unknown.xml.in | 8 
>  3 files changed, 172 insertions(+), 4 deletions(-)
>  create mode 100644 data/os/fedoraproject.org/fedora-29.xml.in
>  create mode 100644 data/os/fedoraproject.org/silverblue-29.xml.in
> 
> 
> libosinfo:
> Fabiano Fidêncio (2):
>   fedora: Add fedora29 (Beta) isodata
>   silverblue: Add silverblue29 (Beta) isodata
> 
>  ...dora-Server-dvd-x86_64-29_Beta-1.5.iso.txt | 29 +++
>  ...-Server-netinst-x86_64-29_Beta-1.5.iso.txt | 29 +++
>  ...orkstation-Live-x86_64-29_Beta-1.5.iso.txt | 29 +++
>  ...station-netinst-x86_64-29_Beta-1.5.iso.txt | 29 +++
>  ...lverblue-ostree-x86_64-29_Beta-1.5.iso.txt | 29 +++
>  5 files changed, 145 insertions(+)
>  create mode 100644 
> tests/isodata/fedora/fedora29/Fedora-Server-dvd-x86_64-29_Beta-1.5.iso.txt
>  create mode 100644 
> tests/isodata/fedora/fedora29/Fedora-Server-netinst-x86_64-29_Beta-1.5.iso.txt
>  create mode 100644 
> tests/isodata/fedora/fedora29/Fedora-Workstation-Live-x86_64-29_Beta-1.5.iso.txt
>  create mode 100644 
> tests/isodata/fedora/fedora29/Fedora-Workstation-netinst-x86_64-29_Beta-1.5.iso.txt
>  create mode 100644 
> tests/isodata/fedora/silverblue29/Fedora-Silverblue-ostree-x86_64-29_Beta-1.5.iso.txt
> 
> -- 
> 2.19.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 1/4] centos: Remove URLs pointing to vault.centos.org

[Christophe Fergeau]

On Mon, Sep 24, 2018 at 01:43:31PM +0200, Fabiano Fidêncio wrote:
> On Mon, Sep 24, 2018 at 1:33 PM Christophe Fergeau  
> wrote:
> >
> > On Fri, Sep 21, 2018 at 04:05:09PM +0200, Fabiano Fidêncio wrote:
> > > As vault.centos.org doesn't keep any ISO anymore, let's just remove them
> > > from our db.
> > >
> > > Along with the URLs removal, let's remove together the tree's as those
> > > can't be accessed without a valid URL.
> >
> > Trying to access the ISOs gives a text message instead of the ISO saying
> > to refer to external mirrors in order to save bandwidth, so it indeed
> > seems there are no canonical URL we can give in osinfo-db for now.
> > However, the tree data is still there, and downloading repo metadata or
> > rpm packages seem to still be working, so I would think we can keep the
> > tree data in the xml file.
> 
> Although the tree data is still there I've been told (on #centos-devel):
> "so in short, if some program links to vault, it's most likely not a
> good idea and may not even work"
> 
> And that's the main reason I think we should just remove those altogether.

If it's the main reason, this should be in the commit log.. ;) Would be
nice if there was some magic redirection to mirrors when you try to
access vault.centos.org.

Acked-by: Christophe Fergeau 

Christophe

> 
> >
> > Christophe
> >
> > >
> > > Signed-off-by: Fabiano Fidêncio 
> > > ---
> > >  data/os/centos.org/centos-6.6.xml.in | 23 ---
> > >  data/os/centos.org/centos-6.7.xml.in | 27 ---
> > >  data/os/centos.org/centos-6.8.xml.in | 27 ---
> > >  data/os/centos.org/centos-6.9.xml.in | 25 -
> > >  4 files changed, 102 deletions(-)
> > >
> > > diff --git a/data/os/centos.org/centos-6.6.xml.in 
> > > b/data/os/centos.org/centos-6.6.xml.in
> > > index 546ff5e..41b2647 100644
> > > --- a/data/os/centos.org/centos-6.6.xml.in
> > > +++ b/data/os/centos.org/centos-6.6.xml.in
> > > @@ -16,7 +16,6 @@
> > >
> > >  
> > >  
> > > -  
> > > http://vault.centos.org/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso
> > >
> > >  LINUX
> > >  CentOS_6.6_Final
> > > @@ -26,7 +25,6 @@
> > >isolinux/initrd.img
> > >  
> > >  
> > > -  
> > > http://vault.centos.org/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso
> > >
> > >  LINUX
> > >  CentOS_6.6_Final
> > > @@ -38,7 +36,6 @@
> > >
> > >  
> > >  
> > > -  
> > > http://vault.centos.org/6.6/isos/i386/CentOS-6.6-i386-minimal.iso
> > >
> > >  LINUX
> > >  CentOS_6.6_Final
> > > @@ -48,7 +45,6 @@
> > >isolinux/initrd.img
> > >  
> > >  
> > > -  
> > > http://vault.centos.org/6.6/isos/x86_64/CentOS-6.6-x86_64-minimal.iso
> > >
> > >  LINUX
> > >  CentOS_6.6_Final
> > > @@ -60,7 +56,6 @@
> > >
> > >  
> > >  
> > > -  
> > > http://vault.centos.org/6.6/isos/i386/CentOS-6.6-i386-netinstall.iso
> > >
> > >  LINUX
> > >  CentOS
> > > @@ -70,7 +65,6 @@
> > >isolinux/initrd.img
> > >  
> > >  
> > > -  
> > > http://vault.centos.org/6.6/isos/x86_64/CentOS-6.6-x86_64-netinstall.iso
> > >
> > >  LINUX
> > >  CentOS
> > > @@ -80,23 +74,6 @@
> > >isolinux/initrd.img
> > >  
> > >
> > > -
> > > -  http://vault.centos.org/6.6/os/i386
> > > -  
> > > -CentOS
> > > -6.6
> > > -i386
> > > -  
> > > -
> > > -
> > > -  http://vault.centos.org/6.6/os/x86_64
> > > -  
> > > -CentOS
> > > -6.6
> > > -x86_64
> > > -  
> > > -
> > > -
> > >  
> > >
> > >  1
> > > diff --git a/data/os/centos.org/centos-6.7.xml.in 
> > > b/data/os/centos.org/centos-6.7.xml.in
> > > index cd0e1dc..13b053a 100644
> > > --- a/data/os/centos.org/centos-6.7.xml.in
> > > +++ b/data/os/centos.

Re: [Libosinfo] [osinfo-db PATCH 3/4] centos: Add 6.10 media info

[Christophe Fergeau]

On Mon, Sep 24, 2018 at 01:44:44PM +0200, Fabiano Fidêncio wrote:
> On Mon, Sep 24, 2018 at 1:43 PM Christophe Fergeau  
> wrote:
> >
> > On Fri, Sep 21, 2018 at 04:05:11PM +0200, Fabiano Fidêncio wrote:
> > > Signed-off-by: Fabiano Fidêncio 
> > > ---
> > >  data/os/centos.org/centos-6.10.xml.in | 115 ++
> > >  1 file changed, 115 insertions(+)
> > >  create mode 100644 data/os/centos.org/centos-6.10.xml.in
> > >
> > > diff --git a/data/os/centos.org/centos-6.10.xml.in 
> > > b/data/os/centos.org/centos-6.10.xml.in
> > > new file mode 100644
> > > index 000..50e9559
> > > --- /dev/null
> > > +++ b/data/os/centos.org/centos-6.10.xml.in
> > > @@ -0,0 +1,115 @@
> > > +
> > > +
> > > +  http://centos.org/centos/6.10;>
> > > +centos6.10
> > > +<_name>CentOS 6.10
> > > +6.10
> > > +<_vendor>CentOS
> > > +linux
> > > +centos
> > > +http://centos.org/centos/6.9"/>
> > > +http://redhat.com/rhel/6.10"/>
> > > +
> > > +2017-04-05
> > > +2020-11-30
> >
> > Since this is not the 'real' eol date, but the eol for the rhel6 series,
> > not specifically 6.10, maybe it's better not to include this for now?
> 
> Either this or update the eol-date when/if a 6.11 is released. What
> would be your preference?

I think I would not include anything, but I don't care strongly, jus go
whatever way you prefer :)

Christophe

> 
> >
> > Acked-by: Christophe Fergeau 


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 3/4] centos: Add 6.10 media info

[Christophe Fergeau]

On Fri, Sep 21, 2018 at 04:05:11PM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/centos.org/centos-6.10.xml.in | 115 ++
>  1 file changed, 115 insertions(+)
>  create mode 100644 data/os/centos.org/centos-6.10.xml.in
> 
> diff --git a/data/os/centos.org/centos-6.10.xml.in 
> b/data/os/centos.org/centos-6.10.xml.in
> new file mode 100644
> index 000..50e9559
> --- /dev/null
> +++ b/data/os/centos.org/centos-6.10.xml.in
> @@ -0,0 +1,115 @@
> +
> +
> +  http://centos.org/centos/6.10;>
> +centos6.10
> +<_name>CentOS 6.10
> +6.10
> +<_vendor>CentOS
> +linux
> +centos
> +http://centos.org/centos/6.9"/>
> +http://redhat.com/rhel/6.10"/>
> +
> +2017-04-05
> +2020-11-30

Since this is not the 'real' eol date, but the eol for the rhel6 series,
not specifically 6.10, maybe it's better not to include this for now?

Acked-by: Christophe Fergeau 


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db PATCH 2/4] centos: Update eol-dates for 6.x series

[Christophe Fergeau]

On Fri, Sep 21, 2018 at 04:05:10PM +0200, Fabiano Fidêncio wrote:
> Differently than the support given by RHEL, CentOS consider that a 6.x
> release has reached EOL whenever a 6.(x+1) release has been released.

Note exactly clear from
https://endoflife.software/operating-systems/linux/centos , but given
that they communicate only about EOL for major versions, it's probably
safe to assume that they don't make guarantees for minor releases
indeed.


Acked-by: Christophe Fergeau 

Christophe

> 
> Release announcements:
> - 6.0:
> https://lists.centos.org/pipermail/centos-announce/2011-July/017645.html
> 
> - 6.1:
> https://lists.centos.org/pipermail/centos-announce/2011-December/018312.html
> 
> - 6.2:
> https://lists.centos.org/pipermail/centos-announce/2011-December/018335.html
> 
> - 6.3:
> https://lists.centos.org/pipermail/centos-announce/2012-July/018706.html
> 
> - 6.4:
> https://lists.centos.org/pipermail/centos-announce/2013-March/019276.html
> 
> - 6.5:
> https://lists.centos.org/pipermail/centos-announce/2013-December/020032.html
> 
> - 6.6:
> https://lists.centos.org/pipermail/centos-announce/2014-October/020709.html
> 
> - 6.7:
> https://lists.centos.org/pipermail/centos-announce/2015-August/021298.html
> 
> - 6.8:
> https://lists.centos.org/pipermail/centos-announce/2016-May/021895.html
> 
> - 6.9:
> https://lists.centos.org/pipermail/centos-announce/2017-April/022351.html
> 
> - 6.10:
> https://lists.centos.org/pipermail/centos-announce/2018-July/022925.html
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  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.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 +-
>  10 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/data/os/centos.org/centos-6.0.xml.in 
> b/data/os/centos.org/centos-6.0.xml.in
> index dd7cc39..bb1166f 100644
> --- a/data/os/centos.org/centos-6.0.xml.in
> +++ b/data/os/centos.org/centos-6.0.xml.in
> @@ -11,7 +11,7 @@
>  http://redhat.com/rhel/6.0"/>
>  
>  2011-07-10
> -2020-11-30
> +2011-12-09
>  
>  
> diff --git a/data/os/centos.org/centos-6.1.xml.in 
> b/data/os/centos.org/centos-6.1.xml.in
> index 8e60f62..fb6ff62 100644
> --- a/data/os/centos.org/centos-6.1.xml.in
> +++ b/data/os/centos.org/centos-6.1.xml.in
> @@ -12,7 +12,7 @@
>  http://redhat.com/rhel/6.1"/>
>  
>  2011-12-09
> -2020-11-30
> +2011-12-20
>  
>  
>
> diff --git a/data/os/centos.org/centos-6.2.xml.in 
> b/data/os/centos.org/centos-6.2.xml.in
> index b1f557c..c756547 100644
> --- a/data/os/centos.org/centos-6.2.xml.in
> +++ b/data/os/centos.org/centos-6.2.xml.in
> @@ -12,7 +12,7 @@
>  http://redhat.com/rhel/6.2"/>
>  
>  2011-12-20
> -2020-11-30
> +2012-07-09
>  
>  
>
> diff --git a/data/os/centos.org/centos-6.3.xml.in 
> b/data/os/centos.org/centos-6.3.xml.in
> index 756b5d3..68638b6 100644
> --- a/data/os/centos.org/centos-6.3.xml.in
> +++ b/data/os/centos.org/centos-6.3.xml.in
> @@ -12,7 +12,7 @@
>  http://redhat.com/rhel/6.3"/>
>  
>  2012-07-09
> -2020-11-30
> +2013-03-09
>  
>  
>
> diff --git a/data/os/centos.org/centos-6.4.xml.in 
> b/data/os/centos.org/centos-6.4.xml.in
> index 5357a23..fffc10e 100644
> --- a/data/os/centos.org/centos-6.4.xml.in
> +++ b/data/os/centos.org/centos-6.4.xml.in
> @@ -12,7 +12,7 @@
>  http://redhat.com/rhel/6.4"/>
>  
>  2013-03-09
> -2020-11-30
> +2013-12-01
>  
>  
>
> diff --git a/data/os/centos.org/centos-6.5.xml.in 
> b/data/os/centos.org/centos-6.5.xml.in
> index 9153cb0..23e977d 100644
> --- a/data/os/centos.org/centos-6.5.xml.in
> +++ b/data/os/centos.org/centos-6.5.xml.in
> @@ -12,7 +12,7 @@
>  http://redhat.com/rhel/6.5"/>
>  
>  2013-12-01
> -2020-11-30
> +2014-10-28
>  
>  
>
> diff --git a/data/os/centos.org/centos-6.6.xml.in 
> b/data/os/centos.org/centos-6.6.xml.in
> index 41b2647..5b10ddb 100644
> --- a/data/os/centos.org/centos-6.6.xml.in
> +++ b/data/os/centos.org/centos-6.6.xml.in
> @@ -12,7 +12,7 @@
>  http://redhat.com/rhel/6.6"/>
>  
>  2014-10-28
> -2020-11-30
> +2015-08-0

Re: [Libosinfo] [osinfo-db PATCH 1/4] centos: Remove URLs pointing to vault.centos.org

[Christophe Fergeau]

On Fri, Sep 21, 2018 at 04:05:09PM +0200, Fabiano Fidêncio wrote:
> As vault.centos.org doesn't keep any ISO anymore, let's just remove them
> from our db.
> 
> Along with the URLs removal, let's remove together the tree's as those
> can't be accessed without a valid URL.

Trying to access the ISOs gives a text message instead of the ISO saying
to refer to external mirrors in order to save bandwidth, so it indeed
seems there are no canonical URL we can give in osinfo-db for now.
However, the tree data is still there, and downloading repo metadata or
rpm packages seem to still be working, so I would think we can keep the
tree data in the xml file.

Christophe

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/centos.org/centos-6.6.xml.in | 23 ---
>  data/os/centos.org/centos-6.7.xml.in | 27 ---
>  data/os/centos.org/centos-6.8.xml.in | 27 ---
>  data/os/centos.org/centos-6.9.xml.in | 25 -
>  4 files changed, 102 deletions(-)
> 
> diff --git a/data/os/centos.org/centos-6.6.xml.in 
> b/data/os/centos.org/centos-6.6.xml.in
> index 546ff5e..41b2647 100644
> --- a/data/os/centos.org/centos-6.6.xml.in
> +++ b/data/os/centos.org/centos-6.6.xml.in
> @@ -16,7 +16,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.6/isos/i386/CentOS-6.6-i386-bin-DVD1.iso
>
>  LINUX
>  CentOS_6.6_Final
> @@ -26,7 +25,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.6/isos/x86_64/CentOS-6.6-x86_64-bin-DVD1.iso
>
>  LINUX
>  CentOS_6.6_Final
> @@ -38,7 +36,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.6/isos/i386/CentOS-6.6-i386-minimal.iso
>
>  LINUX
>  CentOS_6.6_Final
> @@ -48,7 +45,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.6/isos/x86_64/CentOS-6.6-x86_64-minimal.iso
>
>  LINUX
>  CentOS_6.6_Final
> @@ -60,7 +56,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.6/isos/i386/CentOS-6.6-i386-netinstall.iso
>
>  LINUX
>  CentOS
> @@ -70,7 +65,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.6/isos/x86_64/CentOS-6.6-x86_64-netinstall.iso
>
>  LINUX
>  CentOS
> @@ -80,23 +74,6 @@
>isolinux/initrd.img
>  
>  
> -
> -  http://vault.centos.org/6.6/os/i386
> -  
> -CentOS
> -6.6
> -i386
> -  
> -
> -
> -  http://vault.centos.org/6.6/os/x86_64
> -  
> -CentOS
> -6.6
> -x86_64
> -  
> -
> -
>  
>
>  1
> diff --git a/data/os/centos.org/centos-6.7.xml.in 
> b/data/os/centos.org/centos-6.7.xml.in
> index cd0e1dc..13b053a 100644
> --- a/data/os/centos.org/centos-6.7.xml.in
> +++ b/data/os/centos.org/centos-6.7.xml.in
> @@ -16,7 +16,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.7/isos/i386/CentOS-6.7-i386-bin-DVD1.iso
>
>  LINUX
>  CentOS_6.7_Final
> @@ -26,7 +25,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.7/isos/x86_64/CentOS-6.7-x86_64-bin-DVD1.iso
>
>  LINUX
>  CentOS_6.7_Final
> @@ -38,7 +36,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.7/isos/i386/CentOS-6.7-i386-LiveCD.iso
>
>  LINUX
>  CentOS-6.7-i386-LiveCD
> @@ -47,7 +44,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.7/isos/x86_64/CentOS-6.7-x86_64-LiveCD.iso
>
>  LINUX
>  CentOS-6.7-x86_64-LiveCD
> @@ -58,7 +54,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.7/isos/i386/CentOS-6.7-i386-LiveDVD.iso
>
>  LINUX
>  CentOS-6.7-i386-LiveDVD
> @@ -67,7 +62,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.7/isos/x86_64/CentOS-6.7-x86_64-LiveDVD.iso
>
>  LINUX
>  CentOS-6.7-x86_64-LiveDVD
> @@ -78,7 +72,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.7/isos/i386/CentOS-6.7-i386-minimal.iso
>
>  LINUX
>  CentOS_6.7_Final
> @@ -88,7 +81,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.7/isos/x86_64/CentOS-6.7-x86_64-minimal.iso
>
>  LINUX
>  CentOS_6.7_Final
> @@ -100,7 +92,6 @@
>  
>  
>  
> -  
> http://vault.centos.org/6.7/isos/i386/CentOS-6.7-i386-netinstall.iso
>
>  LINUX
>  CentOS
> @@ -110,7 +101,6 @@
>isolinux/initrd.img
>  
>  
> -  
> http://vault.centos.org/6.7/isos/x86_64/CentOS-6.7-x86_64-netinstall.iso
>
>  LINUX
>  CentOS
> @@ -120,23 +110,6 @@
>isolinux/initrd.img
>  
>  
> -
> -  http://vault.centos.org/6.7/os/i386
> -  
> -CentOS
> -6.7

Re: [Libosinfo] [osinfo-db-tools PATCH] import: update manpage

[Christophe Fergeau]

On Sat, Sep 22, 2018 at 09:18:41AM +0200, Fabiano Fidêncio wrote:
> Mention in the manpage that if no ARCHIVE-FILE is passed or when
> ARCHIVE-FILE is -, it'll be read from the standard input.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  tools/osinfo-db-import.c | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/osinfo-db-import.c b/tools/osinfo-db-import.c
> index 6ebe5b4..0d0bdd9 100644
> --- a/tools/osinfo-db-import.c
> +++ b/tools/osinfo-db-import.c
> @@ -287,7 +287,7 @@ osinfo-db-import - Import an osinfo database archive
>  
>  =head1 SYNOPSIS
>  
> -osinfo-db-import [OPTIONS...] ARCHIVE-FILE
> +osinfo-db-import [OPTIONS...] [ARCHIVE-FILE]
>  
>  =head1 DESCRIPTION
>  
> @@ -321,6 +321,9 @@ If run by a privileged account (ie root), the B 
> database
>  location will be used by default, otherwise the B location
>  will be used.
>  
> +With no ARCHIVE-FILE, or when ARCHIVE-FILE is -, read standard
> +input.


Acked-by: Christophe Fergeau 


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH osinfo-db-tools 1/7] import: Fix argc check in main()

[Christophe Fergeau]

On Fri, Sep 21, 2018 at 11:13:42AM +0200, Fabiano Fidêncio wrote:
> osinfo-db-import takes at least one argument, the path to one archive
> file to import, and should just finish in case it's not passed.

It seems passing no argument, or passing '-' allows to pass the data on
stdin, checking for < 2 would prevent that.

Christophe

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  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 f90bef9..320abc9 100644
> --- a/tools/osinfo-db-import.c
> +++ b/tools/osinfo-db-import.c
> @@ -241,7 +241,7 @@ gint main(gint argc, gchar **argv)
>  goto error;
>  }
>  
> -if (argc > 2) {
> +if (argc < 2) {
>  g_printerr(_("%s: expected path to one archive file to import\n"),
> argv0);
>  goto error;
> -- 
> 2.17.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH osinfo-db-tools 4/7] export: Don't call g_object_unref(NULL) in _create_file()

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Fri, Sep 21, 2018 at 11:13:45AM +0200, Fabiano Fidêncio wrote:
> In osinfo_db_create_file() g_file_query_info() may fail which will leave
> @info as a NULL and we'll try to free it in the cleanup causing:
> (osinfo-db-export:32261): GLib-GObject-CRITICAL **: 11:00:08.488: 
> g_object_unref: assertion 'G_IS_OBJECT (object)' failed
> 
> In order to avoid that, let's only call g_object_unref() when @info is
> not NULL.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  tools/osinfo-db-export.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/osinfo-db-export.c b/tools/osinfo-db-export.c
> index 2c1bb8d..820196f 100644
> --- a/tools/osinfo-db-export.c
> +++ b/tools/osinfo-db-export.c
> @@ -286,7 +286,8 @@ static int osinfo_db_export_create_file(const gchar 
> *prefix,
>  g_free(abspath);
>  g_free(relpath);
>  g_free(entpath);
> -g_object_unref(info);
> +if (info)
> +g_object_unref(info);
>  if (err)
>  g_error_free(err);
>  return ret;
> -- 
> 2.17.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH osinfo-db-tools 7/7] path: Add a "\n" to the error message

[Christophe Fergeau]

Hey,

Fwiw, I'd squash all these g_printerr messages.

Acked-by: Christophe Fergeau 
to all the g_printerr + \n patches, regardless of squashing them or not.

Christophe

On Fri, Sep 21, 2018 at 11:13:48AM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  tools/osinfo-db-path.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/osinfo-db-path.c b/tools/osinfo-db-path.c
> index 3bab4b5..7055c5d 100644
> --- a/tools/osinfo-db-path.c
> +++ b/tools/osinfo-db-path.c
> @@ -90,7 +90,7 @@ gint main(gint argc, gchar **argv)
>  if (custom)
>  locs++;
>  if (locs > 1) {
> -g_printerr(_("Only one of --user, --local, --system & --dir can be 
> used"));
> +g_printerr(_("Only one of --user, --local, --system & --dir can be 
> used\n"));
>  goto error;
>  }
>  
> -- 
> 2.17.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] ubuntu: Add isodata for 18.10

[Christophe Fergeau]

Hey,

Sure, ack (did not test that the test suite is still passing, but I
assume that you did ;)

Christophe

On Tue, Sep 18, 2018 at 03:34:35PM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  .../ubuntu18.10/cosmic-desktop-amd64.iso.txt  | 29 +++
>  .../ubuntu18.10/cosmic-server-amd64.iso.txt   | 29 +++
>  .../ubuntu18.10/cosmic-server-arm64.iso.txt   | 29 +++
>  .../ubuntu18.10/cosmic-server-ppc64el.iso.txt | 17 +++
>  .../ubuntu18.10/cosmic-server-s390x.iso.txt   | 29 +++
>  5 files changed, 133 insertions(+)
>  create mode 100644 
> tests/isodata/ubuntu/ubuntu18.10/cosmic-desktop-amd64.iso.txt
>  create mode 100644 
> tests/isodata/ubuntu/ubuntu18.10/cosmic-server-amd64.iso.txt
>  create mode 100644 
> tests/isodata/ubuntu/ubuntu18.10/cosmic-server-arm64.iso.txt
>  create mode 100644 
> tests/isodata/ubuntu/ubuntu18.10/cosmic-server-ppc64el.iso.txt
>  create mode 100644 
> tests/isodata/ubuntu/ubuntu18.10/cosmic-server-s390x.iso.txt
> 
> diff --git a/tests/isodata/ubuntu/ubuntu18.10/cosmic-desktop-amd64.iso.txt 
> b/tests/isodata/ubuntu/ubuntu18.10/cosmic-desktop-amd64.iso.txt
> new file mode 100644
> index 000..9f35b22
> --- /dev/null
> +++ b/tests/isodata/ubuntu/ubuntu18.10/cosmic-desktop-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Ubuntu 18.10 amd64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, 
> LIBISOFS-1.2.4, LIBBURN-1.2.4
> +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: 978240
> +El Torito VD version 1 found, boot catalog is in sector 194
> +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 E99EC 956908
> diff --git a/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-amd64.iso.txt 
> b/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-amd64.iso.txt
> new file mode 100644
> index 000..2d45260
> --- /dev/null
> +++ b/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-amd64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Ubuntu-Server 18.10 amd64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, 
> LIBISOFS-1.2.4, LIBBURN-1.2.4
> +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: 370688
> +El Torito VD version 1 found, boot catalog is in sector 2125
> +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 DEA5 56997
> diff --git a/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-arm64.iso.txt 
> b/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-arm64.iso.txt
> new file mode 100644
> index 000..0575849
> --- /dev/null
> +++ b/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-arm64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: 
> +Volume id: Ubuntu-Server 18.10 arm64
> +Volume set id: 
> +Publisher id: 
> +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, 
> LIBISOFS-1.2.4, LIBBURN-1.2.4
> +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: 370519
> +El Torito VD version 1 found, boot catalog is in sector 4082
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +Hid 1
> +Arch 239 (Unknown Arch)
> +ID ''
> +Key 55 AA
> +Eltorito defaultboot header:
> +Bootid 88 (bootable)
> +Boot media 0 (No Emulation Boot)
> +Load segment 0
> +Sys type 0
> +Nsect 3C0
> +Bootoff 1A17E 106878
> diff --git a/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-ppc64el.iso.txt 
> b/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-ppc64el.iso.txt
> new file mode 100644
> index 000..51e26d1
> --- /dev/null
> +++ b/tests/isodata/ubuntu/ubuntu18.10/cosmic-server-ppc64el.iso.txt
> @@ -0,0 +1,17 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Ubuntu-Server 18.10 ppc64
> +Volume set id: 

[Libosinfo] [libosinfo 0/6] Add generic libosinfo error domain

[Christophe Fergeau]

Some parts of libosinfo are using a NULL domain when creating a GError, but
this triggers runtime warnings with glib. The main goal of this patch series is
to adress that.

Christophe

Christophe Fergeau (6):
  loader: Rename OSINFO_ERROR to OSINFO_LOADER_SET_ERROR
  loader: Use OSINFO_LOADER_SET_ERROR in a few more places
  loader: Introduce OSINFO_ERROR
  Use OSINFO_ERROR in more places
  install-script: Use g_set_error_literal where appropriate
  install-script: Add propagate_libxml_error() helper

 osinfo/libosinfo.syms  |  5 +++
 osinfo/osinfo_install_script.c | 68 +++---
 osinfo/osinfo_loader.c | 66 -
 osinfo/osinfo_loader.h |  8 
 tools/osinfo-install-script.c  |  2 +-
 tools/osinfo-query.c   |  6 +--
 6 files changed, 96 insertions(+), 59 deletions(-)

-- 
2.19.0

___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

[Libosinfo] [libosinfo 4/6] Use OSINFO_ERROR in more places

[Christophe Fergeau]

Passing a NULL error domain will trigger runtime warnings from glib.
---
 osinfo/osinfo_install_script.c | 37 --
 tools/osinfo-install-script.c  |  2 +-
 tools/osinfo-query.c   |  6 +++---
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 52b6d75f..a1d2373e 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -581,7 +581,7 @@ static xsltStylesheetPtr 
osinfo_install_script_load_template(const gchar *uri,
 /* Set up a parser context so we can catch the details of XML errors. */
 pctxt = xmlNewParserCtxt();
 if (!pctxt || !pctxt->sax) {
-g_set_error(error, 0, 0, "%s",
+g_set_error(error, OSINFO_ERROR, 0, "%s",
 _("Unable to create XML parser context"));
 goto cleanup;
 }
@@ -589,13 +589,13 @@ static xsltStylesheetPtr 
osinfo_install_script_load_template(const gchar *uri,
 if (!(doc = xmlCtxtReadDoc(pctxt, BAD_CAST template, uri, NULL,
XML_PARSE_NOENT | XML_PARSE_NONET |
XML_PARSE_NOWARNING))) {
-g_set_error(error, 0, 0, "%s",
+g_set_error(error, OSINFO_ERROR, 0, "%s",
 _("Unable to read XSL template"));
 goto cleanup;
 }
 
 if (!(xslt = xsltParseStylesheetDoc(doc))) {
-g_set_error(error, 0, 0, "%s",
+g_set_error(error, OSINFO_ERROR, 0, "%s",
 _("Unable to parse XSL template"));
 goto cleanup;
 }
@@ -669,7 +669,8 @@ static xmlNodePtr 
osinfo_install_script_generate_entity_xml(OsinfoInstallScript
 
 if (!(node = xmlNewDocNode(NULL, NULL, (xmlChar*)name, NULL))) {
 xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, 0, 0, _("Unable to create XML node '%s': '%s'"),
+g_set_error(error, OSINFO_ERROR, 0,
+_("Unable to create XML node '%s': '%s'"),
 name, err ? err->message : "");
 goto error;
 }
@@ -677,13 +678,16 @@ static xmlNodePtr 
osinfo_install_script_generate_entity_xml(OsinfoInstallScript
 if (!(data = xmlNewDocRawNode(NULL, NULL, (const xmlChar*)"id",
   (const 
xmlChar*)osinfo_entity_get_id(entity {
 xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, 0, 0, _("Unable to create XML node 'id': '%s'"),
+g_set_error(error, OSINFO_ERROR, 0,
+_("Unable to create XML node 'id': '%s'"),
 err ? err->message : "");
 goto error;
 }
 if (!(xmlAddChild(node, data))) {
 xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, 0, 0, _("Unable to add XML child '%s'"), err ? 
err->message : "");
+g_set_error(error, OSINFO_ERROR, 0,
+_("Unable to add XML child '%s'"),
+err ? err->message : "");
 goto error;
 }
 data = NULL;
@@ -705,13 +709,16 @@ static xmlNodePtr 
osinfo_install_script_generate_entity_xml(OsinfoInstallScript
 if (!(data = xmlNewDocRawNode(NULL, NULL, (const 
xmlChar*)tmp1->data,
   (const xmlChar*)tmp2->data))) {
 xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, 0, 0, _("Unable to create XML node '%s': 
'%s'"),
+g_set_error(error, OSINFO_ERROR, 0,
+_("Unable to create XML node '%s': '%s'"),
 (const gchar *)tmp1->data, err ? err->message : 
"");
 goto error;
 }
 if (!(xmlAddChild(node, data))) {
 xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, 0, 0, _("Unable to add XML child '%s'"), 
err ? err->message : "");
+g_set_error(error, OSINFO_ERROR, 0,
+_("Unable to add XML child '%s'"),
+err ? err->message : "");
 goto error;
 }
 data = NULL;
@@ -758,7 +765,7 @@ static xmlDocPtr 
osinfo_install_script_generate_config_xml(OsinfoInstallScript *
 goto error;
 if (!(xmlAddChild(root, node))) {
 xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, 0, 0, _("Unable to set XML root '%s'"), err ? 
err->message : "");
+g_set_error(error, OSINFO_ERROR, 0, _("Unable to set XML root '%s'"), 
err ? err->message : "");
 goto error;
 }
 
@@ -769,7 +776,7 @@ static xmlDocPtr 
osinfo_install_script_generate_config_xml(OsinfoInstallScript *
 goto error;
 if (!(xmlAddChild(root, node))) {
 xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, 0, 0, _("Unable to set XML root '%s'"), err ? 
err->message : "");
+g_set_error(error, OSINFO_ERROR, 0, _("Unable to set XML root '%s'"), 
err ? err->message : "");
 goto error;
 

[Libosinfo] [libosinfo 2/6] loader: Use OSINFO_LOADER_SET_ERROR in a few more places

[Christophe Fergeau]

There are 2 calls to g_set_error(err, "%s", "constant string"); which
can be replaced with OSINFO_LOADER_SET_ERROR
---
 osinfo/osinfo_loader.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index d7f1ab13..3accb29e 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -313,14 +313,12 @@ osinfo_loader_doc(const char *xpath,
 
 if (!(buf = xmlBufferCreate())) {
 xmlXPathFreeObject(obj);
-g_set_error(err, 0, 0, "%s",
-"Cannot allocate buffer");
+OSINFO_LOADER_SET_ERROR(err, "Cannot allocate buffer");
 return NULL;
 }
 if (xmlNodeDump(buf, NULL, obj->nodesetval->nodeTab[0], 0, 1) < 0) {
 xmlXPathFreeObject(obj);
-g_set_error(err, 0, 0, "%s",
-"Cannot format stylesheet");
+OSINFO_LOADER_SET_ERROR(err, "Cannot format stylesheet");
 }
 ret = g_strdup((char *)buf->content);
 
-- 
2.19.0

___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

[Libosinfo] [libosinfo 6/6] install-script: Add propagate_libxml_error() helper

[Christophe Fergeau]

This simplifies the code a bit.
---
 osinfo/osinfo_install_script.c | 57 +-
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 0ae17c70..016f8505 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -656,6 +656,25 @@ 
osinfo_install_script_get_param_value_list(OsinfoInstallScript *script,
 return values;
 }
 
+static void propagate_libxml_error(GError **error, const char *format, ...) 
G_GNUC_PRINTF(2, 3);
+
+static void propagate_libxml_error(GError **error, const char *format, ...)
+{
+xmlErrorPtr err = xmlGetLastError();
+char *prefix;
+va_list ap;
+
+va_start(ap, format);
+prefix = g_strdup_vprintf(format, ap);
+va_end(ap);
+
+if (err == NULL) {
+g_set_error_literal(error, OSINFO_ERROR, 0, prefix);
+} else {
+g_set_error(error, OSINFO_ERROR, 0, "%s: %s", prefix, err->message);
+}
+g_free(prefix);
+}
 
 static xmlNodePtr 
osinfo_install_script_generate_entity_xml(OsinfoInstallScript *script,
 OsinfoEntity 
*entity,
@@ -668,26 +687,17 @@ static xmlNodePtr 
osinfo_install_script_generate_entity_xml(OsinfoInstallScript
 GList *tmp1;
 
 if (!(node = xmlNewDocNode(NULL, NULL, (xmlChar*)name, NULL))) {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0,
-_("Unable to create XML node '%s': '%s'"),
-name, err ? err->message : "");
+propagate_libxml_error(error, _("Unable to create XML node '%s'"), 
name);
 goto error;
 }
 
 if (!(data = xmlNewDocRawNode(NULL, NULL, (const xmlChar*)"id",
   (const 
xmlChar*)osinfo_entity_get_id(entity {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0,
-_("Unable to create XML node 'id': '%s'"),
-err ? err->message : "");
+propagate_libxml_error(error, _("Unable to create XML node 'id'"));
 goto error;
 }
 if (!(xmlAddChild(node, data))) {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0,
-_("Unable to add XML child '%s'"),
-err ? err->message : "");
+propagate_libxml_error(error, _("Unable to add XML child"));
 goto error;
 }
 data = NULL;
@@ -708,17 +718,12 @@ static xmlNodePtr 
osinfo_install_script_generate_entity_xml(OsinfoInstallScript
 while (tmp2) {
 if (!(data = xmlNewDocRawNode(NULL, NULL, (const 
xmlChar*)tmp1->data,
   (const xmlChar*)tmp2->data))) {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0,
-_("Unable to create XML node '%s': '%s'"),
-(const gchar *)tmp1->data, err ? err->message : 
"");
+propagate_libxml_error(error, _("Unable to create XML node 
'%s'"),
+   (const gchar *)tmp1->data);
 goto error;
 }
 if (!(xmlAddChild(node, data))) {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0,
-_("Unable to add XML child '%s'"),
-err ? err->message : "");
+propagate_libxml_error(error, _("Unable to add XML child"));
 goto error;
 }
 data = NULL;
@@ -764,8 +769,7 @@ static xmlDocPtr 
osinfo_install_script_generate_config_xml(OsinfoInstallScript *
error)))
 goto error;
 if (!(xmlAddChild(root, node))) {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0, _("Unable to set XML root '%s'"), 
err ? err->message : "");
+propagate_libxml_error(error, _("Unable to set XML root"));
 goto error;
 }
 
@@ -775,8 +779,7 @@ static xmlDocPtr 
osinfo_install_script_generate_config_xml(OsinfoInstallScript *
error)))
 goto error;
 if (!(xmlAddChild(root, node))) {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0, _("Unable to set XML root '%s'"), 
err ? err->message : "");
+propagate_libxml_error(error, _("Unable to set XML root"));
 goto error;
 }
 
@@ -787,8 +790,7 @@ static xmlDocPtr 
osinfo_install_script_generate_config_xml(OsinfoInstallScript *
error)))
 goto error;
 if (!(xmlAddChild(root, node))) {
-xmlErrorPtr err = xmlGetLastError();
-g_set_error(error, OSINFO_ERROR, 0, 

[Libosinfo] [libosinfo 5/6] install-script: Use g_set_error_literal where appropriate

[Christophe Fergeau]

---
 osinfo/osinfo_install_script.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index a1d2373e..0ae17c70 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -581,22 +581,22 @@ static xsltStylesheetPtr 
osinfo_install_script_load_template(const gchar *uri,
 /* Set up a parser context so we can catch the details of XML errors. */
 pctxt = xmlNewParserCtxt();
 if (!pctxt || !pctxt->sax) {
-g_set_error(error, OSINFO_ERROR, 0, "%s",
-_("Unable to create XML parser context"));
+g_set_error_literal(error, OSINFO_ERROR, 0,
+_("Unable to create XML parser context"));
 goto cleanup;
 }
 
 if (!(doc = xmlCtxtReadDoc(pctxt, BAD_CAST template, uri, NULL,
XML_PARSE_NOENT | XML_PARSE_NONET |
XML_PARSE_NOWARNING))) {
-g_set_error(error, OSINFO_ERROR, 0, "%s",
-_("Unable to read XSL template"));
+g_set_error_literal(error, OSINFO_ERROR, 0,
+_("Unable to read XSL template"));
 goto cleanup;
 }
 
 if (!(xslt = xsltParseStylesheetDoc(doc))) {
-g_set_error(error, OSINFO_ERROR, 0, "%s",
-_("Unable to parse XSL template"));
+g_set_error_literal(error, OSINFO_ERROR, 0,
+_("Unable to parse XSL template"));
 goto cleanup;
 }
 
@@ -823,17 +823,17 @@ static gchar 
*osinfo_install_script_apply_xslt(xsltStylesheetPtr ss,
 int len;
 
 if (!(ctxt = xsltNewTransformContext(ss, doc))) {
-g_set_error(error, OSINFO_ERROR, 0, "%s", _("Unable to create XSL 
transform context"));
+g_set_error_literal(error, OSINFO_ERROR, 0, _("Unable to create XSL 
transform context"));
 goto cleanup;
 }
 
 if (!(docOut = xsltApplyStylesheetUser(ss, doc, NULL, NULL, NULL, ctxt))) {
-g_set_error(error, OSINFO_ERROR, 0, "%s", _("Unable to apply XSL 
transform context"));
+g_set_error_literal(error, OSINFO_ERROR, 0, _("Unable to apply XSL 
transform context"));
 goto cleanup;
 }
 
 if (xsltSaveResultToString(, , docOut, ss) < 0) {
-g_set_error(error, OSINFO_ERROR, 0, "%s", _("Unable to convert XSL 
output to string"));
+g_set_error_literal(error, OSINFO_ERROR, 0, _("Unable to convert XSL 
output to string"));
 goto cleanup;
 }
 ret = g_strdup((gchar *)xsltResult);
-- 
2.19.0

___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

[Libosinfo] [libosinfo 1/6] loader: Rename OSINFO_ERROR to OSINFO_LOADER_SET_ERROR

[Christophe Fergeau]

This will be useful in the following commits where another OSINFO_ERROR
 #define will be introduced
---
 osinfo/osinfo_loader.c | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index aff3cccd..d7f1ab13 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -144,7 +144,7 @@ OsinfoLoader *osinfo_loader_new(void)
 return g_object_new(OSINFO_TYPE_LOADER, NULL);
 }
 
-#define OSINFO_ERROR(err, msg)  \
+#define OSINFO_LOADER_SET_ERROR(err, msg)   \
 g_set_error_literal((err), g_quark_from_static_string("libosinfo"), 0, 
(msg));
 
 static gboolean error_is_set(GError **error)
@@ -272,7 +272,7 @@ osinfo_loader_boolean(const char *xpath,
 break;
 }
 if (node->children->type != XML_TEXT_NODE) {
-OSINFO_ERROR(err, _("Expected a text node attribute value"));
+OSINFO_LOADER_SET_ERROR(err, _("Expected a text node attribute 
value"));
 goto cleanup;
 }
 
@@ -417,7 +417,7 @@ static void osinfo_loader_entity(OsinfoLoader *loader,
 
 if (!param->children ||
 param->children->type != XML_TEXT_NODE) {
-OSINFO_ERROR(err, _("Expected a text node attribute value"));
+OSINFO_LOADER_SET_ERROR(err, _("Expected a text node attribute 
value"));
 goto cleanup;
 }
 
@@ -571,7 +571,7 @@ static void osinfo_loader_device(OsinfoLoader *loader,
 { NULL, G_TYPE_INVALID }
 };
 if (!id) {
-OSINFO_ERROR(err, _("Missing device id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing device id property"));
 return;
 }
 if (!osinfo_loader_check_id(relpath, "device", id)) {
@@ -606,7 +606,7 @@ static void osinfo_loader_device_link(OsinfoLoader *loader,
 };
 gchar *id = (gchar *)xmlGetProp(related[i], BAD_CAST "id");
 if (!id) {
-OSINFO_ERROR(err, _("Missing device link id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing device link id property"));
 goto cleanup;
 }
 OsinfoDevice *dev = osinfo_loader_get_device(loader, id);
@@ -656,7 +656,7 @@ static void osinfo_loader_product_relshp(OsinfoLoader 
*loader,
 
 gchar *id = (gchar *) xmlGetProp(it, BAD_CAST "id");
 if (!id) {
-OSINFO_ERROR(err, _("Missing product upgrades id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing product upgrades id 
property"));
 goto cleanup;
 }
 OsinfoProduct *relproduct;
@@ -729,7 +729,7 @@ static void osinfo_loader_platform(OsinfoLoader *loader,
 {
 gchar *id = (gchar *)xmlGetProp(root, BAD_CAST "id");
 if (!id) {
-OSINFO_ERROR(err, _("Missing platform id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing platform id property"));
 return;
 }
 if (!osinfo_loader_check_id(relpath, "platform", id)) {
@@ -763,7 +763,7 @@ static void osinfo_loader_deployment(OsinfoLoader *loader,
 {
 gchar *id = (gchar *)xmlGetProp(root, BAD_CAST "id");
 if (!id) {
-OSINFO_ERROR(err, _("Missing deployment id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing deployment id property"));
 return;
 }
 if (!osinfo_loader_check_id(relpath, "deployment", id)) {
@@ -773,7 +773,7 @@ static void osinfo_loader_deployment(OsinfoLoader *loader,
 
 gchar *osid = osinfo_loader_string("string(./os/@id)", loader, ctxt, err);
 if (!osid && 0) {
-OSINFO_ERROR(err, _("Missing deployment os id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing deployment os id property"));
 xmlFree(id);
 return;
 }
@@ -783,7 +783,7 @@ static void osinfo_loader_deployment(OsinfoLoader *loader,
 gchar *platformid = osinfo_loader_string("string(./platform/@id)", loader,
  ctxt, err);
 if (!platformid) {
-OSINFO_ERROR(err, _("Missing deployment platform id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing deployment platform id 
property"));
 xmlFree(id);
 return;
 }
@@ -822,7 +822,7 @@ static void osinfo_loader_datamap(OsinfoLoader *loader,
 gchar *id = (gchar *)xmlGetProp(root, BAD_CAST "id");
 
 if (!id) {
-OSINFO_ERROR(err, _("Missing os id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing os id property"));
 return;
 }
 if (!osinfo_loader_check_id(relpath, "datamap", id)) {
@@ -946,7 +946,7 @@ static void osinfo_loader_install_script(OsinfoLoader 
*loader,
 GFlagsClass *flags_class;
 
 if (!id) {
-OSINFO_ERROR(err, _("Missing install script id property"));
+OSINFO_LOADER_SET_ERROR(err, _("Missing install script id property"));
 return;
 }
 
@@ -1408,7 +1408,7 @@ static void osinfo_loader_os(OsinfoLoader 

Re: [Libosinfo] [PATCH 2/2][osinfo-db] centos: fix tree url for 6.9

[Christophe Fergeau]

On Thu, Aug 16, 2018 at 08:46:48AM +0200, Fabiano Fidêncio wrote:
> Let's point to http://vault.centos.org/6.9/os/ as the old releases are
> kept there.


Acked-by: Christophe Fergeau 

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/centos.org/centos-6.9.xml.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/data/os/centos.org/centos-6.9.xml.in 
> b/data/os/centos.org/centos-6.9.xml.in
> index 535a57b..98c86bb 100644
> --- a/data/os/centos.org/centos-6.9.xml.in
> +++ b/data/os/centos.org/centos-6.9.xml.in
> @@ -103,7 +103,7 @@
>  
>  
>  
> -  http://mirror.centos.org/centos/6.9/os/i386
> +  http://vault.centos.org/6.9/os/i386/
>
>  CentOS
>  6.9
> @@ -111,7 +111,7 @@
>
>  
>  
> -  http://mirror.centos.org/centos/6.9/os/x86_64
> +  http://vault.centos.org/6.9/os/x86_64/
>
>  CentOS
>  6.9
> -- 
> 2.14.4
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH osinfo-db] netbsd: Add NetBSD 8.0 info

[Christophe Fergeau]

On Mon, Jul 23, 2018 at 04:21:13AM -0400, Pierre-Alain TORET wrote:
> Hello,
> 
> following the release of NetBSD 8.0 a few days ago, here is a patch.
> 
> I'm sending the corresponding isodata patch in a following email.
> 
> Regards,
> 
> Signed-off-by: Pierre-Alain TORET 
> ---
>   data/os/netbsd.org/netbsd-8.0.xml.in | 64 
>   1 file changed, 64 insertions(+)
>   create mode 100644 data/os/netbsd.org/netbsd-8.0.xml.in
> 
> diff --git a/data/os/netbsd.org/netbsd-8.0.xml.in 
> b/data/os/netbsd.org/netbsd-8.0.xml.in
> new file mode 100644
> index 000..1497eaa
> --- /dev/null
> +++ b/data/os/netbsd.org/netbsd-8.0.xml.in
> @@ -0,0 +1,64 @@
> +
> +
> +  http://netbsd.org/netbsd/8.0;>
> +netbsd8.0
> +<_name>NetBSD 8.0
> +8.0
> +<_vendor>NetBSD Project
> +netbsd
> +netbsd
> +http://netbsd.org/netbsd/7.1.2"/>
> +http://netbsd.org/netbsd/7.1.2"/>
> +
> +2018-07-17
> +
> +
> + 
> https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/images/NetBSD-8.0-amd64.iso
> +  
> +NetBSD
> +NETBSD_80
> +750526464
> +  
> +
> +
> + 
> https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/amd64/installation/cdrom/boot.iso
> +  
> +NetBSD
> +NETBSD_80
> +229435392
> +  
> +
> +
> + 
> https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/amd64/installation/cdrom/boot-com.iso
> +  
> +NetBSD
> +NETBSD_80
> +229435392
> +  
> +
> +
> + 
> https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/images/NetBSD-8.0-i386.iso
> +  
> +NetBSD
> +NETBSD_80
> +426956800

I've adjusted that one to 709455872 otherwise the testsuite fails.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH osinfo-db] netbsd: Add NetBSD 8.0 info

[Christophe Fergeau]

Hey,

For what it's worth, the  changes were again whitespace damaged, I
had to fix them manually to apply that patch.

On Mon, Jul 23, 2018 at 04:21:13AM -0400, Pierre-Alain TORET wrote:
> +
> +  
> https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/amd64/installation/cdrom/boot.iso
> +  
> +NetBSD
> +NETBSD_80
> +229435392
> +  
> +
> +
> +  
> https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0/amd64/installation/cdrom/boot-com.iso
> +  
> +NetBSD
> +NETBSD_80
> +229435392
> +  
> +

These 2 entries are exactly identical, and I checked this is not a typo.
This is going to be a problem if we ever want to define variants to
differentiate between boot.iso (vga console) and boot-com.iso (serial
console). For now, this should be acceptable as they both will be
identified as netbsd 8.0 x86_64, which is correct. It would be great if
the netbsd people would make these 2 slightly different :)

Apart from this, looks good to me.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] rhel: fix upgrades/derives for 6.10

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Fri, Jul 20, 2018 at 09:36:26AM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/redhat.com/rhel-6.10.xml.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/data/os/redhat.com/rhel-6.10.xml.in 
> b/data/os/redhat.com/rhel-6.10.xml.in
> index c977c8c..b46b7b9 100644
> --- a/data/os/redhat.com/rhel-6.10.xml.in
> +++ b/data/os/redhat.com/rhel-6.10.xml.in
> @@ -9,8 +9,8 @@
>  linux
>  rhel
>  Santiago
> -http://redhat.com/rhel/6.10"/>
> -http://redhat.com/rhel/6.10"/>
> +http://redhat.com/rhel/6.9"/>
> +http://redhat.com/rhel/6.9"/>
>  
>  2018-05-25
>  2024-06-30
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db 0/4] test-mediauris fixes

[Christophe Fergeau]

For the first 3 patches, Acked-by: Christophe Fergeau 

On Thu, Jul 19, 2018 at 05:21:00PM +0200, Fabiano Fidêncio wrote:
> The first 3 patches contain fixes for the URLs which ended up changing
> as the systems reached their EOL.
> 
> The last patch removes the URL from openbsd 5.9, as I couldn't find any
> archive that cointains this media.

Poking at random locations from https://www.openbsd.org/ftp.html
I've found at least ftp://ftp.eu.openbsd.org/pub/OpenBSD/ and
ftp://mirror.yandex.ru/pub/OpenBSD/
with the older releases. First one seems better as it's under the
openbsd.org domain.

Christophe

> 
> Fabiano Fidêncio (4):
>   fedora: fix url for old releases (f25 and f26)
>   netbsd: fix url for old releases (6.0 and 6.1)
>   ubuntu: fix url for old releases (16.04)
>   openbsd: remove url from old release (5.9)
> 
>  data/os/fedoraproject.org/fedora-25.xml.in | 20 ++--
>  data/os/fedoraproject.org/fedora-26.xml.in | 10 +-
>  data/os/netbsd.org/netbsd-6.0.xml.in   | 12 ++--
>  data/os/netbsd.org/netbsd-6.1.xml.in   | 12 ++--
>  data/os/openbsd.org/openbsd-5.9.xml.in |  2 --
>  data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 +++---
>  6 files changed, 34 insertions(+), 36 deletions(-)
> 
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH][osinfo-db] openbsd: standardize single/double quotes in arch entry

[Christophe Fergeau]

On Thu, Jul 19, 2018 at 01:46:38PM +0200, Fabiano Fidêncio wrote:
> All other OSes have are using double quotes for the arch entry.

Sure,
Acked-by: Christophe Fergeau 

> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/openbsd.org/openbsd-4.2.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-4.3.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-4.4.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-4.5.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-4.8.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-4.9.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.0.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.1.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.2.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.3.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.4.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.5.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.6.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.7.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.8.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-5.9.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-6.0.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-6.1.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-6.2.xml.in | 4 ++--
>  data/os/openbsd.org/openbsd-6.3.xml.in | 4 ++--
>  20 files changed, 40 insertions(+), 40 deletions(-)
> 
> diff --git a/data/os/openbsd.org/openbsd-4.2.xml.in 
> b/data/os/openbsd.org/openbsd-4.2.xml.in
> index bf872c9..8b1fe48 100644
> --- a/data/os/openbsd.org/openbsd-4.2.xml.in
> +++ b/data/os/openbsd.org/openbsd-4.2.xml.in
> @@ -12,7 +12,7 @@
>  2007-11-01
>  2008-11-01
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> @@ -21,7 +21,7 @@
>
>  
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> diff --git a/data/os/openbsd.org/openbsd-4.3.xml.in 
> b/data/os/openbsd.org/openbsd-4.3.xml.in
> index 3ab2abd..401f6b3 100644
> --- a/data/os/openbsd.org/openbsd-4.3.xml.in
> +++ b/data/os/openbsd.org/openbsd-4.3.xml.in
> @@ -14,7 +14,7 @@
>  2008-04-01
>  2009-05-01
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> @@ -23,7 +23,7 @@
>
>  
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> diff --git a/data/os/openbsd.org/openbsd-4.4.xml.in 
> b/data/os/openbsd.org/openbsd-4.4.xml.in
> index 1d5acaf..8d625e6 100644
> --- a/data/os/openbsd.org/openbsd-4.4.xml.in
> +++ b/data/os/openbsd.org/openbsd-4.4.xml.in
> @@ -14,7 +14,7 @@
>  2008-11-01
>  2009-10-18
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> @@ -23,7 +23,7 @@
>
>  
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> diff --git a/data/os/openbsd.org/openbsd-4.5.xml.in 
> b/data/os/openbsd.org/openbsd-4.5.xml.in
> index bdf686d..2904158 100644
> --- a/data/os/openbsd.org/openbsd-4.5.xml.in
> +++ b/data/os/openbsd.org/openbsd-4.5.xml.in
> @@ -14,7 +14,7 @@
>  2009-05-01
>  2010-05-19
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> @@ -23,7 +23,7 @@
>
>  
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> diff --git a/data/os/openbsd.org/openbsd-4.8.xml.in 
> b/data/os/openbsd.org/openbsd-4.8.xml.in
> index ee13d96..5aa1e83 100644
> --- a/data/os/openbsd.org/openbsd-4.8.xml.in
> +++ b/data/os/openbsd.org/openbsd-4.8.xml.in
> @@ -14,7 +14,7 @@
>  2010-11-01
>  2011-11-01
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> @@ -23,7 +23,7 @@
>
>  
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> diff --git a/data/os/openbsd.org/openbsd-4.9.xml.in 
> b/data/os/openbsd.org/openbsd-4.9.xml.in
> index 77a1da5..66f5524 100644
> --- a/data/os/openbsd.org/openbsd-4.9.xml.in
> +++ b/data/os/openbsd.org/openbsd-4.9.xml.in
> @@ -18,7 +18,7 @@
>http://pcisig.com/pci/1022/2000"/>
>  
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> @@ -27,7 +27,7 @@
>
>  
>  
> -
> +
>
>   The OpenBSD project
>   OpenBSD
> diff --git a/data/os/openbsd.org/openbsd-5.0.xml.in 
> b/data/os/openbsd.org/openbsd-5.0.xml.in
> index 6c530b1..4dd152e 100644
> --- a/data/os/openbsd.org/openbsd-5.0.xml.in
> +++ b/data/os/openbsd.org/openbsd-5.0.xml.in
> @@ -14,7 +14,7 @@
>  2011-11-01
>  2012-11-01
>  
> -
> +
>
>   The OpenBSD project
>   OpenB

Re: [Libosinfo] [PATCH osinfo-db] dragonflybsd : Add DragonFlyBSD data

[Christophe Fergeau]

On Wed, Jun 06, 2018 at 04:54:06PM -0400, Pierre-Alain TORET wrote:
> diff --git a/data/os/dragonflybsd.org/dragonflybsd-5.2.1.xml.in 
> b/data/os/dragonflybsd.org/dragonflybsd-5.2.1.xml.in
> new file mode 100644
> index 000..f3d3446
> --- /dev/null
> +++ b/data/os/dragonflybsd.org/dragonflybsd-5.2.1.xml.in
> @@ -0,0 +1,24 @@
> +
> +
> +  http://dragonflybsd.org/dragonflybsd/5.2.1;>
> +dragonflybsd5.2.1
> +<_name>DragonFlyBSD 5.2.1
> +5.2.1
> +dragonflybsd
> +dragonflybsd
> +<_vendor>DragonFlyBSD Project
> +http://dragonflybsd.org/dragonflybsd/5.2.0"/>
> +
> +2018-05-21
> +
> +
> + 
> http://mirror-master.dragonflybsd.org/iso-images/dfly-x86_64-5.2.1_REL.iso

For what it's worth, I think only these  lines (5 of them) needed
to be fixed in order to fix the patch that you sent, just edit the patch
after saving it and join the + line with the  line.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo] Add test files for Alpinelinux 3.8

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Wed, Jul 18, 2018 at 08:31:44AM +0200, Věra Cholasta wrote:
> ---
>  .../alpine-standard-3.8.0-ppc64le.iso.txt  | 16 
>  .../alpine-standard-3.8.0-s390x.iso.txt| 29 
> ++
>  .../alpine-standard-3.8.0-x86.iso.txt  | 29 
> ++
>  .../alpine-standard-3.8.0-x86_64.iso.txt   | 29 
> ++
>  .../alpinelinux3.8/alpine-virt-3.8.0-x86.iso.txt   | 29 
> ++
>  .../alpine-virt-3.8.0-x86_64.iso.txt   | 29 
> ++
>  .../alpinelinux3.8/alpine-xen-3.8.0-x86_64.iso.txt | 29 
> ++
>  7 files changed, 190 insertions(+)
>  create mode 100644 
> tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-ppc64le.iso.txt
>  create mode 100644 
> tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-s390x.iso.txt
>  create mode 100644 
> tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-x86.iso.txt
>  create mode 100644 
> tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-x86_64.iso.txt
>  create mode 100644 
> tests/isodata/alpinelinux/alpinelinux3.8/alpine-virt-3.8.0-x86.iso.txt
>  create mode 100644 
> tests/isodata/alpinelinux/alpinelinux3.8/alpine-virt-3.8.0-x86_64.iso.txt
>  create mode 100644 
> tests/isodata/alpinelinux/alpinelinux3.8/alpine-xen-3.8.0-x86_64.iso.txt
> 
> diff --git 
> a/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-ppc64le.iso.txt
>  
> b/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-ppc64le.iso.txt
> new file mode 100644
> index 000..7de68d9
> --- /dev/null
> +++ 
> b/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-ppc64le.iso.txt
> @@ -0,0 +1,16 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: alpine-std 3.8.0 ppc64le
> +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: 25399
> +NO Joliet present
> +Rock Ridge signatures version 1 found
> diff --git 
> a/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-s390x.iso.txt
>  
> b/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-s390x.iso.txt
> new file mode 100644
> index 000..456aa82
> --- /dev/null
> +++ 
> b/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-s390x.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: alpine-std 3.8.0 s390x
> +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: 26135
> +El Torito VD version 1 found, boot catalog is in sector 41
> +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 779C
> +Bootoff 2A 42
> diff --git 
> a/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-x86.iso.txt 
> b/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-x86.iso.txt
> new file mode 100644
> index 000..ad7eec2
> --- /dev/null
> +++ 
> b/tests/isodata/alpinelinux/alpinelinux3.8/alpine-standard-3.8.0-x86.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: alpine-std 3.8.0 x86
> +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: 48640
> +El Torito VD version 1 found, boot catalog is in sector 48
> +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)
> +   

Re: [Libosinfo] [PATCH osinfo-db] freebsd: add FreeBSD 11.2 info

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Sat, Jun 30, 2018 at 05:34:00PM +0400, Roman Bogorodskiy wrote:
> Signed-off-by: Roman Bogorodskiy 
> ---
>  data/os/freebsd.org/freebsd-11.2.xml.in | 50 +
>  1 file changed, 50 insertions(+)
>  create mode 100644 data/os/freebsd.org/freebsd-11.2.xml.in
> 
> diff --git a/data/os/freebsd.org/freebsd-11.2.xml.in 
> b/data/os/freebsd.org/freebsd-11.2.xml.in
> new file mode 100644
> index 000..d8cbaa5
> --- /dev/null
> +++ b/data/os/freebsd.org/freebsd-11.2.xml.in
> @@ -0,0 +1,50 @@
> +
> +
> +  http://freebsd.org/freebsd/11.2;>
> +freebsd11.2
> +<_name>FreeBSD 11.2
> +11.2
> +<_vendor>FreeBSD Project
> +freebsd
> +freebsd
> +http://freebsd.org/freebsd/11.1"/>
> +http://freebsd.org/freebsd/11.1"/>
> +
> +2018-06-27
> +
> +
> +  http://pcisig.com/pci/1af4/1000"/> 
> +  http://pcisig.com/pci/1af4/1001"/> 
> +
> +
> +
> +  
> https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.2/FreeBSD-11.2-RELEASE-amd64-dvd1.iso
> +  
> +FreeBSD
> +11_2_RELEASE_AMD64_DVD
> +  
> +
> +
> +  
> https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.2/FreeBSD-11.2-RELEASE-amd64-disc1.iso
> +  
> +FreeBSD
> +11_2_RELEASE_AMD64_CD
> +  
> +
> +
> +  
> https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.2/FreeBSD-11.2-RELEASE-i386-dvd1.iso
> +  
> +FreeBSD
> +11_2_RELEASE_I386_DVD
> +  
> +
> +
> +  
> https://download.freebsd.org/ftp/releases/ISO-IMAGES/11.2/FreeBSD-11.2-RELEASE-i386-disc1.iso
> +  
> +FreeBSD
> +11_2_RELEASE_I386_CD
> +  
> +
> +  
> +
> -- 
> 2.17.1
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH libosinfo] freebsd: add FreeBSD 11.2 isodata

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Sat, Jun 30, 2018 at 05:34:36PM +0400, Roman Bogorodskiy wrote:
> Signed-off-by: Roman Bogorodskiy 
> ---
>  .../FreeBSD-11.2-RELEASE-amd64-disc1.iso.txt  | 33 +++
>  .../FreeBSD-11.2-RELEASE-amd64-dvd1.iso.txt   | 33 +++
>  .../FreeBSD-11.2-RELEASE-i386-disc1.iso.txt   | 33 +++
>  .../FreeBSD-11.2-RELEASE-i386-dvd1.iso.txt| 33 +++
>  4 files changed, 132 insertions(+)
>  create mode 100644 
> tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-disc1.iso.txt
>  create mode 100644 
> tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-dvd1.iso.txt
>  create mode 100644 
> tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-i386-disc1.iso.txt
>  create mode 100644 
> tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-i386-dvd1.iso.txt
> 
> diff --git 
> a/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-disc1.iso.txt 
> b/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-disc1.iso.txt
> new file mode 100644
> index 000..8b887fd
> --- /dev/null
> +++ 
> b/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-disc1.iso.txt
> @@ -0,0 +1,33 @@
> +CD-ROM is in ISO 9660 format
> +System id: FreeBSD
> +Volume id: 11_2_RELEASE_AMD64_CD
> +Volume set id: 
> +Publisher id: THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/
> +Data preparer id: 
> +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: 342412
> +El Torito VD version 1 found, boot catalog is in sector 19
> +NO Joliet present
> +
> +SUSP signatures version 1 found
> +Rock Ridge signatures version 1 found
> +Rock Ridge id 'IEEE_P1282'
> +Eltorito validation header:
> +Hid 1
> +Arch 0 (x86)
> +ID ''
> +Cksum AA 55 OK
> +Key 55 AA
> +Eltorito defaultboot header:
> +Bootid 88 (bootable)
> +Boot media 0 (No Emulation Boot)
> +Load segment 0
> +Sys type 0
> +Nsect 4
> +Bootoff 1A4 420
> diff --git 
> a/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-dvd1.iso.txt 
> b/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-dvd1.iso.txt
> new file mode 100644
> index 000..e13bdae
> --- /dev/null
> +++ 
> b/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-amd64-dvd1.iso.txt
> @@ -0,0 +1,33 @@
> +CD-ROM is in ISO 9660 format
> +System id: FreeBSD
> +Volume id: 11_2_RELEASE_AMD64_DVD
> +Volume set id: 
> +Publisher id: THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/
> +Data preparer id: 
> +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: 1563513
> +El Torito VD version 1 found, boot catalog is in sector 19
> +NO Joliet present
> +
> +SUSP signatures version 1 found
> +Rock Ridge signatures version 1 found
> +Rock Ridge id 'IEEE_P1282'
> +Eltorito validation header:
> +Hid 1
> +Arch 0 (x86)
> +ID ''
> +Cksum AA 55 OK
> +Key 55 AA
> +Eltorito defaultboot header:
> +Bootid 88 (bootable)
> +Boot media 0 (No Emulation Boot)
> +Load segment 0
> +Sys type 0
> +Nsect 4
> +Bootoff 1A4 420
> diff --git 
> a/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-i386-disc1.iso.txt 
> b/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-i386-disc1.iso.txt
> new file mode 100644
> index 000..13cc515
> --- /dev/null
> +++ 
> b/tests/isodata/freebsd/freebsd11.2/FreeBSD-11.2-RELEASE-i386-disc1.iso.txt
> @@ -0,0 +1,33 @@
> +CD-ROM is in ISO 9660 format
> +System id: FreeBSD
> +Volume id: 11_2_RELEASE_I386_CD
> +Volume set id: 
> +Publisher id: THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/
> +Data preparer id: 
> +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: 295666
> +El Torito VD version 1 found, boot catalog is in sector 19
> +NO Joliet present
> +
> +SUSP signatures version 1 found
> +Rock Ridge signatures version 1 found
> +Rock Ridge id 'IEEE_P1282'
> +Eltorito validation header:
> +Hid 1
> +Arch 0 (x86)
> +ID ''
> +Cksum AA 55 OK
> +Key 55 AA
> +Eltorito defaultboot header:
> +Bootid 88 (bootable)
> +Boot media 0 (No Emulation Boot)
> +Load s

Re: [Libosinfo] [osinfo-db][PATCH 3/5] opensuse: Use 'network-installer' media attribute

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Sun, Jun 03, 2018 at 06:44:30PM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/opensuse.org/opensuse-15.0.xml.in   | 2 +-
>  data/os/opensuse.org/opensuse-42.3.xml.in   | 2 +-
>  data/os/opensuse.org/opensuse-tumbleweed.xml.in | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/data/os/opensuse.org/opensuse-15.0.xml.in 
> b/data/os/opensuse.org/opensuse-15.0.xml.in
> index 1ab497e..f3ce8dd 100644
> --- a/data/os/opensuse.org/opensuse-15.0.xml.in
> +++ b/data/os/opensuse.org/opensuse-15.0.xml.in
> @@ -46,7 +46,7 @@
>  
>  
>  
> -
> +
>
>
> http://download.opensuse.org/distribution/leap/15.0/iso/openSUSE-Leap-15.0-NET-x86_64.iso
>
> diff --git a/data/os/opensuse.org/opensuse-42.3.xml.in 
> b/data/os/opensuse.org/opensuse-42.3.xml.in
> index 7371a29..86ede7c 100644
> --- a/data/os/opensuse.org/opensuse-42.3.xml.in
> +++ b/data/os/opensuse.org/opensuse-42.3.xml.in
> @@ -47,7 +47,7 @@
>  
>  
>  
> -
> +
>
>
> http://download.opensuse.org/distribution/leap/42.3/iso/openSUSE-Leap-42.3-NET-x86_64.iso
>
> diff --git a/data/os/opensuse.org/opensuse-tumbleweed.xml.in 
> b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
> index 35f6f60..9361357 100644
> --- a/data/os/opensuse.org/opensuse-tumbleweed.xml.in
> +++ b/data/os/opensuse.org/opensuse-tumbleweed.xml.in
> @@ -68,7 +68,7 @@
>  
>  
>  
> -
> +
>
>
> http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso
>
> @@ -79,7 +79,7 @@
>boot/i386/loader/linux
>boot/i386/loader/initrd
>  
> -
> +
>
>
> http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso
>
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH 2/5] fedora: Use 'network-installer' media attribute

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Sun, Jun 03, 2018 at 06:44:29PM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/fedoraproject.org/fedora-19.xml.in | 2 +-
>  data/os/fedoraproject.org/fedora-20.xml.in | 4 ++--
>  data/os/fedoraproject.org/fedora-21.xml.in | 8 
>  data/os/fedoraproject.org/fedora-22.xml.in | 4 ++--
>  data/os/fedoraproject.org/fedora-23.xml.in | 8 
>  data/os/fedoraproject.org/fedora-24.xml.in | 8 
>  data/os/fedoraproject.org/fedora-25.xml.in | 8 
>  data/os/fedoraproject.org/fedora-26.xml.in | 4 ++--
>  data/os/fedoraproject.org/fedora-27.xml.in | 4 ++--
>  data/os/fedoraproject.org/fedora-28.xml.in | 4 ++--
>  10 files changed, 27 insertions(+), 27 deletions(-)


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH 1/5] rng: Add "network-installer" media attribute

[Christophe Fergeau]

Can you change 'rng' to 'schema' or 'relax-ng' in the shortlog? At first
I thought it was about Random Number Generators, which was puzzling :)

Acked-by: Christophe Fergeau 

On Sun, Jun 03, 2018 at 06:44:28PM +0200, Fabiano Fidêncio wrote:
> In the same way we have the "live" attribute to help apps using
> libosinfo to find out whether they can rely on the media being a live
> media or not, I'd like to propose the "network-installer" attribute.
> 
> This attribute would be used by the apps to find out which medias, from
> the same distro and version, should be considered a network-installer so
> the apps could make as clear as possible that network is required in
> order to proceed with the installation.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  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 843519d..c1dc0a5 100644
> --- a/data/schema/osinfo.rng.in
> +++ b/data/schema/osinfo.rng.in
> @@ -345,6 +345,11 @@
>
>  
>
> +  
> +
> +  
> +
> +  
>
>  
>
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] fedora, installer: Use authselect instead of authconfig

[Christophe Fergeau]

Hey,

Looks good
Acked-by: Christophe Fergeau 

For reference, this is documented in 'man authselect', and 'sudo
authselect list' 'sudo authselect show sssd'. The only 2 possible
choices at the moment are sssd and winbind.
I see it has a 'with-mkhomedir' option
with-mkhomedir::
Enable automatic creation of home directories for users on their
first login.

I assume by default it's going to do the right thing, and users will
have a homedir when needed? :)

Christophe

On Mon, Jun 04, 2018 at 08:55:57PM +0200, Fabiano Fidêncio wrote:
> authconfig has been deprecated on F28 and authselect is its replacement.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  .../fedoraproject.org/fedora-kickstart-desktop.xml.in  | 7 
> +++
>  data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in | 7 
> +++
>  2 files changed, 14 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 bdc9f5d..e8e1622 100644
> --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
> @@ -112,7 +112,14 @@ lang 
>  network --onboot yes --bootproto dhcp --noipv6 --hostname= select="config/hostname"/>
>  rootpw dummyPa55w0rd # Actual password set (or unset) in %post below
>  firewall --disabled
> +
> +  
>  authconfig --enableshadow --enablemd5
> +  
> +  
> +authselect select sssd
> +  
> +
>  timezone --utc 
>  bootloader --location=mbr
>  zerombr
> 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 8b99dfe..c4bda77 100644
> --- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
> +++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
> @@ -110,7 +110,14 @@ skipx
>  network --bootproto dhcp
>  rootpw 
>  firewall --disabled
> +
> +  
>  authconfig --enableshadow --enablemd5
> +  
> +  
> +authselect select sssd
> +  
> +
>  
>  selinux --enforcing
>  
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse, install-script: Skip second stage

[Christophe Fergeau]

On Thu, May 31, 2018 at 04:19:54PM +0200, Fabiano Fidêncio wrote:
> On Thu, May 31, 2018 at 3:35 PM, Christophe Fergeau  
> wrote:
> > On Thu, May 31, 2018 at 02:55:18PM +0200, Fabiano Fidêncio wrote:
> >> On Thu, May 31, 2018 at 2:24 PM, Christophe Fergeau  
> >> wrote:
> >> > On Thu, May 31, 2018 at 12:00:22PM +0200, Fabiano Fidêncio wrote:
> >> >> > If they are public, what happens in libosinfo if we try to set a
> >> >> > non-existent parameter? In other word, should we consider this an
> >> >> > API/ABI break, or are we fine with dropping it?
> >> >>
> >> >> We're totally fine dropping it.
> >> >> If we try to set a non-existent parameter (or pattern) autoyast is
> >> >> smart enough to not break the installation because of that.
> >> >
> >> > My worry was in libosinfo API, what happens to code using libosinfo and
> >> > trying to set this config parameter? Is this going to cause problems? Or
> >> > will it just be ignored?
> >>
> >> I see. About this, we don't actually set this parameter never ever.
> >> It's been only internal so far.
> >
> > "we"? My question was more if hypothetical "unknown" libosinfo users
> > could try to use that, and get failures after it gets removed. I agree
> > it's very far fetched, I was just trying to assess the impact of this
> > removal ;)
> >
> 
> "We" :-)
> I meant, libosinfo doesn't even expose this option, never ever.

Ah ok, I was not fully sure if tihs was the case or not, thanks for
bearing with me. And sorry for spending time on something that did not
need discussing!

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse, install-script: Skip second stage

[Christophe Fergeau]

On Thu, May 31, 2018 at 02:55:18PM +0200, Fabiano Fidêncio wrote:
> On Thu, May 31, 2018 at 2:24 PM, Christophe Fergeau  
> wrote:
> > On Thu, May 31, 2018 at 12:00:22PM +0200, Fabiano Fidêncio wrote:
> >> > If they are public, what happens in libosinfo if we try to set a
> >> > non-existent parameter? In other word, should we consider this an
> >> > API/ABI break, or are we fine with dropping it?
> >>
> >> We're totally fine dropping it.
> >> If we try to set a non-existent parameter (or pattern) autoyast is
> >> smart enough to not break the installation because of that.
> >
> > My worry was in libosinfo API, what happens to code using libosinfo and
> > trying to set this config parameter? Is this going to cause problems? Or
> > will it just be ignored?
> 
> I see. About this, we don't actually set this parameter never ever.
> It's been only internal so far.

"we"? My question was more if hypothetical "unknown" libosinfo users
could try to use that, and get failures after it gets removed. I agree
it's very far fetched, I was just trying to assess the impact of this
removal ;)

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse-unknown: Adjust the volume-id regex

[Christophe Fergeau]

On Thu, May 31, 2018 at 02:57:14PM +0200, Fabiano Fidêncio wrote:
> On Thu, May 31, 2018 at 2:23 PM, Christophe Fergeau  
> wrote:
> > On Thu, May 31, 2018 at 11:57:51AM +0200, Fabiano Fidêncio wrote:
> >> On Thu, May 31, 2018 at 10:54 AM, Christophe Fergeau
> >>  wrote:
> >> > On Sat, May 26, 2018 at 10:29:43PM +0200, Fabiano Fidêncio wrote:
> >> >> The regex to match unknown openSUSE prereleases is becoming
> >> >> bigger and harder to read.
> >> >>
> >> >> Basically, what it's doing is:
> >> >>
> >> >> (15\.[1-9]|(1[6-9]|[23]|[5-9])[0-9]\.[0-9]|4[3-9]\.[0-9])
> >> >> -   -      -
> >> >> | | ||   |
> >> >> v v v|   v
> >> >>   15.1+  16 20, 30, 50 - 90  v 43.0+
> >> >>   .0, .1, ..., .9
> >> >>
> >> >> I'm desconsidering both the 13.x series or older and 42.x series as
> >> >> those are not going to have new releases anymore.
> >> >
> >> > "desconsidering"? Dropping?
> >>
> >> I'll change it to "Dropping" before pushing.
> >>
> >> > Note that
> >> > https://en.opensuse.org/openSUSE:Roadmap does not entirely closes the
> >> > door on another 42.x release "There are currently no plans to release an
> >> > openSUSE Leap 42.4 aligned with the next service pack of SLE 12", but
> >> > that's close enough.
> >> > Are they really going to release 43.x in parallel to/after 15.x?
> >>
> >> No, they have no intention to release 43.x. I've talked to Richard
> >> Brown about this during openSUSE conference last weekend and
> >> explanation he gave me is that they're moving back to a number that
> >> would match SLES.
> >> The whole 42.x series was in order to totally distinguish between the
> >> old base they had with the new shiny system that Leap was supposed to
> >> be.
> >>
> >> So, they're now following 15.x ... if at some point SLES will have a
> >> 16.x opensuse 16.x will come to the playground as well.
> >
> > Your regexp in the commit log and in your patch has a 43.x part, so this
> > can be dropped.
> 
> I see where the confusion came from.
> So, if you don't mind I'd prefer to keep it there because the regex is
> keep everything:
> 15.1+, 16-41,  NOT 42, 43-99

Ah ok, you want to match all version numbers which never corresponded to
something which was released.

Acked-by: Christophe Fergeau 

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse, install-script: Skip second stage

[Christophe Fergeau]

On Thu, May 31, 2018 at 12:00:22PM +0200, Fabiano Fidêncio wrote:
> > If they are public, what happens in libosinfo if we try to set a
> > non-existent parameter? In other word, should we consider this an
> > API/ABI break, or are we fine with dropping it?
> 
> We're totally fine dropping it.
> If we try to set a non-existent parameter (or pattern) autoyast is
> smart enough to not break the installation because of that.

My worry was in libosinfo API, what happens to code using libosinfo and
trying to set this config parameter? Is this going to cause problems? Or
will it just be ignored?

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse-unknown: Adjust the volume-id regex

[Christophe Fergeau]

On Thu, May 31, 2018 at 11:57:51AM +0200, Fabiano Fidêncio wrote:
> On Thu, May 31, 2018 at 10:54 AM, Christophe Fergeau
>  wrote:
> > On Sat, May 26, 2018 at 10:29:43PM +0200, Fabiano Fidêncio wrote:
> >> The regex to match unknown openSUSE prereleases is becoming
> >> bigger and harder to read.
> >>
> >> Basically, what it's doing is:
> >>
> >> (15\.[1-9]|(1[6-9]|[23]|[5-9])[0-9]\.[0-9]|4[3-9]\.[0-9])
> >> -   -      -
> >> | | ||   |
> >> v v v|   v
> >>   15.1+  16 20, 30, 50 - 90  v 43.0+
> >>   .0, .1, ..., .9
> >>
> >> I'm desconsidering both the 13.x series or older and 42.x series as
> >> those are not going to have new releases anymore.
> >
> > "desconsidering"? Dropping?
> 
> I'll change it to "Dropping" before pushing.
> 
> > Note that
> > https://en.opensuse.org/openSUSE:Roadmap does not entirely closes the
> > door on another 42.x release "There are currently no plans to release an
> > openSUSE Leap 42.4 aligned with the next service pack of SLE 12", but
> > that's close enough.
> > Are they really going to release 43.x in parallel to/after 15.x?
> 
> No, they have no intention to release 43.x. I've talked to Richard
> Brown about this during openSUSE conference last weekend and
> explanation he gave me is that they're moving back to a number that
> would match SLES.
> The whole 42.x series was in order to totally distinguish between the
> old base they had with the new shiny system that Leap was supposed to
> be.
> 
> So, they're now following 15.x ... if at some point SLES will have a
> 16.x opensuse 16.x will come to the playground as well.

Your regexp in the commit log and in your patch has a 43.x part, so this
can be dropped.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo][PATCH v2] tests: Add test-os-resources

[Christophe Fergeau]

Acked-by: Christophe Fergeau 

On Fri, May 04, 2018 at 10:34:09PM +0200, Fabiano Fidêncio wrote:
> From: Fabiano Fidêncio 
> 
> test-os-resources has been written to avoid bug as having minimum
> resources greater than the recommended resources in osinfo-db.
> 
> This problem was exposed by RHEL/CentOS data files, which caused some
> really bad UI effect in clientes using those two attributes (as GNOME
> Boxes).
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  tests/Makefile.am |   5 ++
>  tests/test-os-resources.c | 184 
> ++
>  2 files changed, 189 insertions(+)
>  create mode 100644 tests/test-os-resources.c
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 7566d3c..06f81bf 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -17,6 +17,7 @@ check_PROGRAMS = \
>   test-loader \
>   test-isodetect \
>   test-install-script \
> + test-os-resources \
>  $(NULL)
>  
>  if HAVE_CURL
> @@ -111,6 +112,10 @@ test_install_script_LDADD = $(COMMON_LDADD)
>  test_install_script_CFLAGS = $(COMMON_CFLAGS)
>  test_install_script_SOURCES = test-install-script.c
>  
> +test_os_resources_LDADD = $(COMMON_LDADD)
> +test_os_resources_CFLAGS = $(COMMON_CFLAGS)
> +test_os_resources_SOURCES = test-os-resources.c
> +
>  TESTS = $(check_PROGRAMS) \
>   $(NULL)
>  
> diff --git a/tests/test-os-resources.c b/tests/test-os-resources.c
> new file mode 100644
> index 000..f7a8039
> --- /dev/null
> +++ b/tests/test-os-resources.c
> @@ -0,0 +1,184 @@
> +/*
> + * Copyright (C) 2017 Fabiano Fidêncio
> + *
> + * 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, write to the Free Software Foundation,
> + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> + *
> + * Authors:
> + *   Fabiano Fidêncio 
> + */
> +
> +#include 
> +
> +#include 
> +#include 
> +
> +
> +static void test_n_cpus(OsinfoResources *minimum, OsinfoResources 
> *recommended)
> +{
> +gint minimum_cpus, recommended_cpus;
> +
> +minimum_cpus = osinfo_resources_get_n_cpus(minimum);
> +recommended_cpus = osinfo_resources_get_n_cpus(recommended);
> +
> +if (recommended_cpus >= 0 && minimum_cpus >= 0)
> +g_assert_true(recommended_cpus >= minimum_cpus);
> +}
> +
> +
> +static void test_cpu(OsinfoResources *minimum, OsinfoResources *recommended)
> +{
> +gint64 minimum_cpu, recommended_cpu;
> +
> +minimum_cpu = osinfo_resources_get_cpu(minimum);
> +recommended_cpu = osinfo_resources_get_cpu(recommended);
> +
> +if (recommended_cpu >= 0 && minimum_cpu >= 0)
> +g_assert_true(recommended_cpu >= minimum_cpu);
> +}
> +
> +
> +static void test_ram(OsinfoResources *minimum, OsinfoResources *recommended)
> +{
> +gint64 minimum_ram, recommended_ram;
> +
> +minimum_ram = osinfo_resources_get_ram(minimum);
> +recommended_ram = osinfo_resources_get_ram(recommended);
> +
> +if (recommended_ram >= 0 && minimum_ram >= 0)
> +g_assert_true(recommended_ram >= minimum_ram);
> +}
> +
> +
> +static void test_storage(OsinfoResources *minimum, OsinfoResources 
> *recommended)
> +{
> +gint64 minimum_storage, recommended_storage;
> +
> +minimum_storage = osinfo_resources_get_storage(minimum);
> +recommended_storage = osinfo_resources_get_storage(recommended);
> +
> +if (recommended_storage >= 0 && minimum_storage >= 0)
> +g_assert_true(recommended_storage >= minimum_storage);
> +}
> +
> +static void
> +test_minimum_recommended_resources(void)
> +{
> +OsinfoLoader *loader = osinfo_loader_new();
> +OsinfoDb *db = osinfo_loader_get_db(loader);
> +OsinfoOsList *oslist;
> +GList *oses;
> +GList *oses_it;
> +GError *error = NULL;
> +
> +g_assert_true(OSINFO_IS_LOADER(loader));
> +g_assert_true(OSINFO_IS_DB(db));
> +
> +osinfo_loader_process_default_path(loader, );
> +g_assert_no

Re: [Libosinfo] [libosinfo][PATCH] opensuse: Add Leap 15.0 isodata

[Christophe Fergeau]

Hey,

Commented on some of the patches, but for the series,

Acked-by: Christophe Fergeau 

On Sat, May 26, 2018 at 10:29:37PM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  .../openSUSE-Leap-15.0-DVD-x86_64.iso.txt  | 29 
> ++
>  .../openSUSE-Leap-15.0-NET-x86_64.iso.txt  | 29 
> ++
>  2 files changed, 58 insertions(+)
>  create mode 100644 
> tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-DVD-x86_64.iso.txt
>  create mode 100644 
> tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-NET-x86_64.iso.txt
> 
> diff --git 
> a/tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-DVD-x86_64.iso.txt 
> b/tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-DVD-x86_64.iso.txt
> new file mode 100644
> index 000..e89a0de
> --- /dev/null
> +++ 
> b/tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-DVD-x86_64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: openSUSE-Leap-15.0-DVD-x86_64267
> +Volume set id: 
> +Publisher id: SUSE LINUX GmbH
> +Data preparer id: KIWI - http://opensuse.github.com/kiwi
> +Application id: openSUSE-Leap-15.0-DVD-x86_64-Build267.2-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: 1912564
> +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 145C 5212
> diff --git 
> a/tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-NET-x86_64.iso.txt 
> b/tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-NET-x86_64.iso.txt
> new file mode 100644
> index 000..d6e6619
> --- /dev/null
> +++ 
> b/tests/isodata/opensuse/opensuse15.0/openSUSE-Leap-15.0-NET-x86_64.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: openSUSE-Leap-15.0-NET-x86_64267
> +Volume set id: 
> +Publisher id: SUSE LINUX GmbH
> +Data preparer id: KIWI - http://opensuse.github.com/kiwi
> +Application id: openSUSE-Leap-15.0-NET-x86_64-Build267.2-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: 60205
> +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 FC8 4040
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse-unknown: Adjust upgrades/derives-from for leap 15.0

[Christophe Fergeau]

On Sat, May 26, 2018 at 10:29:41PM +0200, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/opensuse.org/opensuse-unknown.xml.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/data/os/opensuse.org/opensuse-unknown.xml.in 
> b/data/os/opensuse.org/opensuse-unknown.xml.in
> index 195ea4a..1292372 100644
> --- a/data/os/opensuse.org/opensuse-unknown.xml.in
> +++ b/data/os/opensuse.org/opensuse-unknown.xml.in
> @@ -8,8 +8,8 @@
>  <_vendor>openSUSE
>  linux
>  opensuse
> -http://opensuse.org/opensuse/42.2"/>
> -http://opensuse.org/opensuse/42.2"/>
> +http://opensuse.org/opensuse/15.0"/>
> +http://opensuse.org/opensuse/15.0"/>

Huhu, 15.0 being newer than 42.2 is odd ;)

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse, install-script: Skip second stage

[Christophe Fergeau]

On Sat, May 26, 2018 at 10:29:38PM +0200, Fabiano Fidêncio wrote:
> As we don't do anything in the second stage, we can just skip it
> entirely without any issues.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> 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 6554eb6..537c266 100644
> --- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
> +++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in
> @@ -144,6 +144,7 @@
>
>
>  false
> +false

Are these 'config:type' parameters something which is exposed to the
library user, right? Or Are they something purley internal?
If they are public, what happens in libosinfo if we try to set a
non-existent parameter? In other word, should we consider this an
API/ABI break, or are we fine with dropping it?

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [osinfo-db][PATCH] opensuse-unknown: Adjust the volume-id regex

[Christophe Fergeau]

On Sat, May 26, 2018 at 10:29:43PM +0200, Fabiano Fidêncio wrote:
> The regex to match unknown openSUSE prereleases is becoming
> bigger and harder to read.
> 
> Basically, what it's doing is:
> 
> (15\.[1-9]|(1[6-9]|[23]|[5-9])[0-9]\.[0-9]|4[3-9]\.[0-9])
> -   -      -
> | | ||   |
> v v v|   v
>   15.1+  16 20, 30, 50 - 90  v 43.0+
>   .0, .1, ..., .9
> 
> I'm desconsidering both the 13.x series or older and 42.x series as
> those are not going to have new releases anymore.

"desconsidering"? Dropping? Note that
https://en.opensuse.org/openSUSE:Roadmap does not entirely closes the
door on another 42.x release "There are currently no plans to release an
openSUSE Leap 42.4 aligned with the next service pack of SLE 12", but
that's close enough.
Are they really going to release 43.x in parallel to/after 15.x?

Christophe

> 
> Also, (DVD|NET|Kubic) was introduced as this is the naming chosen for
> DVD or NET installation or whether it's a Kubic  DVD installation.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/opensuse.org/opensuse-unknown.xml.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/data/os/opensuse.org/opensuse-unknown.xml.in 
> b/data/os/opensuse.org/opensuse-unknown.xml.in
> index 06ae67a..6a8a3b2 100644
> --- a/data/os/opensuse.org/opensuse-unknown.xml.in
> +++ b/data/os/opensuse.org/opensuse-unknown.xml.in
> @@ -14,7 +14,7 @@
>  
>  
>
> -
> openSUSE-Leap-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD-x86_64
> +
> openSUSE-Leap-(15\.[1-9]|(1[6-9]|[23]|[5-9])[0-9]\.[0-9]|4[3-9]\.[0-9])-(DVD|NET|Kubic)-x86_64*
>  LINUX
>  SUSE LINUX GmbH
>
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] endlessos: Add Endless OS 3.4

[Christophe Fergeau]

On Wed, May 23, 2018 at 11:26:31AM +0200, Felipe Borges wrote:
> Hi!
> 
> On Wed, May 23, 2018 at 11:02 AM, Christophe Fergeau
> <cferg...@redhat.com> wrote:
> > Hey,
> >
> > On Tue, May 22, 2018 at 05:14:27PM +0200, Felipe Borges wrote:
> >> Signed-off-by: Felipe Borges <febor...@redhat.com>
> >> ---
> >>  data/os/endlessos.com/eos-3.4.xml.in | 199 +++
> >>  1 file changed, 199 insertions(+)
> >>  create mode 100644 data/os/endlessos.com/eos-3.4.xml.in
> >>
> >> diff --git a/data/os/endlessos.com/eos-3.4.xml.in 
> >> b/data/os/endlessos.com/eos-3.4.xml.in
> >> new file mode 100644
> >> index 000..d06b328
> >> --- /dev/null
> >> +++ b/data/os/endlessos.com/eos-3.4.xml.in
> >> @@ -0,0 +1,199 @@
> >> +
> >> +
> >> +  http://endlessos.com/eos/3.4;>
> >> +eos3.4
> >> +<_name>Endless OS 3.4
> >> +3.4
> >> +<_vendor>Endless Mobile, Inc
> >> +linux
> >> +eos
> >> +
> >> +2018-05-15
> >> +
> >> +
> >> +  <_name>Endless OS Basic
> >> +
> >> +
> >> +  <_name>Endless OS Arabic
> >> +
> >> +
> >> +  <_name>Endless OS Bengali
> >> +
> >> +
> >> +  <_name>Endless OS English
> >> +
> >> +
> >> +  <_name>Endless OS Spanish
> >> +
> >> +
> >> +  <_name>Endless OS Spanish (Guatemala)
> >> +
> >> +
> >> +  <_name>Endless OS Spanish (Mexico)
> >> +
> >> +
> >> +  <_name>Endless OS French
> >> +
> >> +
> >> +  <_name>Endless OS Indonesian
> >> +
> >> +
> >> +  <_name>Endless OS Portuguese (Brazil)
> >> +
> >> +
> >> +  <_name>Endless OS Thai
> >> +
> >> +
> >> +  <_name>Endless OS Vietnamese
> >> +
> >> +
> >> +  <_name>Endless OS Chinese (China)
> >> +
> >> +
> >> +
> >> +
> >> +  
> >> +  
> >> https://d1anzknqnc1kmb.cloudfront.net/release/3.4.0/eos-amd64-amd64/base/eos-eos3.4-amd64-amd64.180515-041823.base.iso
> >> +  
> >> +Endless-OS-3-4-0-base
> >> +1867401216
> >> +  
> >> +
> >> +
> >> +
> >> +
> >> +  
> >> +  
> >> https://d1anzknqnc1kmb.cloudfront.net/release/3.4.0/eos-amd64-amd64/ar/eos-eos3.4-amd64-amd64.180515-054338.ar.iso
> >> +  
> >> +Endless-OS-3-4-0-ar
> >> +9225773056
> >
> > libosinfo has the concept of "language-map" in order to map some
> > language code in the volume id to some locale identifier, see the
> > data/os/microsoft.com/win-7.xml.in and
> > data/datamap/microsoft.com/win-7-l10n-language.xml.in for example,
> > imo it would be more appropriate to use that here rather than multiple
> > variants.
> 
> The reasoning behind the use of multiple variants is that Endless
> ships different content in each image. The Spanish, Mexican,
> Guatemalan "variants" have different content in it.
> 
> What do you think?

Are there ISOs with the same content, and whose only difference is their
language? Or is each language also getting some variations in the
available applications/...? This reasoning belongs in the commit log btw
;)

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] endlessos: Add Endless OS 3.4

[Christophe Fergeau]

Hey,

On Tue, May 22, 2018 at 05:14:27PM +0200, Felipe Borges wrote:
> Signed-off-by: Felipe Borges 
> ---
>  data/os/endlessos.com/eos-3.4.xml.in | 199 +++
>  1 file changed, 199 insertions(+)
>  create mode 100644 data/os/endlessos.com/eos-3.4.xml.in
> 
> diff --git a/data/os/endlessos.com/eos-3.4.xml.in 
> b/data/os/endlessos.com/eos-3.4.xml.in
> new file mode 100644
> index 000..d06b328
> --- /dev/null
> +++ b/data/os/endlessos.com/eos-3.4.xml.in
> @@ -0,0 +1,199 @@
> +
> +
> +  http://endlessos.com/eos/3.4;>
> +eos3.4
> +<_name>Endless OS 3.4
> +3.4
> +<_vendor>Endless Mobile, Inc
> +linux
> +eos
> +
> +2018-05-15
> +
> +
> +  <_name>Endless OS Basic
> +
> +
> +  <_name>Endless OS Arabic
> +
> +
> +  <_name>Endless OS Bengali
> +
> +
> +  <_name>Endless OS English
> +
> +
> +  <_name>Endless OS Spanish
> +
> +
> +  <_name>Endless OS Spanish (Guatemala)
> +
> +
> +  <_name>Endless OS Spanish (Mexico)
> +
> +
> +  <_name>Endless OS French
> +
> +
> +  <_name>Endless OS Indonesian
> +
> +
> +  <_name>Endless OS Portuguese (Brazil)
> +
> +
> +  <_name>Endless OS Thai
> +
> +
> +  <_name>Endless OS Vietnamese
> +
> +
> +  <_name>Endless OS Chinese (China)
> +
> +
> +
> +
> +  
> +  
> https://d1anzknqnc1kmb.cloudfront.net/release/3.4.0/eos-amd64-amd64/base/eos-eos3.4-amd64-amd64.180515-041823.base.iso
> +  
> +Endless-OS-3-4-0-base
> +1867401216
> +  
> +
> +
> +
> +
> +  
> +  
> https://d1anzknqnc1kmb.cloudfront.net/release/3.4.0/eos-amd64-amd64/ar/eos-eos3.4-amd64-amd64.180515-054338.ar.iso
> +  
> +Endless-OS-3-4-0-ar
> +9225773056

libosinfo has the concept of "language-map" in order to map some
language code in the volume id to some locale identifier, see the
data/os/microsoft.com/win-7.xml.in and
data/datamap/microsoft.com/win-7-l10n-language.xml.in for example,
imo it would be more appropriate to use that here rather than multiple
variants. I'm not sure there is a test case for this feature though, nor
that it has been tested recently, so if this does not work as expected,
this might be a preexisting bug in libosinfo code.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [[osinfo-db][PATCH]] fedora: Use more descriptive name for variant ids

[Christophe Fergeau]

On Mon, May 14, 2018 at 01:20:43PM +0200, Fabiano Fidêncio wrote:
> On Mon, May 14, 2018 at 1:04 PM, Christophe Fergeau <cferg...@redhat.com> 
> wrote:
> > On Sun, May 13, 2018 at 11:05:36AM +0200, Fabiano Fidêncio wrote:
> >> From: Fabiano Fidêncio <fabi...@fidencio.org>
> >>
> >> For the user installing the system it does matter whether they will use
> >> the Live, Network Installer or Atomic version of Fedora Workstation
> >> (taking this as an example). So, let's expose this info instead of just
> >> showing "Fedora Workstation" for all of those.
> >>
> >> Signed-off-by: Fabiano Fidêncio <fabi...@fidencio.org>
> >> ---
> >>  data/os/fedoraproject.org/fedora-27.xml.in | 10 +-
> >>  data/os/fedoraproject.org/fedora-28.xml.in | 10 +-
> >>  2 files changed, 10 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/data/os/fedoraproject.org/fedora-27.xml.in 
> >> b/data/os/fedoraproject.org/fedora-27.xml.in
> >> index ba657d0..a48728d 100644
> >> --- a/data/os/fedoraproject.org/fedora-27.xml.in
> >> +++ b/data/os/fedoraproject.org/fedora-27.xml.in
> >> @@ -14,19 +14,19 @@
> >>  2017-11-14
> >>
> >>  
> >> -  <_name>Fedora 27 Workstation
> >> +  <_name>Fedora 27 Workstation (Live)
> >
> > This is redundant with live="true" on the  nodes, and actually
> > gnome-boxes is already appending "(Live)" on its own when this attribute
> > is set, so I'm not sure this is the right way to go.
> 
> Makes sense.
> Does the patch still make sense with this part dropped?

While (Atomic) is harder to express in a generic way, I feel that the
"Network Installer" bit might be useful as some kind of XML attribute
rather than being in the string?

Christophe

> 
> >
> > Christophe
> >
> >>  
> >>  
> >> -  <_name>Fedora 27 Workstation
> >> +  <_name>Fedora 27 Workstation (Network Installer)
> >>  
> >>  
> >> -  <_name>Fedora 27 Workstation
> >> +  <_name>Fedora 27 Workstation (Atomic)
> >>  
> >>  
> >> -  <_name>Fedora 27 Server
> >> +  <_name>Fedora 27 Server (DVD)
> >>  
> >>  
> >> -  <_name>Fedora 27 Server
> >> +  <_name>Fedora 27 Server (Network Installer)
> >>  
> >>
> >>  
> >> diff --git a/data/os/fedoraproject.org/fedora-28.xml.in 
> >> b/data/os/fedoraproject.org/fedora-28.xml.in
> >> index cda279c..4e75d63 100644
> >> --- a/data/os/fedoraproject.org/fedora-28.xml.in
> >> +++ b/data/os/fedoraproject.org/fedora-28.xml.in
> >> @@ -14,19 +14,19 @@
> >>  2018-05-01
> >>
> >>  
> >> -  <_name>Fedora 28 Workstation
> >> +  <_name>Fedora 28 Workstation (Live)
> >>  
> >>  
> >> -  <_name>Fedora 28 Workstation
> >> +  <_name>Fedora 28 Workstation (Network Installer)
> >>  
> >>  
> >> -  <_name>Fedora 28 Workstation
> >> +  <_name>Fedora 28 Workstation (Atomic)
> >>  
> >>  
> >> -  <_name>Fedora 28 Server
> >> +  <_name>Fedora 28 Server (DVD)
> >>  
> >>  
> >> -  <_name>Fedora 28 Server
> >> +  <_name>Fedora 28 Server (Network Installer)
> >>  
> >>
> >>  
> >> --
> >> 2.14.3
> >>
> >> ___
> >> Libosinfo mailing list
> >> Libosinfo@redhat.com
> >> https://www.redhat.com/mailman/listinfo/libosinfo
> >
> > ___
> > Libosinfo mailing list
> > Libosinfo@redhat.com
> > https://www.redhat.com/mailman/listinfo/libosinfo
> >
> 
> 
> 
> -- 
> Fabiano Fidêncio


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [[libosinfo][PATCH]] fedora: Add f28 isodata

[Christophe Fergeau]

Acked-by: Christophe Fergeau <cferg...@redhat.com>

On Sun, May 13, 2018 at 11:05:34AM +0200, Fabiano Fidêncio wrote:
> From: Fabiano Fidêncio <fabi...@fidencio.org>
> 
> Signed-off-by: Fabiano Fidêncio <fabi...@fidencio.org>
> ---
>  ...-AtomicWorkstation-ostree-x86_64-28-1.1.iso.txt | 29 
> ++
>  .../Fedora-Server-dvd-x86_64-28-1.1.iso.txt| 29 
> ++
>  .../Fedora-Server-netinst-x86_64-28-1.1.iso.txt| 29 
> ++
>  .../Fedora-Workstation-Live-x86_64-28-1.1.iso.txt  | 29 
> ++
>  4 files changed, 116 insertions(+)
>  create mode 100644 
> tests/isodata/fedora/fedora28/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso.txt
>  create mode 100644 
> tests/isodata/fedora/fedora28/Fedora-Server-dvd-x86_64-28-1.1.iso.txt
>  create mode 100644 
> tests/isodata/fedora/fedora28/Fedora-Server-netinst-x86_64-28-1.1.iso.txt
>  create mode 100644 
> tests/isodata/fedora/fedora28/Fedora-Workstation-Live-x86_64-28-1.1.iso.txt
> 
> diff --git 
> a/tests/isodata/fedora/fedora28/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso.txt
>  
> b/tests/isodata/fedora/fedora28/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso.txt
> new file mode 100644
> index 000..6380eee
> --- /dev/null
> +++ 
> b/tests/isodata/fedora/fedora28/Fedora-AtomicWorkstation-ostree-x86_64-28-1.1.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-AW-ostree-x86_64-28
> +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: 1020825
> +El Torito VD version 1 found, boot catalog is in sector 44
> +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 F80AD 1015981
> diff --git 
> a/tests/isodata/fedora/fedora28/Fedora-Server-dvd-x86_64-28-1.1.iso.txt 
> b/tests/isodata/fedora/fedora28/Fedora-Server-dvd-x86_64-28-1.1.iso.txt
> new file mode 100644
> index 000..5fc55ac
> --- /dev/null
> +++ b/tests/isodata/fedora/fedora28/Fedora-Server-dvd-x86_64-28-1.1.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-S-dvd-x86_64-28
> +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: 1417496
> +El Torito VD version 1 found, boot catalog is in sector 499
> +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 48C5B 298075
> diff --git 
> a/tests/isodata/fedora/fedora28/Fedora-Server-netinst-x86_64-28-1.1.iso.txt 
> b/tests/isodata/fedora/fedora28/Fedora-Server-netinst-x86_64-28-1.1.iso.txt
> new file mode 100644
> index 000..bbfbe82
> --- /dev/null
> +++ 
> b/tests/isodata/fedora/fedora28/Fedora-Server-netinst-x86_64-28-1.1.iso.txt
> @@ -0,0 +1,29 @@
> +CD-ROM is in ISO 9660 format
> +System id: LINUX
> +Volume id: Fedora-S-dvd-x86_64-28
> +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: 298051
> +El Torito VD version 1 found, boot catalog is in sector 44
> +Joliet with UCS level 3 found
> +Rock Ridge signatures version 1 found
> +Eltorito validation header:
> +Hid 1
> +  

Re: [Libosinfo] [[osinfo-db][PATCH]] fedora-unknown: Adjust the regular expression

[Christophe Fergeau]

Acked-by: Christophe Fergeau <cferg...@redhat.com>

On Sun, May 13, 2018 at 11:05:35AM +0200, Fabiano Fidêncio wrote:
> From: Fabiano Fidêncio <fabi...@fidencio.org>
> 
> f28 data has been added, so let's adjust the regular expression to match
> f29+.
> 
> Signed-off-by: Fabiano Fidêncio <fabi...@fidencio.org>
> ---
>  data/os/fedoraproject.org/fedora-unknown.xml.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in 
> b/data/os/fedoraproject.org/fedora-unknown.xml.in
> index 704829b..694a30b 100644
> --- a/data/os/fedoraproject.org/fedora-unknown.xml.in
> +++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
> @@ -14,7 +14,7 @@
>  
>  
>
> -Fedora-.*-dvd-x86_64-(2[8-9]|[3-9][0-9]|rawh)
> +Fedora-.*-dvd-x86_64-(29|[3-9][0-9]|rawh)
>  LINUX
>
>isolinux/vmlinuz
> @@ -23,7 +23,7 @@
>  
>  
>
> -Fedora-.*-Live-(2[8-9]|[3-9][0-9]|Rawhide).*
> +Fedora-.*-Live-(29|[3-9][0-9]|Rawhide).*
>  LINUX
>
>  
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [[osinfo-db][PATCH]] fedora: Use more descriptive name for variant ids

[Christophe Fergeau]

On Sun, May 13, 2018 at 11:05:36AM +0200, Fabiano Fidêncio wrote:
> From: Fabiano Fidêncio 
> 
> For the user installing the system it does matter whether they will use
> the Live, Network Installer or Atomic version of Fedora Workstation
> (taking this as an example). So, let's expose this info instead of just
> showing "Fedora Workstation" for all of those.
> 
> Signed-off-by: Fabiano Fidêncio 
> ---
>  data/os/fedoraproject.org/fedora-27.xml.in | 10 +-
>  data/os/fedoraproject.org/fedora-28.xml.in | 10 +-
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/data/os/fedoraproject.org/fedora-27.xml.in 
> b/data/os/fedoraproject.org/fedora-27.xml.in
> index ba657d0..a48728d 100644
> --- a/data/os/fedoraproject.org/fedora-27.xml.in
> +++ b/data/os/fedoraproject.org/fedora-27.xml.in
> @@ -14,19 +14,19 @@
>  2017-11-14
>  
>  
> -  <_name>Fedora 27 Workstation
> +  <_name>Fedora 27 Workstation (Live)

This is redundant with live="true" on the  nodes, and actually
gnome-boxes is already appending "(Live)" on its own when this attribute
is set, so I'm not sure this is the right way to go.

Christophe

>  
>  
> -  <_name>Fedora 27 Workstation
> +  <_name>Fedora 27 Workstation (Network Installer)
>  
>  
> -  <_name>Fedora 27 Workstation
> +  <_name>Fedora 27 Workstation (Atomic)
>  
>  
> -  <_name>Fedora 27 Server
> +  <_name>Fedora 27 Server (DVD)
>  
>  
> -  <_name>Fedora 27 Server
> +  <_name>Fedora 27 Server (Network Installer)
>  
>  
>  
> diff --git a/data/os/fedoraproject.org/fedora-28.xml.in 
> b/data/os/fedoraproject.org/fedora-28.xml.in
> index cda279c..4e75d63 100644
> --- a/data/os/fedoraproject.org/fedora-28.xml.in
> +++ b/data/os/fedoraproject.org/fedora-28.xml.in
> @@ -14,19 +14,19 @@
>  2018-05-01
>  
>  
> -  <_name>Fedora 28 Workstation
> +  <_name>Fedora 28 Workstation (Live)
>  
>  
> -  <_name>Fedora 28 Workstation
> +  <_name>Fedora 28 Workstation (Network Installer)
>  
>  
> -  <_name>Fedora 28 Workstation
> +  <_name>Fedora 28 Workstation (Atomic)
>  
>  
> -  <_name>Fedora 28 Server
> +  <_name>Fedora 28 Server (DVD)
>  
>  
> -  <_name>Fedora 28 Server
> +  <_name>Fedora 28 Server (Network Installer)
>  
>  
>  
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

[Libosinfo] [osinfo-db 2/2] asianux: Add eol dates

[Christophe Fergeau]

From: Vincent Dao 

---
 data/os/asianux.com/asianux-4.6.xml.in | 1 +
 data/os/asianux.com/asianux-4.7.xml.in | 1 +
 data/os/asianux.com/asianux-7.0.xml.in | 1 +
 data/os/asianux.com/asianux-7.1.xml.in | 1 +
 data/os/asianux.com/asianux-7.2.xml.in | 1 +
 5 files changed, 5 insertions(+)

diff --git a/data/os/asianux.com/asianux-4.6.xml.in 
b/data/os/asianux.com/asianux-4.6.xml.in
index 4cfb73e..d6d328c 100644
--- a/data/os/asianux.com/asianux-4.6.xml.in
+++ b/data/os/asianux.com/asianux-4.6.xml.in
@@ -12,6 +12,7 @@
 http://redhat.com/rhel/6.8"/>
 
 2016-07-21
+2021-12-31
 
 
   
diff --git a/data/os/asianux.com/asianux-4.7.xml.in 
b/data/os/asianux.com/asianux-4.7.xml.in
index 9661763..dac81f4 100644
--- a/data/os/asianux.com/asianux-4.7.xml.in
+++ b/data/os/asianux.com/asianux-4.7.xml.in
@@ -12,6 +12,7 @@
 http://redhat.com/rhel/6.9"/>
 
 2017-05-26
+2021-12-31
 
 
   
diff --git a/data/os/asianux.com/asianux-7.0.xml.in 
b/data/os/asianux.com/asianux-7.0.xml.in
index a85333f..70b18c5 100644
--- a/data/os/asianux.com/asianux-7.0.xml.in
+++ b/data/os/asianux.com/asianux-7.0.xml.in
@@ -13,6 +13,7 @@
 http://redhat.com/rhel/7.0"/>
 
 2015-07-16
+2025-12-31
 
 
   
diff --git a/data/os/asianux.com/asianux-7.1.xml.in 
b/data/os/asianux.com/asianux-7.1.xml.in
index 617cf38..4a22af7 100644
--- a/data/os/asianux.com/asianux-7.1.xml.in
+++ b/data/os/asianux.com/asianux-7.1.xml.in
@@ -13,6 +13,7 @@
 http://asianux.com/asianux/7.0"/>
 
 2016-01-22
+2025-12-31
 
 
   
diff --git a/data/os/asianux.com/asianux-7.2.xml.in 
b/data/os/asianux.com/asianux-7.2.xml.in
index 253ba4c..ea9bbb1 100644
--- a/data/os/asianux.com/asianux-7.2.xml.in
+++ b/data/os/asianux.com/asianux-7.2.xml.in
@@ -13,6 +13,7 @@
 http://asianux.com/asianux/7.1"/>
 
 2017-10-24
+2025-12-31
 
 
   
-- 
2.14.3

___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo