| Message ID | 20210715083804.22535-1-po-hsu.lin@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [ACT,1/1] UBUNTU: SAUCE: Install docutils-common for kselftest/bpf related tests | expand |
On 15/07/2021 09:38, Po-Hsu Lin wrote: > 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 <po-hsu.lin@canonical.com> > --- > 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) > > Acked-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Applied and pushed. Thanks Sam
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)
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 <po-hsu.lin@canonical.com> --- ubuntu_bpf/ubuntu_bpf.py | 2 +- ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-)