[Libosinfo] [PATCH] rhel: Fix isodata for RHEL 7.5 on ppc64le

[Daniel P. Berrangé]

On Thu, May 03, 2018 at 05:09:19PM +0200, Andrea Bolognani wrote:
> There is a spurious empty line at the end of the file that
> causes 'make syntax-check' to fail with:
> 
>   [...]
>   tests/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt
>   maint.mk: empty line(s) or no newline at EOF
>   make: *** [maint.mk:927: sc_prohibit_empty_lines_at_EOF] Error 1
> 
> Get rid of it to solve the issue.
> 
> See also
> 
>   https://ci.centos.org/view/libvirt/job/libosinfo-master-syntax-check/123/
> 
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
> test-isodetect still fails for me with
> 
>   [...]
>     /isodetect/rhel:
>   ** (/home/test/libosinfo/tests/.libs/lt-test-isodetect:23747): ERROR **: ISO RHEL-7.5-20180322.0-Server-ppc64-dvd1.iso.txt was not matched by OS rhel7.5
>   Trace/breakpoint trap (core dumped)
> 
> but I think that's because the relevant information has not been
> merged into osinfo-db yet?

It is in osinfo-db - you will just need to update your local database
eg do to osinfo-db git checkout and run 'make', and it'll generate you
a tar.gz file. Just import that 

  osinfo-db-import osinfo-db-20180503.tar.xz

and then tests will pass

> 
>  .../isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tests/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt b/tests/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt
> index d555458..1aa5db0 100644
> --- a/tests/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt
> +++ b/tests/isodata/rhel/rhel7.5/RHEL-7.5-20180322.0-Server-ppc64le-dvd1.iso.txt
> @@ -14,4 +14,3 @@ Logical block size is: 2048
>  Volume size is: 1694649
>  Joliet with UCS level 3 found
>  Rock Ridge signatures version 1 found
> -
> -- 
> 2.14.3
> 
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo

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