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 89c5bb9 BIGTOP-3544. Fix Spark build on Debian 9. (#778)
89c5bb9 is described below
commit 89c5bb9a73caf8d8aa913720bdc115e7e041b71b
Author: Kengo Seki <[email protected]>
AuthorDate: Thu May 27 13:53:29 2021 +0900
BIGTOP-3544. Fix Spark build on Debian 9. (#778)
---
bigtop_toolchain/manifests/renv.pp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/bigtop_toolchain/manifests/renv.pp
b/bigtop_toolchain/manifests/renv.pp
index bf58420..281f684 100644
--- a/bigtop_toolchain/manifests/renv.pp
+++ b/bigtop_toolchain/manifests/renv.pp
@@ -33,7 +33,8 @@ class bigtop_toolchain::renv {
]
}
/(Ubuntu|Debian)/: {
- if (versioncmp($operatingsystemmajrelease, '18.04') <= 0) {
+ if (($operatingsystem == 'Ubuntu' and
versioncmp($operatingsystemmajrelease, '18.04') <= 0) or
+ ($operatingsystem == 'Debian' and
versioncmp($operatingsystemmajrelease, '10') < 0)) {
$pkgs = [
"r-base-dev",
"libcairo2-dev",
@@ -59,7 +60,8 @@ class bigtop_toolchain::renv {
# Upgrade R version to 3.6.3 to build Spark 3.0.1 on Ubuntu 16.04 and 18.04
#
# Then Install required R packages dependency
- if ($operatingsystem == 'Ubuntu' and versioncmp($operatingsystemmajrelease,
'18.04') <= 0) {
+ if (($operatingsystem == 'Ubuntu' and versioncmp($operatingsystemmajrelease,
'18.04') <= 0) or
+ ($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease,
'10') < 0)) {
$url = "http://cran.r-project.org/src/base/R-3/";
$rfile = "R-3.6.3.tar.gz"
$rdir = "R-3.6.3"
