diff options
| author | Jan Tuomi <jan@jantuomi.fi> | 2026-07-27 20:25:14 +0300 |
|---|---|---|
| committer | Jan Tuomi <jan@jantuomi.fi> | 2026-07-27 20:25:14 +0300 |
| commit | 8348425ca716e9d20ec3ddb9d1d39425a778530d (patch) | |
| tree | 8fa3b80fad5d2a5597a27bca90d3977f6b761ce4 /roles/host | |
| parent | 73202ab15e3ff44678cbb646b69d647441303c55 (diff) | |
Use poudriere built packages, upgrade to 15.1
Diffstat (limited to 'roles/host')
| -rw-r--r-- | roles/host/tasks/poudriere.yml | 8 | ||||
| -rw-r--r-- | roles/host/templates/poudriere_build_make.conf.j2 | 1 | ||||
| -rw-r--r-- | roles/host/templates/usr_local_bin_update_ports.sh.j2 | 7 | ||||
| -rw-r--r-- | roles/host/templates/usr_local_etc_poudriere_pkglist.j2 | 12 |
4 files changed, 8 insertions, 20 deletions
diff --git a/roles/host/tasks/poudriere.yml b/roles/host/tasks/poudriere.yml index 83098b7..1d0fd58 100644 --- a/roles/host/tasks/poudriere.yml +++ b/roles/host/tasks/poudriere.yml @@ -47,14 +47,6 @@ shell: poudriere ports -c -p custom -m null -M /usr/ports/custom when: _poudriere_custom_exists.rc != 0 -- name: Deploy poudriere package list - template: - src: usr_local_etc_poudriere_pkglist.j2 - dest: /usr/local/etc/poudriere-pkglist - owner: root - group: wheel - mode: "0644" - - name: Deploy poudriere-start-build script template: src: usr_local_bin_poudriere_start_build.sh.j2 diff --git a/roles/host/templates/poudriere_build_make.conf.j2 b/roles/host/templates/poudriere_build_make.conf.j2 index 6bc860f..4205292 100644 --- a/roles/host/templates/poudriere_build_make.conf.j2 +++ b/roles/host/templates/poudriere_build_make.conf.j2 @@ -1,2 +1,3 @@ DEFAULT_VERSIONS+=python=3.12 python3=3.12 +DEFAULT_VERSIONS+=php=8.4 DISABLE_LICENSES=yes diff --git a/roles/host/templates/usr_local_bin_update_ports.sh.j2 b/roles/host/templates/usr_local_bin_update_ports.sh.j2 index ad4102d..7063652 100644 --- a/roles/host/templates/usr_local_bin_update_ports.sh.j2 +++ b/roles/host/templates/usr_local_bin_update_ports.sh.j2 @@ -53,6 +53,13 @@ custom) rm -rf "${BASEDIR}/custom" git clone "$REMOTE_CUSTOM" "${BASEDIR}/custom" fi + + # Regenerate poudriere pkglist from all ports in the overlay + echo "Regenerating poudriere pkglist..." + find "${BASEDIR}/custom" -name Makefile -mindepth 3 -maxdepth 3 | \ + sed "s|${BASEDIR}/custom/||; s|/Makefile||" | \ + sort > /usr/local/etc/poudriere-pkglist + echo "Pkglist updated: $(wc -l < /usr/local/etc/poudriere-pkglist) ports." echo "Done. Custom ports overlay updated." ;; *) diff --git a/roles/host/templates/usr_local_etc_poudriere_pkglist.j2 b/roles/host/templates/usr_local_etc_poudriere_pkglist.j2 deleted file mode 100644 index debb842..0000000 --- a/roles/host/templates/usr_local_etc_poudriere_pkglist.j2 +++ /dev/null @@ -1,12 +0,0 @@ -databases/py-tinydb -www/py-ua-parser -www/py-user-agents -sysutils/pylogsentinel -net-im/taulubot -net-im/hommabot -www/aggro -www/diddle -www/expense-tracker -www/gdrive-photo-gallery -www/pastebin -multimedia/plexmediaserver |