From patchwork Tue Jul 6 14:57:55 2021 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: 470485 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5113501jao; Tue, 6 Jul 2021 08:35:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLS3rXoLk+OUFrS9SbX25SU1V9iAweVm83dadk6qeKRgwx/nwNhVZUD9o+0C1RYVgJtqGt X-Received: by 2002:a05:6402:692:: with SMTP id f18mr2054831edy.327.1625585736079; Tue, 06 Jul 2021 08:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585736; cv=none; d=google.com; s=arc-20160816; b=LvmpKoZJYiWn2RF8fvdoCUamm7t74fh9U7A3yr13TdVVG4z1HwOa9nZoSkiZHSC7Ij vHBxNOAOjNJUD8tzb92EGeSwKq/t9FpkN6NcMqxNDIgo01TZoAOv/S2Je26soIUtXLh/ 7rGtDw1E3EHaudH8C1qfychFMuXrmpL7TslIkEc9GIL+X+2ptZpUIIExk5g2Bud1ZiuQ iHXhu+F1bI13bah/fAKD4mM6mXcq0V47k41nEq1J7SoqrZaxMEeBgY2KzzFhdtBkySoV qmVF0QJSFeVTIuYFaYaDN0z39FSrIFjtrtFpmbIndetFELPiQPRSGDl20G3LBHYXF1JQ AXhg== 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=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=yaQDJuLmz4ili6kXXG11DGDCshi6V9SejnMQwMeCCpu2VepGPBXccpbKH6JUcG5rMm iKUCG6BaHu1OYjNNDSkx+B/uZV4reA8TpkzinbiLXwWUbbU+Yrs18QwPoP47Nj65Ls3t EDp0gcwMzMWNgDQZ74eqpAt58vyIE1P8vCDecHgNkS1akGlK0mEBsRWqRLpfupUYrhrT liMNF3SoakBV309Kg6KjmtHNY9bPYkUdBLUPKixBjq0rkJI7RyZsW2NfLgT90GvGoD3G RzN5fS/3be/IuJFOcfBRszeS4oFPdRNeEjhhWPP+TSrbXuGpqNadZIzCi8ava2HWL4FP 9V3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xEESpXov; 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 bd22si8568996edb.583.2021.07.06.08.35.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:35:36 -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=xEESpXov; 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]:53864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n6l-000879-4q for patch@linaro.org; Tue, 06 Jul 2021 11:35:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moo-0002MN-37 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:03 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mol-0004qH-OU for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:01 -0400 Received: by mail-wr1-x435.google.com with SMTP id a8so14819045wrp.5 for ; Tue, 06 Jul 2021 08:16:57 -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=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=xEESpXov2DK9hBWSxMI2qWVcTc5c59j/GHKKdstorTXWATFqJ2sg7b721EWKvPFqbc KbMsU9NpV0GOGsGRRQPoPn4FNg036bDZevseXQtexhmqBL4W2TTwoFzb2yW43UtjBzdz jaEp+bMpEVxP8dbWnt2bOpvCUn6iwoygg/xddxzxzfEPzdXonBIDBdzVP15SX3MBJeqL pATtaUUVcESWz//QpHKdJ8kLa/TZbGADH0+mWK9X8/aaNtLRQ6WM3kGD6uvUmmNfGnFI N9Ydx14XqQxgJGOmYnUp6pLBzmBDe0XPmqxoA39NuvF6bwQzlLUYufY+HR1Z1NCqeOsf Pkxg== 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=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=mjVMgB6o8q3P6xr7aPM/+IqgoVI2UyAASXcnm8hvSpIdSvQhAS/J4b12YkJJZGV+lQ cUkhL1A+LMAV/tsQfIiZ0ReWPGQlnYwJ5sScTsglCS1O5Nu2IPFqXF4rriX/eloMM44r jIp91f5jlyfDW6kCcDnq9/JM8Rxxf3TSsx8GhART4iMxA88PZZYT0m0GzEami457J/dM eCkTe5lfptCf1kNpGsSRiAgwfW1GsP+ETC6dPHGIXOH2W9M4lcPFHeMpl+LWHVg66Iw3 9uRcCJzIsQXr2TDz6ovnM7D6YOyTB3mopiqkO7aP5sNUxiHXuBltbwoNUU2bepQoh/Qk U2Lw== X-Gm-Message-State: AOAM533zHdKIdtXlJCYUB6T7AqdUDd377lHkYuoQmi6EldAgfR4U5aDY N4Oi646qS6QTEaz9fpjVXQCr7A== X-Received: by 2002:a05:6000:1361:: with SMTP id q1mr22046681wrz.179.1625584616705; Tue, 06 Jul 2021 08:16:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i2sm3199147wmq.43.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C65C51FF9F; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists Date: Tue, 6 Jul 2021 15:57:55 +0100 Message-Id: <20210706145817.24109-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé librados-dev is not required by QEMU directly, only librbd-dev. glusterfs-common is not directly needed by QEMU. QEMU uses ncursesw only on non-Windows hosts. The clang package is clang 10. flex and bison are not required by QEMU. Standardize on nmap ncat implementation to match Fedora/CentOS. Remove vim since it is not a build pre-requisite and no other containers include it. Signed-off-by: Daniel P. Berrangé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-10-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu1804.docker | 3 --- tests/docker/dockerfiles/ubuntu2004.docker | 10 ++-------- 2 files changed, 2 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index a50a35e6fe..ee8545e4b1 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -5,7 +5,6 @@ ENV PACKAGES \ gcc \ gettext \ git \ - glusterfs-common \ libaio-dev \ libattr1-dev \ libbrlapi-dev \ @@ -24,12 +23,10 @@ ENV PACKAGES \ libjemalloc-dev \ libjpeg-turbo8-dev \ liblzo2-dev \ - libncurses5-dev \ libncursesw5-dev \ libnfs-dev \ libnuma-dev \ libpixman-1-dev \ - librados-dev \ librbd-dev \ librdmacm-dev \ libsasl2-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index eee2ef3cac..25f56adfb2 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,16 +1,13 @@ FROM docker.io/library/ubuntu:20.04 ENV PACKAGES \ - bison \ bsdmainutils \ ccache \ - clang-10\ - flex \ + clang \ gcc \ gcovr \ genisoimage \ gettext \ git \ - glusterfs-common \ libaio-dev \ libattr1-dev \ libbrlapi-dev \ @@ -30,12 +27,10 @@ ENV PACKAGES \ libjpeg-turbo8-dev \ liblttng-ust-dev \ liblzo2-dev \ - libncurses5-dev \ libncursesw5-dev \ libnfs-dev \ libnuma-dev \ libpixman-1-dev \ - librados-dev \ librbd-dev \ librdmacm-dev \ libsasl2-dev \ @@ -53,7 +48,7 @@ ENV PACKAGES \ libxen-dev \ libzstd-dev \ make \ - netcat-openbsd \ + ncat \ ninja-build \ python3-numpy \ python3-opencv \ @@ -67,7 +62,6 @@ ENV PACKAGES \ sparse \ tesseract-ocr \ tesseract-ocr-eng \ - vim \ xfslibs-dev RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES