From patchwork Mon Jul 12 12:26:30 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: 473113 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2914287jao; Mon, 12 Jul 2021 05:58:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/JqR1sL3VlNZ/O6QWp+mNjYfu4fmI/Zp0pcQ85fziLwbK4IL01IGIQCKzmneHEv4Sct/7 X-Received: by 2002:a67:ed81:: with SMTP id d1mr46040429vsp.31.1626094696543; Mon, 12 Jul 2021 05:58:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094696; cv=none; d=google.com; s=arc-20160816; b=XtUs2tiRG+ePBW5WfObIR8G1+hEFiPGtpCd4O03KllgXUEa9MC+KVPZDmAtGJMF7Te SYrxR8VlKfmSlSmYW0drpjDnq24FBXWoR8teCl+VaCA7wEDnqF16K8gnveB49sFbHqYB mdJ2r1Ze2aW31WO7FFOZhVx3xQLAuvoLKK9DqebhdWNtLmL4Yo/INf6lajiXDUk1Jx09 7TuSZF5X455qjNXf+GTURgtMR4/rCGDWqmv7ptyFi2wRjBRnOhRvSdE046+NaJmFvsAQ 8jKAYzrcd7m3N/y1kHHEG9DzJOSraxO4Va9v/We6SM3AGFKVBecSCEhWKZRCsoatBVB0 DWzA== 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=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=yY4xka5lQulbVOJzTY9nSgYFH95U9fVLsLr9FehO1S/gwOT2rhesymWPCus7WVNqbw xMPCNI9J5El69Ot65nerhu9pDLAWER3kmvvjuVtfoNVnK38eBnGqWm/36E4Q9JL6MmUs lFGcZ76q2rO5uZ8+XsWk6VGRHugeTkZYEu0+5LRruTMHWEVkr+ENoP8BqlaMHKCnz1AR AD+AKU7I4YPp8x5Ov+DMnsfvktH153+tgBQztIpFLDJ9ci5HtHj1v8eAzT0N1pjMKRiI Z4bJ7ySZyTV+Bls3LlNta2CxeWnuIvFZfE9Y958HiVEB6a4inVMh1SFZTj3YWK86753t vzRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Q7eYlYQc; 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 e7si11719735vsp.232.2021.07.12.05.58.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:58:16 -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=Q7eYlYQc; 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]:42080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vVn-00008y-R6 for patch@linaro.org; Mon, 12 Jul 2021 08:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGx-0007JC-PX for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:50945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGw-0006FN-74 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:55 -0400 Received: by mail-wm1-x330.google.com with SMTP id l6so3028120wmq.0 for ; Mon, 12 Jul 2021 05:42:53 -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=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=Q7eYlYQcX8FFzbywsBDNVeYSIJvnSfvPNgD08h/G2GzTyHdj5aE7diosPGuxlItTbR 7dezITfsnCpFjP1aN3JqfL2fa2VYxxaJHEpDmb+qIdFkAHCpnGVIEdbw+vVzU1xIpACj R+XLfQD+HoML7mavzO0pudE5Q3YH5azSetj49Z8FSEcPzszHq0LV7EyNCkfs0ccGQBQI NJjWezPDm0BECe00d0Sz9lnYSxfJeoWQ89wxH1ufjAAEIt6dnhOfcXgzZGi2lvGS1H3b obOUIDjPV/GKg1lCizAZGfHau4JbyherXNQ1ZDxJxLu8ZO8dXbCzqmyGARHJ3GAs4hPv TqiA== 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=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=IpUt5D6sK8U1JZDg0ok7xJ1X4CzrVG6wppePaE/iPp5j/idq5qk/74kT42OYj2zHYy ehVz+k8hWDggllCMu/1rXP16x2+MfrbXjjeE1O1FOZAeexw4fgIgUf6uRkrzg02QA53Q Pt5Z8/xOtDNTExnC9b9a+GP7QOderCrvCORIzJkWh8LnwSZM/1U5nmO+NEKD8QVk0/Qa iVwFIiV+Xe6VPf+qxpRuOaCEpqnFHd6qMii3QaBvSmTYuhiBSn2kVX1SZJ3ies/znDaa BK1vvNEA5scO48hWd/ZPKWmGtuPM4IKimJQ26j8kYo501kYxY7CxKjWn9ePI8V2LvvoA 0rzw== X-Gm-Message-State: AOAM532VahVXDeeEJ73twcLyQ+BgAy/oWuZjdv/8MLpJadzAa3R2B0+H oFchS8WO6papbufYPQbLAmiLRA== X-Received: by 2002:a7b:cb98:: with SMTP id m24mr5252269wmi.21.1626093772846; Mon, 12 Jul 2021 05:42:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i11sm22319891wmg.18.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC8AE1FFA5; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 17/40] tests/docker: fix mistakes in ubuntu package lists Date: Mon, 12 Jul 2021 13:26:30 +0100 Message-Id: <20210712122653.11354-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-10-berrange@redhat.com> Message-Id: <20210709143005.1554-18-alex.bennee@linaro.org> -- 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