Skip to content

Commit 5349d9e

Browse files
author
Bill Meek
committed
pacman: remove extra space in reject() filter
Also, update Docker files, ignore files hosts and tools. Fixes: #70
1 parent df58301 commit 5349d9e

9 files changed

+62
-50
lines changed

‎.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.sh
88
*.setup.out
99
*.swp
10+
*~
1011
**/Docker
1112
Dockerfile
1213
README.md

‎.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# Tools
1+
# Tools/WIP
22
*.setup.out
33
*.sh
4+
*~
5+
Dockerfile
46
# vim etc.
57
*.swp
68
# for any leftovers...
79
qt5.retry
810
# If retry_files_enabled=False gets changed in ansible.cfg
911
mythtv.retry
10-
Dockerfile

‎Docker/buildbot.distros.md

+27-27
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### Distributions known to the buildbots plus some tests.
44

5-
TABLE NEEDS UPDATING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5+
TABLE NEEDS UPDATING, but it's pretty good 3/1/2025
66

77
In the Status column, "Done" means that the Dockerfile instructions
88
completed the following:
@@ -14,29 +14,29 @@ completed the following:
1414
- Built/installed mythplugins OK
1515
<br/>
1616

17-
Buildbot Distro Name | Codename | EOL | MythTV | Status | Notes
18-
:--------------------| :------- | :-- | :----- |:------ |:------------------------------------------------------
19-
archlinux | N/A | Rolling | 35 | Done | Ansible=2.18.2
20-
centos8 | Stream8 | 2021-12-31 | 35 | FAILED | Ansible=2.16.3 build can't find libiec61883
21-
centos9 | N/A | Estimated 2027 | 35 | Done | Ansible=2.14.18
22-
debian-buster (10) | Buster | 1 Jun 2024 | 31 | FAILED | Ansible=2.7.7 qmake version issue
23-
debian-bullseye (11) | Bullseye | 15 Aug 2026 | 34 | Done |
24-
debian-bookworm (12) | Bookworm | 30 Jun 2028 | 35 | Done | Ansible=2.16.14???
25-
debian-unstable (N/A) | Trixie | xx xxx 20xx | 35 | FAILED | Ansible=2.18.1 see Dockerfile
26-
fedora40 | N/A | 2025-??-?? | 35 | Done | Ansible=2.16.14
27-
fedora41 | N/A | 2026-??-?? | 35 | Done |Ansible=2.16.14
28-
fedora-aarch64 | N/A | N/A | x |no Dockerfile | No manifest @ hub.docker.com
29-
fedora-armv7hl | N/A | N/A | x |no Dockerfile | No manifest @ hub.docker.com
30-
fedora-rawhide | N/A | N/A | master | Done | Ansible=2.18.1 (with C23 fix in master, not v35 yet)
31-
freebsd12 | N/A | N/A | x |FAILING | tried amontalban:freebsd (only manifest available)
32-
LMDE6 | Faye | N/A | 35 | Done | Ansible=2.14.18
33-
osx | N/A | N/A | x |no Dockerfile | No manifest @ hub.docker.com
34-
opensuse:leap | Leap | November 2022 (for 15.3, 2023 for .4) | 35 | FAILED | Ansible=2.16.5 Not a buildbot distro NEEDS Python.h!!! has gcc v7.5, cmake wants 8 or better
35-
opensuse:tumbleweed | Tumbleweed | "Forever" | 35 | Done | Ansible=2.16.3 Not a buildbot distro Needs Python.h
36-
rockylinux:8 | Green Obsidian | 31 May 2024 | 35 | Done | Ansible=2.16.3 Not a buildbot distro
37-
rockylinux:9 | Blue Onyx | 31 May 2025 | 35 | Done | Ansible=2.14.17 Not a buildbot distro Python 3.9.21 found in /tmp/usr/local...
38-
ubuntu-20.04 | Focal Fossa | 25.04 | 35 | Failed | Ansible=2.9.6, got version: 5.12.8 qmake for Qt 5.15.2 or newer not found.
39-
ubuntu-22.04 | Jammy Jellyfish | 27.04 | 34 | Failed | Ansible=2.10.8 python in: /tmp/usr/local/dist/lib/python3.10/site-packages/MythTV
40-
ubuntu-24.04 | Noble Numbat | 29.04 | 35 | Done | Ansible=2.16.3
41-
alpine:latest | N/A | 23 May 2022 | N/A | T-OK | Test with unknown package manager
42-
amazonlinux:devel | setenforce? | December 31, 2020 | N/A | T-OK | Test with unknown distro
17+
Buildbot Distro Name | Codename | EOL | MythTV | Status | Ansible | Notes
18+
:--------------------| :------- | :-- | :----- |:------ |:------- |:---------------------------------------------
19+
archlinux | N/A | Rolling | 35 | Done | 2.18.2 |
20+
centos8 | Stream8 | 2021-12-31 | 35 | FAILED | 2.16.3 | not in bb or workflow, can't find libiec61883
21+
centos9 | N/A | Estimated 2027 | 35 | Done | 2.14.18 |
22+
debian-buster (10) | Buster | 1 Jun 2024 | 31 | FAILED | 2.7.7 | not in bb or workflow, qmake version issue
23+
debian-bullseye (11) | Bullseye | 15 Aug 2026 | 34 | Done ||
24+
debian-bookworm (12) | Bookworm | 30 Jun 2028 | 35 | Done | 2.14.18 |
25+
debian-unstable (13) | Trixie | xx xxx 20xx | 35 | FAILED | 2.18.1 | see Dockerfile
26+
fedora40 | N/A | 2025-??-?? | 35 | Done | 2.16.14 |
27+
fedora41 | N/A | 2026-??-?? | 35 | Done | 2.16.14 |
28+
fedora-aarch64 | N/A | N/A | x |no Dockerfile || No manifest @ hub.docker.com
29+
fedora-armv7hl | N/A | N/A | x |no Dockerfile || No manifest @ hub.docker.com
30+
fedora-rawhide | N/A | N/A | master | Done | 2.18.1 | (with C23 fix in master, not v35 yet)
31+
freebsd12 | N/A | N/A | x |FAILING || tried amontalban:freebsd (only manifest available)
32+
LMDE6 | Faye | N/A | 35 | Done | 2.14.18 |
33+
osx | N/A | N/A | x |no Dockerfile || No manifest @ hub.docker.com
34+
opensuse:leap | Leap | November 2022 (for 15.3, 2023 for .4) | 35 | FAILED | 2.16.5 | Not a buildbot distro has gcc v7.5, cmake wants 8 or better
35+
opensuse:tumbleweed | Tumbleweed | "Forever" | 35 | Done | 2.16.3 | Not a buildbot distro Needs Python.h
36+
rockylinux:8 | Green Obsidian | 31 May 2024 | 35 | Done | 2.16.3 | Not a buildbot distro
37+
rockylinux:9 | Blue Onyx | 31 May 2025 | 35 | Done | 2.14.17 | Not a buildbot distro Python 3.9.21 found in /tmp/usr/local...
38+
ubuntu-20.04 | Focal Fossa | 25.04 | 35 | Failed | 2.9.6 | got version: 5.12.8 qmake for Qt 5.15.2 or newer not found.
39+
ubuntu-22.04 | Jammy Jellyfish | 27.04 | 34 | Failed | 2.10.8 | python in: /tmp/usr/local/dist/lib/python3.10/site-packages/MythTV
40+
ubuntu-24.04 | Noble Numbat | 29.04 | 35 | Done | 2.16.3 |
41+
alpine:latest | N/A | 23 May 2022 | N/A | T-OK || Test with unknown package manager
42+
amazonlinux:devel | setenforce? | December 31, 2020 | N/A | T-OK || Test with unknown distro

‎Docker/centos:8.Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
66
&& dnf --assumeyes install epel-release \
77
&& dnf makecache \
88
&& dnf --assumeyes distribution-synchronization \
9-
&& dnf --assumeyes install ansible git python3-dnf tree vim-enhanced \
10-
&& ln --force --symbolic /usr/bin/python3 /usr/bin/python
9+
&& dnf --assumeyes install ansible git mlocate python3-dnf tree vim-enhanced #\
10+
#&& ln --force --symbolic /usr/bin/python3 /usr/bin/python
1111
#&& pip3 --quiet install packaging setuptools-rust
1212

1313
WORKDIR /root/source/ansible
1414
COPY . ./
15-
RUN ./mythtv.yml --limit=localhost --extra-vars='{"venv_active":true}'
15+
RUN ./mythtv.yml --limit=libexec --extra-vars='{"venv_active":true}'
1616

1717
WORKDIR /root/source
1818
RUN git clone https://github.com/MythTV/mythtv.git
1919

2020
# buld fails because FFmpeg can't find libiec61883 (even though it and
2121
# libiec61883-devel are installed
2222
WORKDIR /root/source/mythtv
23-
RUN git checkout fixes/35 \
24-
&& cmake --preset qt5
23+
RUN git checkout fixes/35 #\
24+
# && cmake --preset qt5
2525
# && VIRTUAL_ENV=/usr/local/dist cmake --build build-qt5

‎Docker/debian:10.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM debian:10
22
LABEL CODENAME="Buster, Archived"
33
RUN apt-get update \
4-
&& apt-get install --yes apt-utils ansible git python3-apt vim \
5-
&& ln -s /usr/bin/python3 /usr/bin/python
4+
&& apt-get install --yes apt-utils ansible git python3 python3-apt vim #\
5+
# && ln -s /usr/bin/python3 /usr/bin/python
66

77
WORKDIR /root/source/ansible
88
COPY . ./

‎Docker/debian:13.Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ FROM debian:trixie
22
# Missing: g++ <----------------------------------
33
# Missing: libcrystalhd-dev <----------------------------------
44
# Missing: libfreetype6-dev <----------------------------------
5-
# FROM debian:13 doesn't exist
6-
# FROM debian:unstable is missing:
75

86
LABEL CODENAME="Trixie, probably v13, testing no release date set"
97
RUN apt-get update \
108
&& apt-get install --yes apt-utils ansible git plocate python3-apt vim
119

1210
WORKDIR /root/source/ansible
1311
COPY . ./
14-
RUN ./mythtv.yml --limit=localhost --extra-vars='{"venv_active":true}'
12+
#RUN ./mythtv.yml --limit=localhost --extra-vars='{"venv_active":true}'
1513

1614
#WORKDIR /root/source
1715
#RUN git clone https://github.com/MythTV/mythtv.git

‎hosts.yml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ mythtv_hosts:
1616

1717
hosts:
1818
localhost:
19+
libexec:
20+
ansible_python_interpreter: /usr/libexec/platform-python
1921
f30:
2022
ansible_python_interpreter: /usr/bin/python3
2123
freebsd:

‎roles/mythtv-pacman/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104

105105
- name: reject the libxnvctrl package for aarch64 hosts, e.g. RPis
106106
ansible.builtin.set_fact:
107-
pacman_pkg_lst: '{{ pacman_pkg_lst | flatten() | reject("search", "libxnvctrl ") }}'
107+
pacman_pkg_lst: '{{ pacman_pkg_lst | flatten() | reject("search", "libxnvctrl") }}'
108108
when: ansible_architecture == 'aarch64'
109109

110110
- name: final package list

‎tools/aliases_and_functions

100644100755
+20-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1+
# To read these tools in, type: . tools/aliases_and_functions
2+
# That's <DOT> <SPACE> tools/aliases_and_functions
3+
# Really: . to<TAB>/a<TAB> should work to auto complete the above
4+
15
# Ansible Add Package. Good for testing that a single package can be added
26
# without running the entire playbook. Note that the module name is: package
37
# rather than one like apt, dnf, pacman... This works for all systems.
48

59
function aap () {
610
if [ -z "${1}" ]; then
7-
echo "aap: needs a package name"
11+
echo "usage: aap package [optional manager (like apt, dnf, pacman etc)]"
812
return 1
913
fi
1014

11-
ansible localhost --module-name package --args "name='${1}' state='present'"
15+
if [ -n "${2}" ]; then
16+
MANAGER="${2}"
17+
else
18+
MANAGER="package"
19+
fi
20+
21+
ansible localhost --module-name "${MANAGER}" --args "name='${1}' state='present'"
1222
}
1323

1424
# Build and also examine Python Virtual Environment
@@ -17,25 +27,25 @@ function mbuild () {
1727
rm -rf ./build-qt5
1828
cmake --preset qt5
1929
VIRTURL_ENV=/usr/local/dist cmake --build build-qt5
20-
echo "Activate venv, expect MythTV IN list:"
30+
echo "Activate venv, expect MythTV to be found:"
2131
. /usr/local/dist/bin/activate
22-
pip list
23-
python3 -c "import MythTV" || true
24-
echo "Deactivate venv, expect MythTV NOT IN list:"
32+
pip show MythTV
33+
echo "Now DEACTIVATE venv and expect a WARNING that the MythTV package is NOT found:"
2534
deactivate
26-
pip list
35+
pip show MythTV
2736
}
2837

2938
# Read ansible aliases:
3039
alias raa=". /etc/ansible/mythtv-ansible/Docker/aliases"
3140

3241
# Activate the Python Virtual Environment
33-
alias aenv=". /usr/local/dist/bin/activate"
42+
alias avenv=". /usr/local/dist/bin/activate"
3443

35-
# Run Ansible with venv_active:
36-
alias avenv="./mythtv.yml --limit=localhost --extra-vars='{\"venv_active\":true}'"
44+
# Run Ansible with the venv_active variable set to true:
45+
alias rvenv="./mythtv.yml --limit=localhost --extra-vars='{\"venv_active\":true}'"
3746

3847
# Additional convenience items:
3948
alias ll='ls -l --color=auto --group-directories-first'
4049
alias lr='ls -lrt --color=auto --group-directories-first'
4150
alias lsdist='ls -lrt --color=auto --group-directories-first /usr/local/dist'
51+
alias lsdistm='ls -lrt --color=auto --group-directories-first /usr/local/dist/lib/python*/site-packages/MythTV'

0 commit comments

Comments
 (0)