From patchwork Fri Oct 25 19:36:58 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: 177782 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4189792ill; Fri, 25 Oct 2019 12:50:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIFFO0z1lkIIjR2whOQhsZrhQtVgk8ANq9nAWDkePpMatqLd1ahYtQm9UrkKms2Bz9Rn++ X-Received: by 2002:ae9:ed57:: with SMTP id c84mr4611481qkg.400.1572033032007; Fri, 25 Oct 2019 12:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572033032; cv=none; d=google.com; s=arc-20160816; b=njy3ijnpzsaE+s/S5O/69H7d6ZJDzE88DL37W62I+iTNkdERbQ2dfPUo50n+nqtwsO 5CklqSQj3oWNvmiQPEZY1qHB/ueig2VNwDb+swSmSI76opC/QBDrKwutzz9/H2+BCskp bnuI7iLoMwACeVwpgo1fG8J4nSuagtGzr6PLbUaFV/WEaVymBw2gPhx6XkGp6oVWOkLr Z9WS1mWNgt/Tw8QCmhGrGiRuE0j+p6yuIdmFXN1A12HxqEKJ2MzoKjHNXO1qC0Y3T6F4 kNf0Txy1AtJ4iMS9QJ078zFkfB6wGOJmjbDegdDzfl/wwVBs7I4bxNdZoxiXZHHu89aw 94Kw== 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=YF2hQWf0rHRie5j70/WY3A6eVz8euoJAGMXgLMSGbWsA3bAGtgTsW82p/4kBwbFZ8a iHZe/YQchYUEfvLuGNt0BjqammY/Mr2kgG/Y2tPSV1FLKVJvUYatHwgH9uXen+YiAc8j WByNBD4vqCVts8Aqu1yERd8krtPwIoz9FajY3an8RqxPfArHn3/AVKZBV5hzrCB4VyAc c3ScaSqHLBpfeq/T7vcybvHWZORCLOAQcNeVjXGnVxiZhDz6KCmoj+V6WOgLKsxVxSQj 1B7kUrxSbrNfIGhBL+5iF1r4X/5DD88SQ2KizMM53z/k65lzvlkilv/j2+3axpUD1Bfy uOkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PPLcVwPN; 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 f61si2279950qtd.221.2019.10.25.12.50.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Oct 2019 12:50:31 -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=PPLcVwPN; 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]:35640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO5bQ-0002Xn-04 for patch@linaro.org; Fri, 25 Oct 2019 15:50:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57742) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO5Oe-00083O-0k for qemu-devel@nongnu.org; Fri, 25 Oct 2019 15:37:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO5Oc-00035e-Sj for qemu-devel@nongnu.org; Fri, 25 Oct 2019 15:37:15 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37645) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iO5Oc-00035C-Mk for qemu-devel@nongnu.org; Fri, 25 Oct 2019 15:37:14 -0400 Received: by mail-wm1-x332.google.com with SMTP id q130so3169419wme.2 for ; Fri, 25 Oct 2019 12:37:14 -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=PPLcVwPNg9F9gusYKbcEsitWIwrpltC1yc8VJ0a0pmlFwwLfNb9qVTfCUuXUThHkQY cFuvAEtoqdX5Mg/rLEBrHOq80t+HrGQ41y8VbBimnP4vw4cGjN3YwauoD/kY1DZetZgi JRGcdz289t2FYlHmj5ZngV9Wjw3rvwAfXA2ydN+671R1azzd/Ntg0jhmwKj9qCe/mfNd FtkEjhoUE2Pkg2oiL3gv735Ir5Kgk54j3qPepFsFaxOEI/26ztNRZ4ABBfLW2py4kObp oLxfw995nHFlD5KNWnYhL1SazGuF+LJMUm9Hxv5CJEYMDFx8irBHK6gW2fOLVPYFd4Dc j8Dw== 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=BqruqjG0bxmgKoMFQmdhYOZxpoGh6p0FMmWqHIFrieFlmJQP/7hHWNsFRAlbC78gvM Dn8Jp6s0TmQ61OY22zr0/CY5Y+/MYefD4OjO0awF9zgrv+N0yv1dIvtzOKP6J9rDGYjn 4jq5fHN+z4KaDLdgD6zJHJlyTv3JF5eejV3X2aS9GxKMGw6bRGmh3vt45BVJzxENqv7Q lJKz2kpeal2w9OMVZjo3u5lG68wUu9vHxoX+2f0xcV9Hz0bi31rR/1xjOC85JL/W2m42 J+2C6S6DcmKf8aiIHWSwCCuhqwZzgqdzRTAFn/K3dlkzIkyKQzOCoKkgHuZ/0v+Up0MI yZtA== X-Gm-Message-State: APjAAAVuK/48I9QvobSkxc0Ol7lRVAFxsa62nOSh1rnTD3Hb88ytyfs8 GZcm9y2Fn6cT9WAWperxWoksCA== X-Received: by 2002:a1c:7e10:: with SMTP id z16mr4740271wmc.11.1572032233542; Fri, 25 Oct 2019 12:37:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k3sm3033702wro.77.2019.10.25.12.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 12:37:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CEEEF1FF91; Fri, 25 Oct 2019 20:37:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v3 04/15] travis.yml: Use newer version of libgnutls and libpng Date: Fri, 25 Oct 2019 20:36:58 +0100 Message-Id: <20191025193709.28783-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191025193709.28783-1-alex.bennee@linaro.org> References: <20191025193709.28783-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::332 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