This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new d7d3e0e BIGTOP-3600 (addendum) - Deploy python*-dev deps on Debian
images (#837)
d7d3e0e is described below
commit d7d3e0edd8cdf4601ac11a9d7b8d9fe38c638001
Author: Luca Toscano <[email protected]>
AuthorDate: Mon Dec 6 10:20:25 2021 +0100
BIGTOP-3600 (addendum) - Deploy python*-dev deps on Debian images (#837)
In https://github.com/apache/bigtop/pull/829 I caused some
failures in gpdb package builds, since python2.7-dev
dependencies are needed.
On Debian 9/10/11 python3-dev and python2.7-dev are available,
so better to be explicit and install both at the same time.
---
bigtop_toolchain/manifests/packages.pp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/bigtop_toolchain/manifests/packages.pp
b/bigtop_toolchain/manifests/packages.pp
index 93e6c0a..34c2f25 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -151,7 +151,7 @@ class bigtop_toolchain::packages {
"libffi-devel"
] }
/(Ubuntu|Debian)/: {
- $_pkgs = [
+ $pkgs = [
"unzip",
"curl",
"wget",
@@ -206,13 +206,10 @@ class bigtop_toolchain::packages {
"bison",
"flex",
"python-setuptools",
- "libffi-dev"
+ "libffi-dev",
+ "python3-dev",
+ "python2.7-dev"
]
- if ($operatingsystem == 'Debian' and
versioncmp($operatingsystemmajrelease, '10') < 0) {
- $pkgs = concat($_pkgs, ["python-dev", "python2.7-dev"])
- } else {
- $pkgs = concat($_pkgs, ["python3-dev"])
- }
file { '/etc/apt/apt.conf.d/01retries':
content => 'Aquire::Retries "5";'
} -> Package <| |>
