Renamed gcc as gnu::gcc
This commit is contained in:
parent
9efcac9bf6
commit
11cd7e0d56
4 changed files with 28 additions and 27 deletions
|
@ -1,24 +0,0 @@
|
||||||
|
|
||||||
# Install GCC
|
|
||||||
#
|
|
||||||
# On Linux hosts this will also install headers required for compiling
|
|
||||||
# kernel modules.
|
|
||||||
#
|
|
||||||
class gcc {
|
|
||||||
|
|
||||||
package { "gcc":
|
|
||||||
ensure => installed,
|
|
||||||
}
|
|
||||||
|
|
||||||
if $::kernel == Linux {
|
|
||||||
package { "kernel-headers":
|
|
||||||
name => $::operatingsystem ? {
|
|
||||||
"debian" => "linux-libc-dev",
|
|
||||||
"ubuntu" => "linux-libc-dev",
|
|
||||||
default => [ "kernel-headers", "kernel-devel", ],
|
|
||||||
},
|
|
||||||
ensure => installed,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,3 +1,28 @@
|
||||||
|
# Install GCC.
|
||||||
|
#
|
||||||
|
# On Linux hosts this will also install headers required for compiling
|
||||||
|
# kernel modules.
|
||||||
|
#
|
||||||
|
class gnu::gcc {
|
||||||
|
|
||||||
|
package { "gcc":
|
||||||
|
ensure => installed,
|
||||||
|
}
|
||||||
|
|
||||||
|
if $::kernel == Linux {
|
||||||
|
package { "kernel-headers":
|
||||||
|
name => $::operatingsystem ? {
|
||||||
|
"debian" => "linux-libc-dev",
|
||||||
|
"ubuntu" => "linux-libc-dev",
|
||||||
|
default => [ "kernel-headers", "kernel-devel", ],
|
||||||
|
},
|
||||||
|
ensure => installed,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# Install GNU make.
|
# Install GNU make.
|
||||||
#
|
#
|
||||||
class gnu::make {
|
class gnu::make {
|
||||||
|
|
|
@ -4,7 +4,7 @@ class ruby::rubygems {
|
||||||
|
|
||||||
tag("bootstrap")
|
tag("bootstrap")
|
||||||
|
|
||||||
require gcc
|
require gnu::gcc
|
||||||
require gnu::make
|
require gnu::make
|
||||||
|
|
||||||
package { "ruby-devel":
|
package { "ruby-devel":
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
#
|
#
|
||||||
define vmware::bundle() {
|
define vmware::bundle() {
|
||||||
|
|
||||||
|
require gnu::gcc
|
||||||
|
|
||||||
file { "/usr/local/src/${name}.bundle":
|
file { "/usr/local/src/${name}.bundle":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
source => "puppet:///files/packages/${name}.${architecture}.bundle",
|
source => "puppet:///files/packages/${name}.${architecture}.bundle",
|
||||||
|
@ -28,12 +30,10 @@ define vmware::bundle() {
|
||||||
notify => Exec["vmware-modconfig"],
|
notify => Exec["vmware-modconfig"],
|
||||||
}
|
}
|
||||||
|
|
||||||
include gcc
|
|
||||||
exec { "vmware-modconfig":
|
exec { "vmware-modconfig":
|
||||||
command => "vmware-modconfig --console --install-all",
|
command => "vmware-modconfig --console --install-all",
|
||||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||||
creates => "/lib/modules/${kernelrelease}/misc/vmci.ko",
|
creates => "/lib/modules/${kernelrelease}/misc/vmci.ko",
|
||||||
require => Class["gcc"],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue