From 91dd25b85b253b84c888ccbb654c4b7ec9afc210 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 12:04:18 +0200 Subject: [PATCH 01/13] Update README roadmap for automatic template updates --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4c6362..a045bee 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Then all packages herein can be installed. - [x] Detect changed packages from previous builds - [x] build only for those packages - [x] serve from custom repository -- [ ] detect upstream changes and update templates +- [x] detect upstream changes and update templates - [ ] build for multiple (appropriate) arches ## Package wishlist From f156428706f5adca6ed2e9b7ccc9a71f8fb9867c Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 13:10:08 +0200 Subject: [PATCH 02/13] Add caching to checksum workflow --- .github/workflows/checksum.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index fc0614f..6276b8a 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -46,6 +46,13 @@ jobs: echo "CHANGED_PKG=$(git diff --name-only origin/main origin/${GITHUB_HEAD_REF} "srcpkgs/*/template" | head -1 | cut -d/ -f2)" >> $GITHUB_ENV echo "CHANGED: ${{ env.CHANGED_PKG }}" + - name: cache upstream + uses: actions/cache@v4 + id: cache-upstream + with: + path: upstream + key: void-templates-upstream-packages + - name: checkout upstream templates uses: actions/checkout@v4 with: @@ -55,6 +62,7 @@ jobs: path: upstream - name: prep masterdir + if: steps.cache-upstream.outputs.cache-hit != 'true' working-directory: upstream run: | chown -R builder:builder . && From 73482477dc5a44aee422b423fdcdc29851b62272 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 13:19:57 +0200 Subject: [PATCH 03/13] Allow manual renovate dispatch --- .github/workflows/renovate.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index 54fbe14..9a904ac 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -2,9 +2,14 @@ name: Check package updates on: schedule: - cron: "0 * * * *" + workflow_dispatch: + inputs: + log-level: + description: "Log level" + default: "info" env: - LOG_LEVEL: "info" + LOG_LEVEL: ${{ github.event.inputs.log-level }} RENOVATE_AUTODISCOVER: true RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}" RENOVATE_PLATFORM: github From b9c84675c4347ef01e7211f023fcbd2d8c09242a Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 13:19:57 +0200 Subject: [PATCH 04/13] Add renovate to localsend-go --- srcpkgs/localsend-go/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/localsend-go/template b/srcpkgs/localsend-go/template index 03a15f3..870555c 100644 --- a/srcpkgs/localsend-go/template +++ b/srcpkgs/localsend-go/template @@ -1,6 +1,6 @@ # Template file for 'localsend-go' pkgname=localsend-go -version=1.2.5 +version=1.2.5 # renovate: datasource=github-tags depName=meowrain/localsend-go revision=2 build_style=go go_import_path="localsend_cli" From 4753e594a6464d29ccbe840c31cc669ca4e2c761 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 13:19:57 +0200 Subject: [PATCH 05/13] Add manual dispatching for checksum --- .github/workflows/checksum.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index 6276b8a..c715bca 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -9,6 +9,14 @@ on: - synchronize branches: - main + workflow_dispatch: + inputs: + changed-pkg: + description: "Package to checksum" + default: "" + +env: + CHANGED_PKG: ${{ github.event.inputs.changed-pkg }} jobs: checksum: @@ -41,6 +49,7 @@ jobs: ref: ${{ github.ref }} - name: remember changed package + if: ${{ env.CHANGED_PKG == '' }} run: | git config --global --add safe.directory $PWD echo "CHANGED_PKG=$(git diff --name-only origin/main origin/${GITHUB_HEAD_REF} "srcpkgs/*/template" | head -1 | cut -d/ -f2)" >> $GITHUB_ENV @@ -74,7 +83,7 @@ jobs: - name: generate checksum working-directory: upstream - run: "sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }}" + run: sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }} - name: receive relevant copy from upstream run: | From dab1b7b013547fbb25ba0291ba351c4b01422ca7 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 14:01:22 +0200 Subject: [PATCH 06/13] Add chown for xgensum directories --- .github/workflows/checksum.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index c715bca..c70d742 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -83,7 +83,9 @@ jobs: - name: generate checksum working-directory: upstream - run: sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }} + run: | + chown -R builder:builder . && + sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }} - name: receive relevant copy from upstream run: | From 60a0f09fad37f112236d1e51f0deb3f69cb76a32 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 16:49:35 +0200 Subject: [PATCH 07/13] Bootstrap binaries even if cache hit --- .github/workflows/checksum.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/checksum.yaml b/.github/workflows/checksum.yaml index c70d742..028b7a1 100644 --- a/.github/workflows/checksum.yaml +++ b/.github/workflows/checksum.yaml @@ -57,7 +57,6 @@ jobs: - name: cache upstream uses: actions/cache@v4 - id: cache-upstream with: path: upstream key: void-templates-upstream-packages @@ -71,7 +70,6 @@ jobs: path: upstream - name: prep masterdir - if: steps.cache-upstream.outputs.cache-hit != 'true' working-directory: upstream run: | chown -R builder:builder . && From d0d4b298a6b18b8b0934247d8edaaad0ac395140 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 19:01:03 +0200 Subject: [PATCH 08/13] Remove ly-git from repo --- srcpkgs/ly-git/files/ly/conf | 12 ------------ srcpkgs/ly-git/files/ly/finish | 4 ---- srcpkgs/ly-git/files/ly/run | 13 ------------ srcpkgs/ly-git/template | 36 ---------------------------------- 4 files changed, 65 deletions(-) delete mode 100644 srcpkgs/ly-git/files/ly/conf delete mode 100644 srcpkgs/ly-git/files/ly/finish delete mode 100644 srcpkgs/ly-git/files/ly/run delete mode 100644 srcpkgs/ly-git/template diff --git a/srcpkgs/ly-git/files/ly/conf b/srcpkgs/ly-git/files/ly/conf deleted file mode 100644 index 76ceb87..0000000 --- a/srcpkgs/ly-git/files/ly/conf +++ /dev/null @@ -1,12 +0,0 @@ -if [ -x /sbin/agetty -o -x /bin/agetty ]; then - # util-linux specific settings - if [ "${tty}" = "tty1" ]; then - GETTY_ARGS="--noclear" - fi -fi - -BAUD_RATE=38400 -TERM_NAME=linux - -auxtty=$(/bin/cat $CONFIG_DIRECTORY/ly/config.ini 2>/dev/null 1| /bin/sed -n 's/\(^[[:space:]]*tty[[:space:]]*=[[:space:]]*\)\([[:digit:]][[:digit:]]*\)\(.*\)/\2/p') -TTY=tty${auxtty:-$DEFAULT_TTY} diff --git a/srcpkgs/ly-git/files/ly/finish b/srcpkgs/ly-git/files/ly/finish deleted file mode 100644 index b1b33ed..0000000 --- a/srcpkgs/ly-git/files/ly/finish +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -[ -r conf ] && . ./conf - -exec utmpset -w ${TTY} diff --git a/srcpkgs/ly-git/files/ly/run b/srcpkgs/ly-git/files/ly/run deleted file mode 100644 index 68fb2d6..0000000 --- a/srcpkgs/ly-git/files/ly/run +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -[ -r conf ] && . ./conf - -if [ -x /sbin/getty -o -x /bin/getty ]; then - # busybox - GETTY=getty -elif [ -x /sbin/agetty -o -x /bin/agetty ]; then - # util-linux - GETTY=agetty -fi - -exec setsid ${GETTY} ${GETTY_ARGS} -nl $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME "${TTY}" "${BAUD_RATE}" "${TERM_NAME}" diff --git a/srcpkgs/ly-git/template b/srcpkgs/ly-git/template deleted file mode 100644 index 96a4e62..0000000 --- a/srcpkgs/ly-git/template +++ /dev/null @@ -1,36 +0,0 @@ -# Template file for 'ly' -pkgname=ly-git -version=20241012 -revision=1 -_commit=e125d8f1aa1544a6a106047c0acd7a7d2e0ff16c -archs="x86_64" -build_style=zig-build -configure_args="installrunit -Dpie" -hostmakedepends="git" -makedepends="pam-devel libxcb-devel" -depends="" -short_desc="Display manager with console UI" -maintainer="Marty Oehme " -license="WTFPL" -homepage="https://github.com/fairyglade/ly" -#changelog="" -distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=5c33daa89b680ebce6dd37a0edfaa9f68066c4646708bcf020233c6a58d53561 -nostrip=yes - -do_build() { - DESTDIR="zig-out" zig build -j"${XBPS_MAKEJOBS}" --sysroot "${XBPS_CROSS_BASE}" --search-prefix "${XBPS_CROSS_BASE}/usr" --prefix /usr --global-cache-dir /host/zig --verbose -} - -do_install() { - vlicense license.md - vdoc readme.md - vbin zig-out/usr/bin/ly - vmkdir /etc/ly - vinstall res/config.ini 0644 /etc/ly - vinstall res/setup.sh 0755 /etc/ly - vinstall res/pam.d/ly 0644 /etc/pam.d - vcopy res/lang /etc/ly/lang - - vsv ly -} From 1c7fb76040e3775b2663dd71ed5b79d4b0507b58 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 18:57:26 +0200 Subject: [PATCH 09/13] Add renovate to all packages --- srcpkgs/bemoji/template | 2 +- srcpkgs/dotter/template | 2 +- srcpkgs/filtile-bin/template | 4 ++-- srcpkgs/netbird-bin/template | 2 +- srcpkgs/tgpt/template | 2 +- srcpkgs/topen/template | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/bemoji/template b/srcpkgs/bemoji/template index ccb47f1..03f0618 100644 --- a/srcpkgs/bemoji/template +++ b/srcpkgs/bemoji/template @@ -1,6 +1,6 @@ # Template file for 'bemoji' pkgname=bemoji -version=0.4.0 +version=0.4.0 # renovate: datasource=github-tags depName=marty-oehme/bemoji revision=1 depends="bash coreutils" short_desc="emoji picker that remembers your favorites" diff --git a/srcpkgs/dotter/template b/srcpkgs/dotter/template index 7b342ec..51fc0cb 100644 --- a/srcpkgs/dotter/template +++ b/srcpkgs/dotter/template @@ -1,6 +1,6 @@ # Template file for 'dotter' pkgname=dotter -version=0.13.3 +version=0.13.3 # renovate: datasource=github-tags depName=SuperCuber/dotter revision=1 build_style=cargo hostmakedepends="rust" diff --git a/srcpkgs/filtile-bin/template b/srcpkgs/filtile-bin/template index 22446fe..381d78c 100644 --- a/srcpkgs/filtile-bin/template +++ b/srcpkgs/filtile-bin/template @@ -1,5 +1,5 @@ pkgname=filtile-bin -version=1.2.1 +version=1.2.1 # renovate: datasource=github-tags depName=pkulak/filtile revision=1 archs="x86_64" depends="river" @@ -9,7 +9,7 @@ license="GPL-3.0" homepage="https://github.com/pkulak/filtile" distfiles="https://github.com/pkulak/filtile/releases/download/v${version}/filtile-x86_64-unknown-linux-gnu.tar.gz" checksum=aa0b3e0dbb2126f44f153f2f6d1fd37f6961bf7153895aff50e3cc6bce191466 - + do_install() { vbindir=/usr/bin diff --git a/srcpkgs/netbird-bin/template b/srcpkgs/netbird-bin/template index d49d529..fefb416 100644 --- a/srcpkgs/netbird-bin/template +++ b/srcpkgs/netbird-bin/template @@ -1,6 +1,6 @@ # Template file for 'netbird-bin' pkgname=netbird-bin -version=0.39.1 +version=0.39.1 # renovate: datasource=github-tags depName=netbirdio/netbird revision=1 archs="x86_64" short_desc="Connect your devices into a secure WireGuard-based overlay network with SSO, MFA and granular access controls." diff --git a/srcpkgs/tgpt/template b/srcpkgs/tgpt/template index 26d433e..525182b 100644 --- a/srcpkgs/tgpt/template +++ b/srcpkgs/tgpt/template @@ -1,6 +1,6 @@ # Template file for 'tgpt' pkgname=tgpt -version=2.10.0 +version=2.10.0 # renovate: datasource=github-tags depName=aandrew-me/tgpt revision=1 build_style=go go_import_path="github.com/aandrew-me/tgpt/v2" diff --git a/srcpkgs/topen/template b/srcpkgs/topen/template index 5053e74..19b8924 100644 --- a/srcpkgs/topen/template +++ b/srcpkgs/topen/template @@ -1,6 +1,6 @@ # Template file for 'topen' pkgname=topen -version=0.1.0 +version=0.1.0 # renovate: datasource=github-tags depName=marty-oehme/topen revision=1 build_style=python3-pep517 depends="python3-tasklib" From 4921fe87e2d1092c9dc1383b63cc5c08c0fb582e Mon Sep 17 00:00:00 2001 From: marty-oehme <2098447+marty-oehme@users.noreply.github.com> Date: Tue, 24 Jun 2025 19:07:16 +0200 Subject: [PATCH 10/13] Update dependency netbirdio/netbird to v0.48.0 (#9) * Update dependency netbirdio/netbird to v0.48.0 * Update netbird-bin checksum --------- Co-authored-by: Renovate Bot --- srcpkgs/netbird-bin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/netbird-bin/template b/srcpkgs/netbird-bin/template index fefb416..69baba8 100644 --- a/srcpkgs/netbird-bin/template +++ b/srcpkgs/netbird-bin/template @@ -1,6 +1,6 @@ # Template file for 'netbird-bin' pkgname=netbird-bin -version=0.39.1 # renovate: datasource=github-tags depName=netbirdio/netbird +version=0.48.0 # renovate: datasource=github-tags depName=netbirdio/netbird revision=1 archs="x86_64" short_desc="Connect your devices into a secure WireGuard-based overlay network with SSO, MFA and granular access controls." @@ -8,7 +8,7 @@ maintainer="Marty Oehme " license="BSD-3-Clause" homepage="https://github.com/netbirdio/netbird" distfiles="${homepage}/releases/download/v${version}/netbird_${version}_linux_amd64.tar.gz" -checksum=ac4dbf589cf33dc1c347a6dba569cdcaf8a6915f88c6a7baffdb35fcf9b954f0 +checksum=be159667436e4f8c58c78f72dd5602ccca2515eed05dd2fef4ee6f64e1d79b87 do_install() { vbin netbird From f86325cfdbc1783e12f90e501c8ab08c3b2d4ce4 Mon Sep 17 00:00:00 2001 From: marty-oehme <2098447+marty-oehme@users.noreply.github.com> Date: Tue, 24 Jun 2025 19:08:41 +0200 Subject: [PATCH 11/13] Update dependency meowrain/localsend-go to v1.2.7 (#7) * Update dependency meowrain/localsend-go to v1.2.7 * Update localsend-go checksum --------- Co-authored-by: Renovate Bot --- srcpkgs/localsend-go/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/localsend-go/template b/srcpkgs/localsend-go/template index 870555c..8eab288 100644 --- a/srcpkgs/localsend-go/template +++ b/srcpkgs/localsend-go/template @@ -1,6 +1,6 @@ # Template file for 'localsend-go' pkgname=localsend-go -version=1.2.5 # renovate: datasource=github-tags depName=meowrain/localsend-go +version=1.2.7 # renovate: datasource=github-tags depName=meowrain/localsend-go revision=2 build_style=go go_import_path="localsend_cli" @@ -11,7 +11,7 @@ maintainer="Marty Oehme " license="MIT" homepage="https://github.com/meowrain/localsend-go" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=48d6b94b7cbcf6b07400c7293401a0d329e15c6ab1f3493e31363a5525e73b00 +checksum=03ad0ae0fec719ec6425023338c8f4017f78237940c868435f8601addb9e99cd do_install() { vbin ${GOPATH}/bin/cmd localsend_cli From 962a2de0131b7d88d37aaecfdb9a5bb06d85c74a Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 19:27:02 +0200 Subject: [PATCH 12/13] Fix localsend-go build Finally adopted standardized go_mod package name, so we can get rid of our work-around. --- srcpkgs/localsend-go/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/localsend-go/template b/srcpkgs/localsend-go/template index 8eab288..b0c30e3 100644 --- a/srcpkgs/localsend-go/template +++ b/srcpkgs/localsend-go/template @@ -3,8 +3,7 @@ pkgname=localsend-go version=1.2.7 # renovate: datasource=github-tags depName=meowrain/localsend-go revision=2 build_style=go -go_import_path="localsend_cli" -go_package="./cmd" +go_import_path="github.com/meowrain/localsend-go" depends="libcap-progs" short_desc="CLI for localsend implemented in Go" maintainer="Marty Oehme " @@ -14,7 +13,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz" checksum=03ad0ae0fec719ec6425023338c8f4017f78237940c868435f8601addb9e99cd do_install() { - vbin ${GOPATH}/bin/cmd localsend_cli + vbin ${GOPATH}/bin/localsend-go localsend-go } # have to turn it off currently since From db5c74ebfb573c319582e8ae2547fe52c3879996 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 24 Jun 2025 20:44:39 +0200 Subject: [PATCH 13/13] Fix build workflow checking out correct branch On running from workflow_run should check out the ref that workflow_run was running on. --- .github/workflows/build.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 589a5cc..d2f08ef 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -96,7 +96,15 @@ jobs: ref: master fetch-depth: 1 + - name: checkout local templates from prev workflow + if: "${{ github.event_name == 'workflow_run' }}" + uses: actions/checkout@v4 + with: + ref: ${{ github.event.workflow_run.head_branch }} + path: added-packages + - name: checkout local templates + if: "${{ github.event_name != 'workflow_run' }}" uses: actions/checkout@v4 with: ref: ${{ github.head_ref }}