Repository: bigtop Updated Branches: refs/heads/master 57f590052 -> d56fcb6b4
BIGTOP-1204. Add toolchain for AmazonLinux Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d56fcb6b Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d56fcb6b Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d56fcb6b Branch: refs/heads/master Commit: d56fcb6b40199a17759c6e47859ff229c5e0d5d1 Parents: 57f5900 Author: Ivan Orlov <[email protected]> Authored: Wed Nov 12 18:14:23 2014 -0800 Committer: Roman Shaposhnik <[email protected]> Committed: Wed Nov 26 10:31:01 2014 -0800 ---------------------------------------------------------------------- bigtop_toolchain/manifests/cleanup.pp | 2 +- bigtop_toolchain/manifests/packages.pp | 10 ++++++++++ bigtop_toolchain/manifests/protobuf.pp | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d56fcb6b/bigtop_toolchain/manifests/cleanup.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/cleanup.pp b/bigtop_toolchain/manifests/cleanup.pp index a0b5421..412d69a 100644 --- a/bigtop_toolchain/manifests/cleanup.pp +++ b/bigtop_toolchain/manifests/cleanup.pp @@ -15,7 +15,7 @@ class bigtop_toolchain::cleanup { $packager_cleanup = $operatingsystem ? { - /(?i:(centos|fedora))/ => 'yum clean all', + /(?i:(centos|fedora|amazon))/ => 'yum clean all', /(?i:(SLES|opensuse))/ => 'zypper clean -a', Ubuntu => 'apt-get clean', } http://git-wip-us.apache.org/repos/asf/bigtop/blob/d56fcb6b/bigtop_toolchain/manifests/packages.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index 556f1f8..ebd14a0 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -17,6 +17,7 @@ class bigtop_toolchain::packages { case $operatingsystem{ /(?i:(centos|fedora))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "openssl-devel", "rpm-build" , "redhat-rpm-config", "fuse-libs" ] } /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "libcppunit-devel", "libopenssl-devel", "rpm-devel", "pkg-config" ] } + Amazon: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "openssl-devel", "rpm-build" , "system-rpm-config", "fuse-libs" ] } Ubuntu: { $pkgs = [ "unzip", "curl", "wget", "git-core", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "g++", "fuse", "reprepro", "liblzo2-dev", "libfuse-dev", "libcppunit-dev", "libssl-dev", "libzip-dev", "sharutils", "pkg-config", "debhelper", "devscripts", "protobuf-compiler", "build-essential", "dh-make", "libfuse2", "libssh-dev", "libjansi-java" ] exec { "apt-update": @@ -28,4 +29,13 @@ class bigtop_toolchain::packages { package { $pkgs: ensure => installed, } + + # Some bigtop packages use `/usr/lib/rpm/redhat` tools + # from `redhat-rpm-config` package that doesn't exist on AmazonLinux. + if $operatingsystem == 'Amazon' { + file { '/usr/lib/rpm/redhat': + ensure => 'link', + target => '/usr/lib/rpm/amazon', + } + } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/d56fcb6b/bigtop_toolchain/manifests/protobuf.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/protobuf.pp b/bigtop_toolchain/manifests/protobuf.pp index fb7edac..ddff627 100644 --- a/bigtop_toolchain/manifests/protobuf.pp +++ b/bigtop_toolchain/manifests/protobuf.pp @@ -40,11 +40,12 @@ class bigtop_toolchain::protobuf { } default: { case $operatingsystem { - /(?i:(centos|fedora))/: { + /(?i:(centos|fedora|amazon))/: { yumrepo { "protobuf": baseurl => "http://download.opensuse.org/repositories/home:/mrdocs:/protobuf-rpm/CentOS_CentOS-6/";, descr => "Bigtop protobuf repo", enabled => 1, + priority => 1, gpgcheck => 0 } exec { 'install_mrdocs_repo':
