Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3768896
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/pillar/devserver/ports.sls b/pillar/devserver/ports.sls
index 156170d..71c5d11 100644
--- a/pillar/devserver/ports.sls
+++ b/pillar/devserver/ports.sls
@@ -1,143 +1,153 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2020-01-18
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Ports to build manually
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ports:
+ ant:
+ category: devel
+ name: apache-ant
+ creates: /usr/local/bin/ant
+ options:
+ unset:
+ - DOCS
+ package_dependencies:
+ - openjdk17
+
xaos:
category: graphics
name: xaos
creates: /usr/local/bin/xaos
options:
set:
- NLS
- AALIB
unset:
- THREADS
- GTK2
- "X11"
ffmpeg:
category: multimedia
name: ffmpeg
creates: /usr/local/bin/ffmpeg
options:
set:
- AOM
- CACA
- DAV1D
- FONTCONFIG
- FREETYPE
- FREI0R
- ICONV
- LAME
- MMX
- OPENCV
- OPTIMIZED_CFLAGS
- OPUS
- RTCPU
- SSE
- THEORA
- V4L
- VAAPI
- VDPAU
- VORBIS
- VPX
- "X264"
- "X265"
- XCB
- XVID
- GMP
- GNUTLS
- GPL3
- NONFREE
unset:
- ALSA
- AMR_NB
- AMR_WB
- ASS
- BEIGNET
- BS2B
- CDIO
- CELT
- CODEC2
- DC1394
- DEBUG
- DOCS
- DRM
- FDK_AAC
- FLITE
- FRIBIDI
- GME
- GSM
- ILBC
- JACK
- KVAZAAR
- LADSPA
- LENSFUN
- LIBBLURAY
- LIBRSVG2
- LIBXML2
- LV2
- MODPLUG
- MYSOFA
- OPENAL
- OPENCL
- OPENGL
- OPENH264
- OPENJPEG
- OPENMPT
- POCKETSPHINX
- PULSEAUDIO
- RAV1E
- RUBBERBAND
- SDL
- SMB
- SNAPPY
- SNDIO
- SOXR
- SPEEX
- SSH
- SVTAV1
- SVTHEVC
- SVTVP9
- TESSERACT
- TWOLAME
- VAPOURSYNTH
- VIDSTAB
- VMAF
- VO_AMRWBENC
- WAVPACK
- WEBP
- XVIDEO
- ZIMG
- ZMQ
- ZVBI
- GCRYPT
- LIBRTMP
- MBEDTLS
- OPENSSL
node:
category: www
name: node
creates: /usr/local/bin/node
options:
set:
- BUNDLED_SSL
- NLS
unset:
- DOCS
- DTRACE
npm:
category: www
name: npm
creates: /usr/local/bin/npm
diff --git a/roles/devserver/userland-software/files/port_options b/roles/devserver/userland-software/files/port_options
index 9e326c5..308d29e 100644
--- a/roles/devserver/userland-software/files/port_options
+++ b/roles/devserver/userland-software/files/port_options
@@ -1,15 +1,15 @@
# -------------------------------------------------------------
# Port options for {{ args['category'] }}/{{ args['name'] }}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# 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
index a4d4d7a..dac692b 100644
--- a/roles/devserver/userland-software/ports.sls
+++ b/roles/devserver/userland-software/ports.sls
@@ -1,42 +1,50 @@
# -------------------------------------------------------------
# Salt — Provision dev software
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2020-01-18
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% if grains['os'] == 'FreeBSD' %}
{% for port, args in pillar.get("ports", {}).items() %}
# -------------------------------------------------------------
# Provision port options
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% if 'options' in args %}
/var/db/ports/{{ args['category'] }}_{{ args['name'] }}/options:
file.managed:
- source: salt://roles/devserver/userland-software/files/port_options
- template: jinja
- mode: 644
- context:
args: {{ args }}
{% endif %}
# -------------------------------------------------------------
# Build and install package
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+{% if 'package_dependencies' in args %}
+
+port_{{ port }}_dependencies:
+ pkg.installed:
+ - pkgs: {{ args["package_dependencies"] }}
+
+{% endif %}
+
port_{{ port }}:
cmd.run:
- name: |
make build package deinstall reinstall
pkg lock {{ port }}
- cwd: /usr/ports/{{ args['category'] }}/{{ args['name'] }}
- creates: {{ args['creates'] }}
{% endfor %}
{% endif %}
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Nov 25, 11:17 (1 d, 11 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2260067
Default Alt Text
(5 KB)
Attached To
Mode
rOPS Nasqueron Operations
Attached
Detach File
Event Timeline
Log In to Comment