bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [4/7] git commit: BIGTOP-1441. bigtop_toolchain fails on Ubuntu
Date Mon, 08 Sep 2014 02:51:42 GMT
BIGTOP-1441. bigtop_toolchain fails on Ubuntu


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/72afaf69
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/72afaf69
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/72afaf69

Branch: refs/heads/branch-0.8
Commit: 72afaf697625c41a9008aff8972f286f6fd8278f
Parents: 3b39877
Author: Roman Shaposhnik <rvs@apache.org>
Authored: Mon Sep 8 00:01:50 2014 +0000
Committer: Roman Shaposhnik <rvs@apache.org>
Committed: Sun Sep 7 17:02:44 2014 -0700

----------------------------------------------------------------------
 bigtop_toolchain/manifests/packages.pp | 8 +++++++-
 bigtop_toolchain/manifests/scala.pp    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/72afaf69/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 762b260..426af6c 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -17,7 +17,13 @@ class bigtop_toolchain::packages {
   case $operatingsystem{
   /(?i:(centos|fedora))/: { $pkgs = [ "wget", "git", "make" , "cmake" , "rpm-build" , "lzo-devel",
"redhat-rpm-config", "openssl-devel", "fuse-libs", "fuse-devel", "fuse", "gcc", "gcc-c++",
"autoconf", "automake", "libtool", "createrepo", "cppunit-devel"] }
   /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "wget", "git", "make" , "cmake" , "rpm-devel"
, "lzo-devel", "libopenssl-devel", "fuse-devel", "fuse", "gcc", "gcc-c++", "autoconf", "automake",
"libtool", "pkg-config", "createrepo", "libcppunit-devel"] }
-  Ubuntu: { $pkgs = [ "liblzo2-dev", "libzip-dev", "sharutils", "libfuse-dev", "cmake", "pkg-config",
"debhelper", "devscripts", "protobuf-compiler", "build-essential", "dh-make", "reprepro",
"automake", "autoconf", "libfuse2", "libssh-dev", "libjansi-java", "libcppunit-dev" ] }
+  Ubuntu: { $pkgs = [ "liblzo2-dev", "libzip-dev", "sharutils", "libfuse-dev", "cmake", "pkg-config",
"debhelper", "devscripts", "protobuf-compiler", "build-essential", "dh-make", "reprepro",
"automake", "autoconf", "libfuse2", "libssh-dev", "libjansi-java", "libcppunit-dev" ] 
+      
+    exec { "apt-update":
+      command => "/usr/bin/apt-get update"
+    }
+    Exec["apt-update"] -> Package <| |>      
+  }
 }
   package { $pkgs:
     ensure => installed,

http://git-wip-us.apache.org/repos/asf/bigtop/blob/72afaf69/bigtop_toolchain/manifests/scala.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/scala.pp b/bigtop_toolchain/manifests/scala.pp
index 90b88e0..5e2dce0 100644
--- a/bigtop_toolchain/manifests/scala.pp
+++ b/bigtop_toolchain/manifests/scala.pp
@@ -19,7 +19,7 @@ class bigtop_toolchain::scala {
   case $operatingsystem{
     Ubuntu: { 
     $pm = '/usr/bin/dpkg -i'
-    $requires = [ Exec["/usr/bin/wget http://www.scala-lang.org/files/archive/$bigtop_toolchain::deps::scala_file"],
Package ['oracle-java6-installer'] ]
+    $requires = [ Exec["/usr/bin/wget http://www.scala-lang.org/files/archive/$bigtop_toolchain::deps::scala_file"]
]
     }
     default: { 
     $pm = '/bin/rpm -Uvh'


Mime
View raw message