valitydev/salt-common
14
0
Fork 0
mirror of https://github.com/valitydev/salt-common.git synced 2024-11-06 10:25:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sls/gentoo/makeconf.sls: updated with new pillars.

Browse Source
This commit is contained in:
Regna 2016-04-21 19:07:57 +03:00
parent bf63987f34
commit 6534d3bcba
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sls/gentoo/makeconf.sls
View File

@ -2,6 +2,7 @@
include: include:
- augeas.lenses - augeas.lenses
{% set mirror_host = salt['pillar.get']('gentoo_mirror_host', 'gentoo.bakka.su') %} {% set mirror_host = salt['pillar.get']('gentoo_mirror_host', 'gentoo.bakka.su') %}
{% set make_conf = salt['pillar.get']('make_conf', False) %}
{% set arch_conf = salt['pillar.get']('arch_conf', False) %} {% set arch_conf = salt['pillar.get']('arch_conf', False) %}
{% set num_jobs = grains['num_cpus'] %} {% set num_jobs = grains['num_cpus'] %}
@ -18,12 +19,23 @@ manage-make-conf:
- set PORTDIR '"/usr/portage"' - set PORTDIR '"/usr/portage"'
- set DISTDIR '"/var/tmp/distfiles"' - set DISTDIR '"/var/tmp/distfiles"'
- set PKGDIR '"/var/tmp/packages"' - set PKGDIR '"/var/tmp/packages"'
- set PORTAGE_SSH_OPTS '""' - set PORT_LOGDIR '"/var/log/portage"'
{% if make_conf %}
- set PORTAGE_SSH_OPTS '"{{ make_conf.get("portage_ssh_opts", '') }}"'
{% if make_conf.get('makeopts', False) %}
- set MAKEOPTS '"{{ make_conf["makeopts"] }}"'
{% else %}
- set MAKEOPTS '"-j{{ num_jobs }} --load-average {{ max_la }}"' - set MAKEOPTS '"-j{{ num_jobs }} --load-average {{ max_la }}"'
- set PYTHON_TARGETS '"python2_7 python3_4"' {% endif %}
- set USE_PYTHON '"2.7 3.4"' - set FEATURES '"{{ make_conf.get("features", "xattr sandbox userfetch parallel-fetch parallel-install clean-logs compress-build-logs unmerge-logs splitdebug compressdebug fail-clean unmerge-orphans getbinpkg -news") }}"'
- set USE_SALT '"smp multitarget efi icu sqlite emacs sctp xattr syslog logrotate ssl openssl vhosts symlink device-mapper bash-completion zsh-completion -gnutls -tcpd"' - set EMERGE_DEFAULT_OPTS '"{{ make_conf.get("emerge_default_opts", "--quiet-build --verbose --keep-going") }}"'
- set VIDEO_CARDS '""' - set VIDEO_CARDS '"{{ make_conf.get("video_cards", "") }}"'
- set LANG '"{{ make_conf.get("lang", "en") }}"'
{% if make_conf.get("other", False) %}
{% for k, v in make_conf["other"] %}
- set {{ k }} '"{{ v }}"'
{% endif %}
{% endif %}
- set GENTOO_MIRRORS '"https://{{ mirror_host }}/gentoo-distfiles"' - set GENTOO_MIRRORS '"https://{{ mirror_host }}/gentoo-distfiles"'
{% if arch_conf %} {% if arch_conf %}
- set CHOST '"{{ arch_conf["CHOST"] }}"' - set CHOST '"{{ arch_conf["CHOST"] }}"'
@ -49,5 +61,8 @@ manage-make-conf:
- set PORTAGE_BINHOST '"https://{{ mirror_host }}/gentoo-packages/{{ arch_conf["mirror_arch"] }}/packages"' - set PORTAGE_BINHOST '"https://{{ mirror_host }}/gentoo-packages/{{ arch_conf["mirror_arch"] }}/packages"'
{% endif %} {% endif %}
{% endif %} {% endif %}
- rm AUTOCLEAN
- require: - require:
- file: /usr/share/augeas/lenses/makeconf.aug - file: /usr/share/augeas/lenses/makeconf.aug