Skip to content

Commit

Permalink
Merge pull request puppetlabs-toy-chest#78 from shrug/maint/master/sl…
Browse files Browse the repository at this point in the history
…es10

(re-1897) Update sles mocks with local repo location and change release ...
  • Loading branch information
haus committed Aug 4, 2014
2 parents 0930c47 + 271022d commit 34c4199
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions templates/pe-sles-mock-config.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
config_opts['root'] = '<%=@name%>'
config_opts['target_arch'] = '<%=t_arch%>'
config_opts['legal_host_arches'] = (<%= if @arch =~ /i\d86/ then "'i386', 'i586', 'i686', 'x86_64'" else "'x86_64'" end %>)
config_opts['chroot_setup_cmd'] = 'install aaa_base bash buildsys-macros coreutils findutils glibc glibc-devel glibc-locale sles-release rpm make bzip2 gzip make patch tar cpio gcc gcc-c++ gnupg sed unzip which xz gawk'
config_opts['chroot_setup_cmd'] = 'install pwdutils aaa_base bash buildsys-macros coreutils findutils glibc glibc-devel glibc-locale sles-release rpm make bzip2 gzip make patch tar cpio gcc gcc-c++ gnupg sed unzip util-linux gawk'
config_opts['dist'] = '<%=@dist%><%=@release%>' # only useful for --resultdir variable subst
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['macros']['%vendor'] = 'Puppet Labs'
Expand All @@ -39,10 +39,14 @@ syslog_device=
[os-<%=@dist%>-<%=@release%>-<%=@arch%>]
name=<%=@dist%>-<%=@release%>-<%=t_arch%>-os
enabled=1
<% if @release == '10' %>
baseurl='http://neptune.delivery.puppetlabs.net/<%=@dist%>/<%=@release%>/<%=t_arch%>/'
<% else %>
baseurl='http://osmirror.delivery.puppetlabs.net/<%=@dist%>-<%=@release%>-<%=@sp%>-<%=t_arch%>-latest-<%=t_arch%>/RPMS.os/'
<% end %>
gpgcheck=0

<% if @release >= '11' %>
<% if @release == '11' %>
# weird dependencies - (openjdk from SLED [for pe-java], uuid-devel [for pe-postgres])
[deps-<%=@dist%>-<%=@release%>-<%=@arch%>]
name=<%=@dist%>-<%=@release%>-deps-<%=t_arch%>
Expand Down

0 comments on commit 34c4199

Please sign in to comment.