From patchwork Fri Oct 25 06:36:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 177618 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3234671ill; Thu, 24 Oct 2019 23:41:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+FOjsXQO92mi27t8O82ntG0bM7z1Si37pjvPnvOXw0KPmuzJ2yGUDx8pDl+byu3l5IwFN X-Received: by 2002:a0c:c3c5:: with SMTP id p5mr1777954qvi.34.1571985680417; Thu, 24 Oct 2019 23:41:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571985680; cv=none; d=google.com; s=arc-20160816; b=vdyiHXNfNOhKj7gBlI8RAcwDik+eaygBn5++0DU7C3owJkETLTPSQR8LVZbllJtllN uxAj9byeo5ub4ez1mgOoeGJ3niFCAJuKEs0sYJn+puCUpu51VjBcajY0XPDy60zTfA0H jFnYeIlV5fY+w7PA/ibOjPFjWjWudMHETwQpaswfucdb/Jxbmn3VdkPzdDBh6Of96Zim pwPzJJcIeNcx+/NUG7kQ2kYSi64hzYr5H0P/eISH807Uev2lD1O5Bx2WQEyt4f9JlGB7 MLhNLvCh7DBVjEiD8KasIC2XxYNUImscwqkmr67r7tKBUeQJg/0HRJY8tvasHPHyMBKY +quw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=yblh+Oppt2iwvTtsCKOox3v37OMPEfvHfRdTq2vJFiQ=; b=sVply1rIgPQNblS2ksYsKtqDVJifT+QiprFGa+a3GAeJQ8jEerafQzz0XyxEjKOSsS NkNbzvIYLegdxXwpvNHM9VZMzZ/J47kIruYmh/KLzYIHAyqFPqLbwUzwMR6GeeFqQXDI ATO1nmtA0yGn8xMv87fcjUMIfdo8VOoWyO9/dKijlAANRMJeZvTW10AAlYxAsWZzz1iB wN6G4etqON9AZ2wDM1PXxn52Kxz5/M1ETHZ+iFuqQCJsfy0SzICLuuPmlC2MDPkg6KOM N8nPNnY/mW2SttUJ+BRi49IB+POmDEcoU+71AKHToE9qWc/14/QEPprU/BFRaajX5kYx xYDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fjWyH5by; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n10si709884qtl.331.2019.10.24.23.41.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Oct 2019 23:41:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fjWyH5by; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNtHj-0004tw-Il for patch@linaro.org; Fri, 25 Oct 2019 02:41:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35393) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNtDt-0002zW-AJ for qemu-devel@nongnu.org; Fri, 25 Oct 2019 02:37:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNtDs-0008Ms-9g for qemu-devel@nongnu.org; Fri, 25 Oct 2019 02:37:21 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNtDs-0008MX-3r for qemu-devel@nongnu.org; Fri, 25 Oct 2019 02:37:20 -0400 Received: by mail-wm1-x334.google.com with SMTP id g7so756191wmk.4 for ; Thu, 24 Oct 2019 23:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yblh+Oppt2iwvTtsCKOox3v37OMPEfvHfRdTq2vJFiQ=; b=fjWyH5byVP69EJAiUClMw6cdLxt3NpFMSoix//VxL1XiNcvMGLdSfI6Pa1lO3KFs2O mKdSzyOGi9jzyl644guVpZTpsySPNoPeMWCr7xaPvTC1pVMAfNE5OcrC9PhTlvk1g1NK bcclD3FGlAkOwdRwJWF/rmq75M3KTGt5CYmOr+lYgvDoLVqLeXLlYKUAIqEoVFi4m4sm dQ1shoY4kBcWhMU0B5IFjLKip6aJHcxsq4NedDpo6dRrgr2vjXIw8sLcqRhEasZi+YY0 p6ZmlqCTVgCQKa8nGGpAbUcZWys9kfObCDhL29CY+s1vFagYSM7sWBIRNCX0+Zgwdv3J UVrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yblh+Oppt2iwvTtsCKOox3v37OMPEfvHfRdTq2vJFiQ=; b=YGgqBcCEs9WbW79K71p2rqmpmxO3VVNTRxc30x3ZcoJ3SN6i64Nj6t51RT5Z+DvL82 ie6LZJ/ft2jRGegzIm0eTjiepGXajilL9MCL1bxXhjdrTsQQuSQtPnsPoRUGUOyEpCXT hrKMBBJU991Ber0dLII3xzZh8OM5pFZep6b2QAR0cC9ozBVfBs7pWWo3AQFGw/6X7rLf eacuXW+96mY/EGB4GXj8xXYMAcFfnV14un2n9H6ZV8KUn271SgGZTbtXFxK282aBUuoG EhVytY5iiUgSobzlhEFhbZSgcXmU7Fg/HCJTxeMpUEkb1NMT4bs0MnOPfhnOeWidJzFL hO/w== X-Gm-Message-State: APjAAAVQmlS4xYEWPldlq2mVUIoQcx7AE4uxqBAt828Udz8T8joHDwgS x6gls6n0wuB+gw4Iz1AS7bU1e2My4oY= X-Received: by 2002:a05:600c:219a:: with SMTP id e26mr1884489wme.147.1571985439065; Thu, 24 Oct 2019 23:37:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 36sm3277624wrj.42.2019.10.24.23.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 23:37:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A1F11FF91; Fri, 25 Oct 2019 07:37:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 04/73] travis.yml: Use newer version of libgnutls and libpng Date: Fri, 25 Oct 2019 07:36:04 +0100 Message-Id: <20191025063713.23374-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191025063713.23374-1-alex.bennee@linaro.org> References: <20191025063713.23374-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth libgnutls-dev and libpng12-dev are not available in newer versions of Ubuntu anymore, so installing these packages fails e.g. in the new arm64 containers on Travis. Let's use newer versions of these packages by default instead. (The old versions still get tested in the "gcc-9" build). Signed-off-by: Thomas Huth Message-Id: <20191009170701.14756-4-thuth@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index b446e04e8ae..e65e53f3d7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ addons: - libcap-dev - libcap-ng-dev - libgcc-4.8-dev - - libgnutls-dev + - libgnutls28-dev - libgtk-3-dev - libiscsi-dev - liblttng-ust-dev @@ -37,7 +37,7 @@ addons: - libnfs-dev - libnss3-dev - libpixman-1-dev - - libpng12-dev + - libpng-dev - librados-dev - libsdl2-dev - libsdl2-image-dev