Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBB28C433E2 for ; Mon, 14 Sep 2020 13:24:46 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7373B206DB for ; Mon, 14 Sep 2020 13:24:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="WPaGy55b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7373B206DB Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kHoT7-0006C2-Fa; Mon, 14 Sep 2020 13:24:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kHoT6-0006Bx-HS for xen-devel@lists.xenproject.org; Mon, 14 Sep 2020 13:24:28 +0000 X-Inumbo-ID: af223f97-ad9b-47f8-a307-60c91c777180 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id af223f97-ad9b-47f8-a307-60c91c777180; Mon, 14 Sep 2020 13:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1600089866; h=from:to:cc:subject:date:message-id:mime-version; bh=i1uGOua5Jkx6qK7NnC5DbFszXE7k3984023lH2EEgJs=; b=WPaGy55bSnGFc/TPAoJsVUUK83rqTpFFgzCSlV+d4uRN06hKtjemjQdi n6LaA0ak0GJbbJ6zKS/TghGSlZtIXk60dx2L/8Wq8rBn65f5DFjqZuOAe qae+CQyvGSFKzXPMk5saOYaVvqa0NRQ99XzcRP9mJscQ2VRlw6DeajESB k=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: vjwFsciLPGIJW2s9ODx2CWXXqb4hcjnO6xRMLfBHjqdq02pTKmIGmfjjNBQ0EXUBGb5XVQ4Uaf HUGg8fnK8wPyTc1TF5rB8x+yadRe8YQbcTzan65MOBKEpSVoB+gRy7W1MeAHGoQDMr5349agFA vNXzcoIzTCtnI8ZJZAY3d1BdlWs2/L+oRHqrAOErRYP6vQmetx9XARXXBeG1xgYcvEVwW9oCBu ik4UTz0VuYLog1vnFsekw/TD3v1EhLd495CU+mFE+2nc1QfVRYOTICmfxWgrnGYNBVIHfr9l9b US4= X-SBRS: 2.7 X-MesageID: 27607191 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,426,1592884800"; d="scan'208";a="27607191" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Doug Goldstein , Wei Liu Subject: [PATCH] travis: Fix build with newer Qemu Date: Mon, 14 Sep 2020 14:23:55 +0100 Message-ID: <20200914132355.21076-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Qemu requires a bleeding edge version of Python, not found in the current travis environment. Skip building Qemu in that case. Signed-off-by: Andrew Cooper --- CC: Doug Goldstein CC: Wei Liu --- scripts/travis-build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/travis-build b/scripts/travis-build index 0cb15a89e4..08a1f66b84 100755 --- a/scripts/travis-build +++ b/scripts/travis-build @@ -16,6 +16,11 @@ cfgargs+=("--disable-rombios") cfgargs+=("--enable-docs") cfgargs+=("--with-system-seabios=/usr/share/seabios/bios.bin") +# Qemu requires Python 3.7 or later +if ! type python3 || python3 -c "import sys; res = sys.version_info < (3, 7); exit(not(res))"; then + cfgargs+=("--with-system-qemu=/bin/false") +fi + if [[ "${XEN_TARGET_ARCH}" == "x86_64" ]]; then cfgargs+=("--enable-tools") else -- 2.11.0