117cba40b0
resolves: rhbz#1990720, rhbz#1950627 Fix license files. (cherry picked from commit4c961db464) Move appliance to separate subpackage resolves: rhbz#1989514 https://bugzilla.redhat.com/show_bug.cgi?id=1989514 Move the appliance to a subpackage (libguestfs-appliance). The main package depends on this new subpackage so in effect nothing changes for most users. However this allows the appliance to be replaced if there exists a package called "libguestfs-noappliance". This package is not provided anywhere, you have to provide the dependency or make the package yourself. But if you do this then libguestfs won't install the appliance and you are free to replace it with (eg) a fixed appliance. (cherry picked from commit941da64078)
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From e68a844eb406f0b32cc2c4e60ca66bc1a7f94bdc Mon Sep 17 00:00:00 2001
|
|
From: Martin Kletzander <mkletzan@redhat.com>
|
|
Date: Mon, 31 May 2021 21:16:29 +0200
|
|
Subject: [PATCH] build: Don't use non-POSIX tests
|
|
|
|
The `test` builtin/binary usually accepts `==` for string comparison, it is
|
|
mostly accepted for typos and people being used to double equals, but is not
|
|
documented and not always accepted either. Since autoconf uses the default
|
|
shell, it might just fail in some cases with:
|
|
|
|
./configure: 29986: test: xrustc: unexpected operator
|
|
./configure: 29990: test: xcargo: unexpected operator
|
|
|
|
Just change it to single equals as it is done everywhere else.
|
|
|
|
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
---
|
|
m4/guestfs-rust.m4 | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/m4/guestfs-rust.m4 b/m4/guestfs-rust.m4
|
|
index aa12a9ef5..1dffd8118 100644
|
|
--- a/m4/guestfs-rust.m4
|
|
+++ b/m4/guestfs-rust.m4
|
|
@@ -24,8 +24,8 @@ AS_IF([test "x$enable_rust" != "xno"],[
|
|
AC_CHECK_PROG([RUSTC],[rustc],[rustc],[no])
|
|
AC_CHECK_PROG([CARGO],[cargo],[cargo],[no])
|
|
|
|
- AS_IF([test "x$RUSTC" == "xno"], [AC_MSG_WARN([rustc not found])])
|
|
- AS_IF([test "x$CARGO" == "xno"], [AC_MSG_WARN([cargo not found])])
|
|
+ AS_IF([test "x$RUSTC" = "xno"], [AC_MSG_WARN([rustc not found])])
|
|
+ AS_IF([test "x$CARGO" = "xno"], [AC_MSG_WARN([cargo not found])])
|
|
],[
|
|
RUSTC=no
|
|
CARGO=no
|
|
--
|
|
2.31.1
|
|
|