From patchwork Thu Jul 15 08:38:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1505593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=wdzINggz; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GQST41bBdz9sV8; Thu, 15 Jul 2021 18:38:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m3wtE-0006X6-8H; Thu, 15 Jul 2021 08:38:40 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m3wtB-0006X0-EA for kernel-team@lists.ubuntu.com; Thu, 15 Jul 2021 08:38:37 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 470C9408A9 for ; Thu, 15 Jul 2021 08:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626338317; bh=XvMa/I1Uzlo1iSh2/qFT3Ti2McWXVcxI5Pp4F7ZIAqc=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=wdzINggzU33wHpbTV5ggo69YkqJbUrNpUCqFdt0ZIFGSL9HKzRSmh6CGiYCTvu3Tu xEdBOaFMqGSH2qcZlHn2xEIeyHTkb+EPrFd1oipD5MMaSHlX9RJ0QNzCKDnR7mRLhU a6xxzYQ2gOas/GS4JLiczAmph2NsjaefYSItD5zEH5IH4jkTh2hQurXuWlMOI9CVRZ /fm56gAHvlU4wC/RN4M9DAyl1MkRJEgnBtU4UupGtdZQ7sLQzp/9vveqLF+hHdlBOu L3+E7zWPWBYS/iZ/G6b1ptRK3zr6Dn18wF/aPbOepkWSnhESmfJqr9dY06zIUXrYWD KK061f3+gVJwg== Received: by mail-pj1-f70.google.com with SMTP id 4-20020a17090a1a44b029016e8392f557so5355188pjl.5 for ; Thu, 15 Jul 2021 01:38:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XvMa/I1Uzlo1iSh2/qFT3Ti2McWXVcxI5Pp4F7ZIAqc=; b=TJmSiCZcb+crNjPpq3ysmp7Bmfiv3OIVZsZERfm8ii9TXJTlu9yNaNWzYW58LY+YDE 4tsYt2FWlMDJli7Mrx3HSfQO1dgIurF1WLdViRjKuDLkZBotKC/k3rHONlK9nBzv6jHN SjSXDffb+23pkQsqzbcRzaWBh6bnfg60OlehMDiAnaEfI8Sg7KgHsdJGYgSduljl+NRQ phkcRL1cM4pDXeipb6mUQXjb5tyBbB4QU1yZqA8sJYozCs9q+P9N8RPTiD50Zvs486T7 JVTR9BSZWY2UtoyNSM4Fydmjht3Ic/ioqEYb2ZDQf595yeyQila5reKgfFWVrFFBqGKq TtUA== X-Gm-Message-State: AOAM5332Y+GJjNvR0dA3lY+5c4asaEjibXJkm8VusFhUtFk0gxT7HMPe DfdyTRNkFU16OJhWBvvXjZOOi3yuHqH8xnA4iN1B4x8CgECYw3k29PPwARkN/GRYgFqp7P7UAn6 mlHdVfKGA9wjtHb8/ED/ti9QP1T/ElhX9qgaiwcMv X-Received: by 2002:aa7:9a08:0:b029:331:ea96:691d with SMTP id w8-20020aa79a080000b0290331ea96691dmr3271136pfj.75.1626338315740; Thu, 15 Jul 2021 01:38:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwx4QtOQMtPchgLHMAbIFy5Rd77OLKcY3lYv3sJbwfH6KhBsRqB1K6K9ZzPrOLnRPBiTILpAg== X-Received: by 2002:aa7:9a08:0:b029:331:ea96:691d with SMTP id w8-20020aa79a080000b0290331ea96691dmr3271112pfj.75.1626338315428; Thu, 15 Jul 2021 01:38:35 -0700 (PDT) Received: from localhost.localdomain (2001-b011-6c03-76b9-afa9-ea4f-f3f0-b18a.dynamic-ip6.hinet.net. [2001:b011:6c03:76b9:afa9:ea4f:f3f0:b18a]) by smtp.gmail.com with ESMTPSA id g13sm5492707pfo.112.2021.07.15.01.38.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jul 2021 01:38:34 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [ACT][PATCH 1/1] UBUNTU: SAUCE: Install docutils-common for kselftest/bpf related tests Date: Thu, 15 Jul 2021 16:38:04 +0800 Message-Id: <20210715083804.22535-1-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1931580 The bpf test build in kselftests will fail on newer releases if rst2man is not available: Makefile:45: *** "rst2man not found, but required to generate man pages". Stop. This will require python-docutils / python3-docutils, we can install docutils-common instead as they all depend on it. And this package is available since Trusty, there is no need to do extra series check. Signed-off-by: Po-Hsu Lin Acked-by: Colin Ian King Acked-by: Thadeu Lima de Souza Cascardo --- ubuntu_bpf/ubuntu_bpf.py | 2 +- ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ubuntu_bpf/ubuntu_bpf.py b/ubuntu_bpf/ubuntu_bpf.py index 3df70afc..e4543a94 100644 --- a/ubuntu_bpf/ubuntu_bpf.py +++ b/ubuntu_bpf/ubuntu_bpf.py @@ -12,6 +12,7 @@ class ubuntu_bpf(test.test): pkgs = [ 'build-essential', + 'docutils-common', 'git', 'libcap-dev', 'libelf-dev', @@ -20,7 +21,6 @@ class ubuntu_bpf(test.test): pkgs.append(gcc) if self.series == 'focal': - pkgs.append('python-docutils') if self.kv.startswith('5.6.0'): # Specical case of F-oem-5.6 (lp:1879360) pkgs.extend(['clang-10', 'llvm-10']) diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py index af9a6211..e71f33fd 100644 --- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py +++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py @@ -14,6 +14,7 @@ class ubuntu_kernel_selftests(test.test): 'bc', 'build-essential', 'devscripts', + 'docutils-common', 'fuse', 'git', 'jq', @@ -46,10 +47,6 @@ class ubuntu_kernel_selftests(test.test): else: pkgs.extend(['clang', 'llvm']) - if self.kv >= 510: - # python3-docutils is needed for bpf selftests build - pkgs.extend(['python3-docutils']) - cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True)