Skip to content

Commit 9685910

Browse files
author
Bill Meek
committed
User Options: move loading to the common role
Improve the group_vars/README comments and instructions. Remove --extra-vars comments in mythtv.yml Add the only list of Free BSD packages I've found in a README.
1 parent 47ba51a commit 9685910

File tree

5 files changed

+123
-22
lines changed

5 files changed

+123
-22
lines changed

group_vars/README

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
11
The user_options.yml file is NOT maintained by git. It's here for
22
users to add information unique to their MythTV Ansible playbook
3-
runs.
3+
runs. A git pull won't overwrite it.
44

5-
The Ansible precedence list can be found here:
5+
Variables set here will override those in the all.yml file in this
6+
directory. The full Ansible precedence list can be found here:
67
https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_variables.html
8+
Command line settings (like: --extra-vars='{"qt6": true}') would override settings
9+
here.
710

8-
The contents of a user_options.yml file would look like the following -
9-
everything between the long underscore lines:
10-
_____________________________________________________________________
11+
The contents of a user_options.yml file could look like the following -
12+
things between the long underscore lines:
13+
_______________________________________________________________________
1114

1215
---
1316

14-
# Create a Python Virtual Environment:
17+
# Set to false to enable use of the Single Role
18+
use_old_roles: false
19+
20+
# Set to true to create a Python Virtual Environment:
1521
venv_active: true
1622

1723
# Change the default Virtual Environment path from ~/.virtualenvs/mythtv
1824
# to somewhere else:
1925
# venv_path: /something/you_prefer
2026

21-
# Turn this on to load Qt6 packages rather than Qt5:
27+
# Set this to true to load Qt6 packages rather than Qt5:
2228
qt6: false
2329

2430
...
25-
_____________________________________________________________________
31+
_______________________________________________________________________

mythtv.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212
# <host> = one of the names under 'hosts:' in the hosts.yml file. See
1313
# README.md for help.
1414
#
15-
# The following will get removed or moved to README.md
16-
# With: --extra-vars='{"qt6": true}' # Single Role WIP for Qt6
17-
# With: --extra-vars='{"use_old_roles": false}' # Single Role WIP
18-
# With: --extra-vars='{"venv_active": true}' # Builds a Python venv
19-
# With: --extra-vars='{"venv_path": 'new path'}' # Allows changing the
20-
# default venv_path which is ~/.virtualenvs/mythtv
21-
#
2215

2316
---
2417

roles/common/tasks/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@
4141
- "ansible_version.full: {{ ansible_version.full }}"
4242
when: ansible_lsb.major_release is undefined
4343

44+
- name: Load a user_options.yml file if it exists
45+
include_vars:
46+
file: '{{ item }}'
47+
with_first_found:
48+
- group_vars/user_options.yml
49+
- /dev/null
50+
ignore_errors: true
51+
4452
...
4553

4654
# vim: set expandtab tabstop=2 shiftwidth=2 smartindent noautoindent colorcolumn=2,80:

roles/mythtv/tasks/main.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212
distro: '{{ ansible_distribution | regex_replace("[/ ]", "_") | lower }}'
1313
version: '{{ ansible_distribution_major_version | int }}'
1414

15-
- name: Load a user_options.yml file if it exists
16-
include_vars:
17-
file: '{{ item }}'
18-
with_first_found:
19-
- group_vars/user_options.yml
20-
- /dev/null
21-
2215
- name: See if special setup tasks exist
2316
stat:
2417
path: '{{ playbook_dir }}/roles/mythtv/tasks/{{ ansible_pkg_mgr }}_{{ distro }}.yml'

roles/mythtv/vars/freebsd/README

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
From a 2006 post here: https://www.freshports.org/multimedia/mythtv
2+
Although it says it was updated in 2024.
3+
4+
# Build dependencies:
5+
yasm
6+
input.h
7+
py311-setuptools>0
8+
py311-mysqlclient>=0
9+
py311-future>=0
10+
py311-lxml>=0
11+
py311-requests>=0
12+
py311-simplejson>=0
13+
p5-DBI>=0
14+
p5-DBD-mysql>=0
15+
p5-Net-UPnP>=0
16+
p5-IO-Socket-INET6>=2.51
17+
p5-XML-Simple>=0
18+
p5-HTTP-Request-Params>=0
19+
p5-LWP-UserAgent-Determined>=0
20+
gmake>=4.4.1
21+
pkgconf>=1.3.0_1
22+
python3.11
23+
xorgproto>=0
24+
x11.pc
25+
xv.pc
26+
xrandr.pc
27+
xxf86vm.pc
28+
xinerama.pc
29+
xext.pc
30+
xcb.pc
31+
perl5>=5.36<5.37
32+
qt5-buildtools>=5.15
33+
linguist
34+
qt5-qmake>=5.15
35+
# Test dependencies:
36+
python3.11
37+
# Runtime dependencies:
38+
tv_check
39+
wget
40+
py311-mysqlclient>=1.2.2
41+
py311-sqlite3>0
42+
py311-lxml>=0
43+
py311-requests>0
44+
py311-requests-cache>0
45+
py311-simplejson>=3
46+
p5-DBI>=0
47+
p5-DBD-mysql>=0
48+
p5-Net-UPnP>=0
49+
p5-IO-Socket-INET6>=2.51
50+
p5-XML-Simple>=0
51+
p5-HTTP-Request-Params>=0
52+
p5-LWP-UserAgent-Determined>=0
53+
python3.11
54+
x11.pc
55+
xv.pc
56+
xrandr.pc
57+
xxf86vm.pc
58+
xinerama.pc
59+
xext.pc
60+
xcb.pc
61+
perl5>=5.36<5.37
62+
libqtiff.so
63+
libqsqlmysql.so
64+
# Library dependencies:
65+
liblzo2.so
66+
libmp3lame.so
67+
libsamplerate.so
68+
libtag.so
69+
libexiv2.so
70+
libva.so
71+
libbluray.so
72+
libass.so
73+
libfftw3_threads.so
74+
libfftw3f.so
75+
libfreetype.so
76+
libdav1d.so
77+
libaom.so
78+
libdrm.so
79+
libpulse.so
80+
libjack.so
81+
libSoundTouch.so
82+
libasound.so
83+
libsndio.so
84+
libgnutls.so
85+
libzip.so
86+
libexpat.so
87+
libhdhomerun.so
88+
libvdpau.so
89+
libGL.so
90+
libxml2.so
91+
libmysqlclient.so.21
92+
libQt5Core.so
93+
libQt5DBus.so
94+
libQt5Gui.so
95+
libQt5Multimedia.so
96+
libQt5Network.so
97+
libQt5OpenGL.so
98+
libQt5Script.so
99+
libQt5Sql.so
100+
libQt5Widgets.so
101+
libQt5Xml.so

0 commit comments

Comments
 (0)