spec: fix build with `%define with_qemu 0`

[PATCH] spec: fix build with `%define with_qemu 0`

Posted by Cole Robinson via Devel 4 months, 1 week ago

test_libvirt_sanlock.aug is dependent on WITH_QEMU in meson config

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 libvirt.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index aff2707705..7cb558770f 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -2444,13 +2444,13 @@ exit 0
 %files daemon-plugin-sanlock
         %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
+%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
         %endif
         %if %{with_libxl}
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
         %endif
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
-%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
 %dir %attr(0770, root, sanlock) %{_localstatedir}/lib/libvirt/sanlock
 %{_sbindir}/virt-sanlock-cleanup
 %{_mandir}/man8/virt-sanlock-cleanup.8*
-- 
2.51.0

Re: [PATCH] spec: fix build with `%define with_qemu 0`

Posted by Daniel P. Berrangé via Devel 4 months, 1 week ago

On Wed, Oct 01, 2025 at 02:26:53PM -0400, Cole Robinson via Devel wrote:
> test_libvirt_sanlock.aug is dependent on WITH_QEMU in meson config
> 
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  libvirt.spec.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This looks like a duplicate of the bug I was fixing but in a different
way:

  https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/IFKRFBWS267IHPQKFBT6TYTMO6B5U7QI/

> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index aff2707705..7cb558770f 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -2444,13 +2444,13 @@ exit 0
>  %files daemon-plugin-sanlock
>          %if %{with_qemu}
>  %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
> +%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
>          %endif
>          %if %{with_libxl}
>  %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
>          %endif
>  %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
>  %{_datadir}/augeas/lenses/libvirt_sanlock.aug
> -%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
>  %dir %attr(0770, root, sanlock) %{_localstatedir}/lib/libvirt/sanlock
>  %{_sbindir}/virt-sanlock-cleanup
>  %{_mandir}/man8/virt-sanlock-cleanup.8*
> -- 
> 2.51.0
> 

With 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 :|

Re: [PATCH] spec: fix build with `%define with_qemu 0`

Posted by Martin Kletzander via Devel 4 months, 1 week ago

On Wed, Oct 01, 2025 at 02:26:53PM -0400, Cole Robinson via Devel wrote:
>test_libvirt_sanlock.aug is dependent on WITH_QEMU in meson config
>

Makes sense,

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

>Signed-off-by: Cole Robinson <crobinso@redhat.com>
>---
> libvirt.spec.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/libvirt.spec.in b/libvirt.spec.in
>index aff2707705..7cb558770f 100644
>--- a/libvirt.spec.in
>+++ b/libvirt.spec.in
>@@ -2444,13 +2444,13 @@ exit 0
> %files daemon-plugin-sanlock
>         %if %{with_qemu}
> %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
>+%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
>         %endif
>         %if %{with_libxl}
> %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
>         %endif
> %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
> %{_datadir}/augeas/lenses/libvirt_sanlock.aug
>-%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
> %dir %attr(0770, root, sanlock) %{_localstatedir}/lib/libvirt/sanlock
> %{_sbindir}/virt-sanlock-cleanup
> %{_mandir}/man8/virt-sanlock-cleanup.8*
>-- 
>2.51.0
>

Re: [PATCH] spec: fix build with `%define with_qemu 0`

Posted by Martin Kletzander via Devel 4 months ago

On Fri, Oct 03, 2025 at 12:44:03PM +0200, Martin Kletzander wrote:
>On Wed, Oct 01, 2025 at 02:26:53PM -0400, Cole Robinson via Devel wrote:
>>test_libvirt_sanlock.aug is dependent on WITH_QEMU in meson config
>>
>
>Makes sense,
>
>Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
>

Yeah, this was wrong, of course the file has nothing to do with QEMU
itself, I just blindly trusted meson.  Proper fix by Dan is here:

https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/5YB5I6HKVH42L32SDTX2L2FJAOML25MP/

>>Signed-off-by: Cole Robinson <crobinso@redhat.com>
>>---
>> libvirt.spec.in | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>diff --git a/libvirt.spec.in b/libvirt.spec.in
>>index aff2707705..7cb558770f 100644
>>--- a/libvirt.spec.in
>>+++ b/libvirt.spec.in
>>@@ -2444,13 +2444,13 @@ exit 0
>> %files daemon-plugin-sanlock
>>         %if %{with_qemu}
>> %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
>>+%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
>>         %endif
>>         %if %{with_libxl}
>> %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
>>         %endif
>> %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
>> %{_datadir}/augeas/lenses/libvirt_sanlock.aug
>>-%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
>> %dir %attr(0770, root, sanlock) %{_localstatedir}/lib/libvirt/sanlock
>> %{_sbindir}/virt-sanlock-cleanup
>> %{_mandir}/man8/virt-sanlock-cleanup.8*
>>--
>>2.51.0
>>