Page MenuHomeDevCentral
Files F3745870

D2912.id7422.diff
No OneTemporary
Actions

D2912.id7422.diff
View Options

diff --git a/pillar/devserver/ports.sls b/pillar/devserver/ports.sls
--- a/pillar/devserver/ports.sls
+++ b/pillar/devserver/ports.sls
@@ -11,6 +11,16 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ports:
+ ant:
+ category: devel
+ name: apache-ant
+ creates: /usr/local/bin/ant
+ options:
+ unset:
+ - DOCS
+ package_dependencies:
+ - openjdk17
+
xaos:
category: graphics
name: xaos
diff --git a/roles/devserver/userland-software/files/port_options b/roles/devserver/userland-software/files/port_options
--- a/roles/devserver/userland-software/files/port_options
+++ b/roles/devserver/userland-software/files/port_options
@@ -6,10 +6,10 @@
# Source file: roles/devserver/userland-software/files/port_options
# -------------------------------------------------------------
-{% for option in args.get('options', {}).get('set') -%}
+{% for option in args.get('options', {}).get('set', []) -%}
OPTIONS_FILE_SET+={{ option }}
{% endfor -%}
-{% for option in args.get('options', {}).get('unset') -%}
+{% for option in args.get('options', {}).get('unset', []) -%}
OPTIONS_FILE_UNSET+={{ option }}
{% endfor -%}
diff --git a/roles/devserver/userland-software/ports.sls b/roles/devserver/userland-software/ports.sls
--- a/roles/devserver/userland-software/ports.sls
+++ b/roles/devserver/userland-software/ports.sls
@@ -30,6 +30,14 @@
# Build and install package
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+{% if 'package_dependencies' in args %}
+
+port_{{ port }}_dependencies:
+ pkg.installed:
+ - pkgs: {{ args["package_dependencies"] }}
+
+{% endif %}
+
port_{{ port }}:
cmd.run:
- name: |

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 17:27 (3 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2247851
Default Alt Text
D2912.id7422.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator