diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/host/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/host/tasks/poudriere.yml | 8 | ||||
| -rw-r--r-- | roles/host/templates/poudriere_pkglist_quarterly.j2 | 1 | ||||
| -rw-r--r-- | roles/host/templates/usr_local_bin_poudriere_start_build.sh.j2 | 5 | ||||
| -rw-r--r-- | roles/host/templates/usr_local_bin_update_ports.sh.j2 | 4 |
5 files changed, 16 insertions, 4 deletions
diff --git a/roles/host/tasks/main.yml b/roles/host/tasks/main.yml index 86e33cf..a465136 100644 --- a/roles/host/tasks/main.yml +++ b/roles/host/tasks/main.yml @@ -256,7 +256,7 @@ The local package repository has not been built yet. Run the following command on the host to build packages: - poudriere bulk -j poudriere_build -p quarterly -O custom -f /usr/local/etc/poudriere-pkglist + poudriere-start-build Then re-run this playbook. ════════════════════════════════════════════════════════════════ diff --git a/roles/host/tasks/poudriere.yml b/roles/host/tasks/poudriere.yml index 1d0fd58..b46293f 100644 --- a/roles/host/tasks/poudriere.yml +++ b/roles/host/tasks/poudriere.yml @@ -55,6 +55,14 @@ group: wheel mode: "0755" +- name: Deploy quarterly poudriere package list + template: + src: poudriere_pkglist_quarterly.j2 + dest: /usr/local/etc/poudriere-pkglist.quarterly + owner: root + group: wheel + mode: "0644" + - name: Deploy poudriere build make.conf template: src: poudriere_build_make.conf.j2 diff --git a/roles/host/templates/poudriere_pkglist_quarterly.j2 b/roles/host/templates/poudriere_pkglist_quarterly.j2 new file mode 100644 index 0000000..db7ae63 --- /dev/null +++ b/roles/host/templates/poudriere_pkglist_quarterly.j2 @@ -0,0 +1 @@ +multimedia/plexmediaserver diff --git a/roles/host/templates/usr_local_bin_poudriere_start_build.sh.j2 b/roles/host/templates/usr_local_bin_poudriere_start_build.sh.j2 index 6bbd379..ae5ddd7 100644 --- a/roles/host/templates/usr_local_bin_poudriere_start_build.sh.j2 +++ b/roles/host/templates/usr_local_bin_poudriere_start_build.sh.j2 @@ -1,2 +1,5 @@ #!/bin/sh -exec poudriere bulk -j poudriere_build -p quarterly -O custom -f /usr/local/etc/poudriere-pkglist "$@" +exec poudriere bulk -j poudriere_build -p quarterly -O custom \ + -f /usr/local/etc/poudriere-pkglist.custom \ + -f /usr/local/etc/poudriere-pkglist.quarterly \ + "$@" 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 7063652..1a512af 100644 --- a/roles/host/templates/usr_local_bin_update_ports.sh.j2 +++ b/roles/host/templates/usr_local_bin_update_ports.sh.j2 @@ -58,8 +58,8 @@ custom) 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." + sort > /usr/local/etc/poudriere-pkglist.custom + echo "Pkglist updated: $(wc -l < /usr/local/etc/poudriere-pkglist.custom) ports." echo "Done. Custom ports overlay updated." ;; *) |