specfile: use correct option for nbdkit in mingw build

[PATCH] specfile: use correct option for nbdkit in mingw build

Laine Stump posted 1 patch 6 months, 1 week ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20231023025126.84647-1-laine@redhat.com

libvirt.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] specfile: use correct option for nbdkit in mingw build

Posted by Laine Stump 6 months, 1 week ago

commit v9.8.0-40-g7cbd8c4230 changed the name of the option that
enables/disables nbdkit support in the build from "libnbd" to
"nbdkit", but one use of "-Dlibnbd=disabled" was missed in
libvirt.specfile.in - the meson commandline for mingw, causing the
build to fail.

This patch changes that line to "-Dnbdkit=disabled", thus unbreaking
the rpm build.

Signed-off-by: Laine Stump <laine@redhat.com>
---

This patch does fix a build-breaker, but I didn't want to push it in
case my comment was incorrect (I won't pretend that I've paid
attention to nbdkit)


 libvirt.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index fe54c45c5c..262c59eb5b 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1356,7 +1356,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
   -Dglusterfs=disabled \
   -Dhost_validate=disabled \
   -Dlibiscsi=disabled \
-  -Dlibnbd=disabled \
+  -Dnbdkit=disabled \
   -Dlibnl=disabled \
   -Dlibpcap=disabled \
   -Dlibssh2=disabled \
-- 
2.41.0

Re: [PATCH] specfile: use correct option for nbdkit in mingw build

Posted by Andrea Bolognani 6 months, 1 week ago

On Sun, Oct 22, 2023 at 10:48:33PM -0400, Laine Stump wrote:
> +++ b/libvirt.spec.in
> @@ -1356,7 +1356,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
>    -Dglusterfs=disabled \
>    -Dhost_validate=disabled \
>    -Dlibiscsi=disabled \
> -  -Dlibnbd=disabled \
> +  -Dnbdkit=disabled \

My bad.

Please add

  Resolves: https://gitlab.com/libvirt/libvirt/-/issues/550

in addition to

  Reviewed-by: Andrea Bolognani <abologna@redhat.com>

before pushing.

-- 
Andrea Bolognani / Red Hat / Virtualization