Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nest
Forks
Puppet Portage
Commits
33d53b04
Commit
33d53b04
authored
Sep 22, 2010
by
Lance Albertson
Browse files
Add setting for EMERGE_DEFAULT_OPTS
parent
e954f413
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
0 deletions
+11
-0
manifests/init.pp
manifests/init.pp
+1
-0
manifests/params.pp
manifests/params.pp
+6
-0
templates/makeconf.base.conf.erb
templates/makeconf.base.conf.erb
+4
-0
No files found.
manifests/init.pp
View file @
33d53b04
...
@@ -10,4 +10,5 @@ class gentoo {
...
@@ -10,4 +10,5 @@ class gentoo {
$gentoo_binhost
=
$gentoo::params::binhost
$gentoo_binhost
=
$gentoo::params::binhost
$gentoo_portdir_overlay
=
$gentoo::params::portdir_overlay
$gentoo_portdir_overlay
=
$gentoo::params::portdir_overlay
$gentoo_accept_license
=
$gentoo::params::accept_license
$gentoo_accept_license
=
$gentoo::params::accept_license
$gentoo_emerge_opts
=
$gentoo::params::emerge_opts
}
}
manifests/params.pp
View file @
33d53b04
...
@@ -42,4 +42,10 @@ class gentoo::params {
...
@@ -42,4 +42,10 @@ class gentoo::params {
''
=>
'$ACCEPT_LICENSE'
,
''
=>
'$ACCEPT_LICENSE'
,
default
=>
"
\$
ACCEPT_LICENSE
$gentoo_accept_license
"
,
default
=>
"
\$
ACCEPT_LICENSE
$gentoo_accept_license
"
,
}
}
# EMERGE_DEFAULT_OPTS
$emerge_opts
=
$gentoo_emerge_opts
?
{
''
=>
undef
,
default
=>
$gentoo_emerge_opts
,
}
}
}
templates/makeconf.base.conf.erb
View file @
33d53b04
...
@@ -19,6 +19,10 @@ ACCEPT_LICENSE="<%= gentoo_accept_license %>"
...
@@ -19,6 +19,10 @@ ACCEPT_LICENSE="<%= gentoo_accept_license %>"
PORTAGE_BINHOST="
<%=
gentoo_binhost
%>
"
PORTAGE_BINHOST="
<%=
gentoo_binhost
%>
"
<%
end
-%>
<%
end
-%>
<%
if
gentoo_emerge_opts
!=
nil
-%>
EMERGE_DEFAULT_OPTS="
<%=
gentoo_emerge_opts
%>
"
<%
end
-%>
CHOST="
<%=
hardwaremodel
%>
-pc-linux-gnu"
CHOST="
<%=
hardwaremodel
%>
-pc-linux-gnu"
CFLAGS="-O2 -pipe"
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
CXXFLAGS="${CFLAGS}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment