From patchwork Thu Jul 8 19:09:19 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: 471321 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp596778jao; Thu, 8 Jul 2021 12:45:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLI/pgRh261fXvsDY9CY3krO7Yu2uzbhi8UwI23UWS/zjafc+y3PPpBAD5TrKdhDTB/0uP X-Received: by 2002:ab0:492f:: with SMTP id z44mr17403995uac.32.1625773520848; Thu, 08 Jul 2021 12:45:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773520; cv=none; d=google.com; s=arc-20160816; b=tWRj3g1zA1pAhT0SleIh0LBk9/51rdooLIG3zuiaLgJOcpZ2Ez0qsY6G7x1UYQ7cxF fu7qo426jpCl9FsxI/XNAZjVUHQuQDAwMB9Cgz7WZ4ReFWWaclrOz+jZi0mKTibzbMzz ZKson1CM7O7WM7IYKTFGIri4nnj7inXb6WTZxwrYvkvb2zDH2l2ZdQlsQ60XrDjwHDq2 tY4wiTL045be2kSXuqf/a5BGIpPaPZroCk6ehu7crAUbv0/VOiqBpoPJLPNcyavMFiaX BtO1jEIWHgy8wdNpY3gqWPht/8UiludUTKXXpSXro1CeDoHoQCbOHd9nPVhQslQTWMq6 mDcA== 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=GUmVIad5eZoBfi1EE3qqM1Ya4I7DiFQmnHs6DQmKXL+gG0esRmSFCZ7lkyHRSes++i DPQAVEHacGCGcIaLi42irv44/KUAW3zyCc2jjOqgTN6legCOiO7aqkUU4F6mlpgMjMOR 0LfZI870zTQAg/+EAUeuwTOKqtA27ZoCZ3pAxy0UT7kdn30EL2MhVu2s8Uo17tVf6CmX 9aug+/h+MpVNQFtKp9Z9XzQwOiE0K5ySS4YnyR/9TAj5gxxItHxBD3B4deDYBYPMyI39 U9ZNw2Ip9RBsCkGmhf7M7u6gRzBoWBzlVFcqyrVUWt6ijH/zOTfsaxmHrrWvLnel39hd 5u8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=amPTAAcE; 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 v24si4345276vsk.422.2021.07.08.12.45.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:45: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=amPTAAcE; 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]:36142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZxY-0003Ho-5u for patch@linaro.org; Thu, 08 Jul 2021 15:45:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWh-0002qG-Sn for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:35 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:46980) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWc-0007Yw-EL for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:35 -0400 Received: by mail-wm1-x333.google.com with SMTP id k16-20020a05600c1c90b02901f4ed0fcfe7so4722697wms.5 for ; Thu, 08 Jul 2021 12:17:30 -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=amPTAAcE8iOPKn5uR+iVtJ984YV7Bi7aQrON8Iiff47CFaL7RCBIsOyN3BifatzXSc 7/uknD36efl+XQArTS0XXdhUPff9VGLfgMI7Mkdp5jfxxCHTFZeB7lazAzU4lXJZGKb9 Zrgi4wY2ilwoDTBrRJs+YPwgv69fb/wh6TJmz9tH8v/dbmGvQlZgVD1J23Gz8ruqfjqG Pnrfs114ona5ujqFpVk1jvuG8rbv3WvPRWkUOXVmoR/ptSANw3FiY9ilBzXFR32LXIgg 2tLfjTcHEsFgbE8LXWhTFl+rCg4Y9qm/gHHOqAmsdFbKUmOC7CkPY3gREGn4URO4Zc6B HdzQ== 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=DODD+P+IYxH0PbkQa6DN5jTkp6SwFgnzPd9eEY7PRneIkGh3kLEEn4elhVtxXwKua3 agWVKXLg7u9SUh0AUUEiZs7cQp5SNia1UWjcgfaZIlTsF5s99zPmnTMIldGGVv5hMQno HkdnI5zXVWuL4a5Hlg4+/alNxOxRyCWMQIUWUdFSQVYblpeDlhxCvrP/MvQD59a0u9LM 1rw7dXDio4wnytF7CiiBhtxmElqoAtnuJqAFcUxpmdHHwV4bvwL4o6o+a3kZP6SS+w0+ q+vXsZeeg9RSymL1EG9JK8EjQ5D5kbVEXkNq/jZwZWFCkUSBa/SO3Jmp6OFWote2DAYg NFeQ== X-Gm-Message-State: AOAM530GhJ4EfJ2OtPQ74jeFfzORBF4RIFMBp6jpTI292Y4Ur78aJwqu UcuX2tAPItULouuDVoyhOSMZSQ== X-Received: by 2002:a05:600c:290c:: with SMTP id i12mr33513901wmd.85.1625771849007; Thu, 08 Jul 2021 12:17:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e8sm3137138wrq.10.2021.07.08.12.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EEB991FF7E; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 17/39] tests/docker: fix mistakes in ubuntu package lists Date: Thu, 8 Jul 2021 20:09:19 +0100 Message-Id: <20210708190941.16980-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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