[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] automation: Check if ninja is available before building QEMU



commit ed939ef084ada31ac5e3000c9526bc99b58136e7
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Wed Jul 7 17:40:01 2021 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Thu Jul 8 12:36:21 2021 +0100

    automation: Check if ninja is available before building QEMU
    
    ninja is now required to build the latest version of QEMU, and not all
    distros have a suitable version.  Skip the QEMU build when ninja is not
    available.
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 automation/scripts/build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/automation/scripts/build b/automation/scripts/build
index 46b6903d29..4a1161bb94 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -45,8 +45,9 @@ if ! test -z "$(ldd /bin/ls|grep musl|head -1)"; then
     cfgargs+=("--with-system-seabios=/bin/false")
 fi
 
-# Qemu requires Python 3.5 or later
-if ! type python3 || python3 -c "import sys; res = sys.version_info < (3, 5); 
exit(not(res))"; then
+# Qemu requires Python 3.5 or later, and ninja
+if ! type python3 || python3 -c "import sys; res = sys.version_info < (3, 5); 
exit(not(res))" \
+        || ! type ninja; then
     cfgargs+=("--with-system-qemu=/bin/false")
 fi
 
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.