From 7319768e81d3aabc22e28017de2a9f2c698d8d1c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 11:40:05 -0700 Subject: [PATCH 01/19] Switch to vbuild --- .github/workflows/build.yml | 29 ++-- .gitignore | 10 ++ README.md | 110 ++++++++------ .../{APKBUILD => VELBUILD} | 4 +- packages/appload/{APKBUILD => VELBUILD} | 8 +- packages/appload/appload.post-deinstall | 3 - packages/bat/{APKBUILD => VELBUILD} | 10 +- packages/bat/bat.post-deinstall | 5 - packages/bettertoc/{APKBUILD => VELBUILD} | 4 +- packages/btop/{APKBUILD => VELBUILD} | 12 +- packages/btop/btop.post-deinstall | 6 - .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../createpages-rm2/{APKBUILD => VELBUILD} | 4 +- packages/curl/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../enable-all-colors/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../enable-shortcuts/{APKBUILD => VELBUILD} | 4 +- packages/entware-rc/{APKBUILD => VELBUILD} | 29 +++- packages/entware-rc/entware-rc.post-install | 8 -- .../entware-rc/entware-rc.post-os-upgrade | 3 - packages/entware-rc/entware-rc.post-upgrade | 2 - packages/entware-rc/entware-rc.pre-deinstall | 6 - packages/entware/{APKBUILD => VELBUILD} | 134 +++++++++++++++++- packages/entware/entware.post-deinstall | 30 ---- packages/entware/entware.post-install | 43 ------ packages/entware/entware.post-os-upgrade | 4 - packages/entware/entware.post-upgrade | 30 ---- packages/entware/entware.pre-deinstall | 26 ---- .../{APKBUILD => VELBUILD} | 4 +- packages/fastfetch/{APKBUILD => VELBUILD} | 14 +- packages/fastfetch/fastfetch.post-deinstall | 6 - .../fav-tag-button/{APKBUILD => VELBUILD} | 4 +- .../favorite-button/{APKBUILD => VELBUILD} | 4 +- .../fewer-light-steps/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../fix-custom-fit/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../floating-toolbar/{APKBUILD => VELBUILD} | 15 +- .../floating-toolbar.post-deinstall | 7 - .../{APKBUILD => VELBUILD} | 4 +- packages/force-sync/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../gesture-reset-view/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../gestures-fouzr/{APKBUILD => VELBUILD} | 14 +- .../gestures-fouzr.post-deinstall | 5 - .../gestures-fouzr.post-install | 3 - .../{APKBUILD => VELBUILD} | 4 +- .../gomarkablestream/{APKBUILD => VELBUILD} | 4 +- .../hide-dev-mode-icon/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../hide-show-toolbar/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- packages/hyfetch/{APKBUILD => VELBUILD} | 27 +++- packages/hyfetch/hyfetch.post-deinstall | 9 -- packages/hyfetch/hyfetch.post-install | 4 - packages/hyfetch/hyfetch.post-upgrade | 4 - packages/jq/{APKBUILD => VELBUILD} | 4 +- packages/koreader/{APKBUILD => VELBUILD} | 27 +++- packages/koreader/koreader.post-deinstall | 12 -- packages/koreader/koreader.post-install | 7 - packages/less/{APKBUILD => VELBUILD} | 4 +- packages/literm/{APKBUILD => VELBUILD} | 12 +- packages/literm/literm.post-deinstall | 5 - packages/micro/{APKBUILD => VELBUILD} | 4 +- .../mini-light-sleep/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- packages/mount-utils/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 29 +++- .../navigate-using-arrow-keys.post-deinstall | 11 -- .../navigate-using-arrow-keys.post-install | 9 -- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../recents-tagged/{APKBUILD => VELBUILD} | 4 +- packages/rm-pokemon/{APKBUILD => VELBUILD} | 4 +- packages/rm-shot/{APKBUILD => VELBUILD} | 4 +- packages/rm-stylus/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../rmfakecloud-proxy/{APKBUILD => VELBUILD} | 45 +++++- .../rmfakecloud-proxy.post-install | 22 --- .../rmfakecloud-proxy.post-os-upgrade | 7 - .../rmfakecloud-proxy.pre-deinstall | 4 - packages/rmhacks-pre1/{APKBUILD => VELBUILD} | 4 +- packages/rmhacks-pre2/{APKBUILD => VELBUILD} | 4 +- packages/rmhacks-pre3/{APKBUILD => VELBUILD} | 4 +- packages/rmhacks/{APKBUILD => VELBUILD} | 4 +- packages/rmstream/{APKBUILD => VELBUILD} | 27 +++- packages/rmstream/rmstream.post-deinstall | 12 -- packages/rmstream/rmstream.post-install | 8 -- packages/rmtree/{APKBUILD => VELBUILD} | 4 +- .../rubber-eraser-rm1/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 31 +++- .../scroll-screen-up-or-down.post-deinstall | 11 -- .../scroll-screen-up-or-down.post-install | 11 -- .../selection-erase/{APKBUILD => VELBUILD} | 4 +- .../selection-stuff/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- packages/sidebar-clock/{APKBUILD => VELBUILD} | 4 +- packages/starship/{APKBUILD => VELBUILD} | 37 ++++- packages/starship/starship.post-deinstall | 8 -- packages/starship/starship.post-install | 15 -- packages/starship/starship.post-upgrade | 4 - .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- packages/tag-button/{APKBUILD => VELBUILD} | 4 +- packages/tailscale/{APKBUILD => VELBUILD} | 81 ++++++++++- packages/tailscale/tailscale.post-install | 17 --- packages/tailscale/tailscale.post-os-upgrade | 13 -- packages/tailscale/tailscale.post-upgrade | 17 --- packages/tailscale/tailscale.pre-deinstall | 20 --- .../{APKBUILD => VELBUILD} | 30 +++- .../tap-to-change-view-or-page.post-deinstall | 11 -- .../tap-to-change-view-or-page.post-install | 9 -- .../{APKBUILD => VELBUILD} | 4 +- packages/tilem/{APKBUILD => VELBUILD} | 27 +++- packages/tilem/tilem.post-deinstall | 12 -- packages/tilem/tilem.post-install | 7 - packages/toolbar-icon/{APKBUILD => VELBUILD} | 4 +- packages/tripletap/{APKBUILD => VELBUILD} | 73 +++++++++- packages/tripletap/tripletap.post-install | 2 - packages/tripletap/tripletap.post-os-upgrade | 4 - packages/tripletap/tripletap.post-upgrade | 2 - packages/tripletap/tripletap.pre-deinstall | 18 --- packages/tripletap/tripletap.pre-upgrade | 31 ---- .../uncompress-dock/{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- .../{APKBUILD => VELBUILD} | 4 +- packages/vellum-hosts/{APKBUILD => VELBUILD} | 31 +++- .../vellum-hosts/vellum-hosts.post-install | 5 - .../vellum-hosts/vellum-hosts.post-os-upgrade | 2 - .../vellum-hosts/vellum-hosts.post-upgrade | 5 - .../vellum-hosts/vellum-hosts.pre-deinstall | 5 - packages/vellum/{APKBUILD => VELBUILD} | 4 +- packages/vnsee-qtfb/{APKBUILD => VELBUILD} | 37 ++++- packages/vnsee-qtfb/vnsee-qtfb.post-deinstall | 9 -- packages/vnsee-qtfb/vnsee-qtfb.post-install | 9 -- packages/vnsee-qtfb/vnsee-qtfb.post-upgrade | 9 -- .../{APKBUILD => VELBUILD} | 15 +- .../qt-resource-rebuilder.post-install | 7 - .../xovi-extensions/{APKBUILD => VELBUILD} | 15 +- .../qt-resource-rebuilder.post-install | 7 - packages/xovi/{APKBUILD => VELBUILD} | 34 ++++- packages/xovi/xovi.pre-deinstall | 26 ---- packages/zig/{APKBUILD => VELBUILD} | 4 +- scripts/build-package.sh | 87 +++--------- scripts/lint-packages.sh | 48 +++++-- scripts/update-checksums.sh | 24 +--- ...idate-apkbuild.sh => validate-velbuild.sh} | 32 ++--- 167 files changed, 1066 insertions(+), 997 deletions(-) rename packages/add-finished-button/{APKBUILD => VELBUILD} (96%) rename packages/appload/{APKBUILD => VELBUILD} (93%) delete mode 100644 packages/appload/appload.post-deinstall rename packages/bat/{APKBUILD => VELBUILD} (91%) delete mode 100644 packages/bat/bat.post-deinstall rename packages/bettertoc/{APKBUILD => VELBUILD} (96%) rename packages/btop/{APKBUILD => VELBUILD} (89%) delete mode 100644 packages/btop/btop.post-deinstall rename packages/button-press-for-pen-change/{APKBUILD => VELBUILD} (96%) rename packages/change-vertical-jump/{APKBUILD => VELBUILD} (96%) rename packages/convert-to-text-remover/{APKBUILD => VELBUILD} (96%) rename packages/createpages-paperpro/{APKBUILD => VELBUILD} (96%) rename packages/createpages-rm2/{APKBUILD => VELBUILD} (96%) rename packages/curl/{APKBUILD => VELBUILD} (96%) rename packages/delay-stroke-screen-refresh/{APKBUILD => VELBUILD} (96%) rename packages/disable-selection-autoscroll/{APKBUILD => VELBUILD} (96%) rename packages/enable-all-colors/{APKBUILD => VELBUILD} (96%) rename packages/enable-extra-pen-on-move/{APKBUILD => VELBUILD} (96%) rename packages/enable-shortcuts-scroll-page/{APKBUILD => VELBUILD} (96%) rename packages/enable-shortcuts/{APKBUILD => VELBUILD} (96%) rename packages/entware-rc/{APKBUILD => VELBUILD} (66%) delete mode 100644 packages/entware-rc/entware-rc.post-install delete mode 100644 packages/entware-rc/entware-rc.post-os-upgrade delete mode 100644 packages/entware-rc/entware-rc.post-upgrade delete mode 100644 packages/entware-rc/entware-rc.pre-deinstall rename packages/entware/{APKBUILD => VELBUILD} (62%) delete mode 100644 packages/entware/entware.post-deinstall delete mode 100644 packages/entware/entware.post-install delete mode 100644 packages/entware/entware.post-os-upgrade delete mode 100644 packages/entware/entware.post-upgrade delete mode 100644 packages/entware/entware.pre-deinstall rename packages/extend-list-title-width/{APKBUILD => VELBUILD} (96%) rename packages/fastfetch/{APKBUILD => VELBUILD} (89%) delete mode 100644 packages/fastfetch/fastfetch.post-deinstall rename packages/fav-tag-button/{APKBUILD => VELBUILD} (96%) rename packages/favorite-button/{APKBUILD => VELBUILD} (96%) rename packages/fewer-light-steps/{APKBUILD => VELBUILD} (96%) rename packages/fix-appload-rotation/{APKBUILD => VELBUILD} (96%) rename packages/fix-battery-indicator/{APKBUILD => VELBUILD} (96%) rename packages/fix-custom-fit/{APKBUILD => VELBUILD} (96%) rename packages/fix-light-indicator-gap/{APKBUILD => VELBUILD} (96%) rename packages/fix-page-number-on-slider/{APKBUILD => VELBUILD} (96%) rename packages/fix-quick-settings-temp-separator/{APKBUILD => VELBUILD} (96%) rename packages/fix-sidebar-filters/{APKBUILD => VELBUILD} (95%) rename packages/floating-toolbar/{APKBUILD => VELBUILD} (85%) delete mode 100644 packages/floating-toolbar/floating-toolbar.post-deinstall rename packages/force-koreader-landscape/{APKBUILD => VELBUILD} (96%) rename packages/force-sync/{APKBUILD => VELBUILD} (96%) rename packages/four-finger-change-filter/{APKBUILD => VELBUILD} (96%) rename packages/gesture-colour-settings/{APKBUILD => VELBUILD} (96%) rename packages/gesture-contrast-toggle/{APKBUILD => VELBUILD} (96%) rename packages/gesture-reset-view/{APKBUILD => VELBUILD} (96%) rename packages/gesture-tap-to-page/{APKBUILD => VELBUILD} (96%) rename packages/gesture-toolbar-hide/{APKBUILD => VELBUILD} (96%) rename packages/gesture-toolbar-show/{APKBUILD => VELBUILD} (96%) rename packages/gestures-fouzr/{APKBUILD => VELBUILD} (84%) delete mode 100644 packages/gestures-fouzr/gestures-fouzr.post-deinstall delete mode 100644 packages/gestures-fouzr/gestures-fouzr.post-install rename packages/gestures-ingatellent/{APKBUILD => VELBUILD} (96%) rename packages/gomarkablestream/{APKBUILD => VELBUILD} (96%) rename packages/hide-dev-mode-icon/{APKBUILD => VELBUILD} (96%) rename packages/hide-document-close/{APKBUILD => VELBUILD} (96%) rename packages/hide-page-labels-fullscreen/{APKBUILD => VELBUILD} (96%) rename packages/hide-show-toolbar/{APKBUILD => VELBUILD} (96%) rename packages/hide-zoom-indicator/{APKBUILD => VELBUILD} (96%) rename packages/hyfetch/{APKBUILD => VELBUILD} (67%) delete mode 100644 packages/hyfetch/hyfetch.post-deinstall delete mode 100644 packages/hyfetch/hyfetch.post-install delete mode 100644 packages/hyfetch/hyfetch.post-upgrade rename packages/jq/{APKBUILD => VELBUILD} (96%) rename packages/koreader/{APKBUILD => VELBUILD} (73%) delete mode 100644 packages/koreader/koreader.post-deinstall delete mode 100644 packages/koreader/koreader.post-install rename packages/less/{APKBUILD => VELBUILD} (96%) rename packages/literm/{APKBUILD => VELBUILD} (91%) delete mode 100644 packages/literm/literm.post-deinstall rename packages/micro/{APKBUILD => VELBUILD} (97%) rename packages/mini-light-sleep/{APKBUILD => VELBUILD} (96%) rename packages/more-light-settings/{APKBUILD => VELBUILD} (96%) rename packages/mount-utils/{APKBUILD => VELBUILD} (95%) rename packages/navigate-using-arrow-keys/{APKBUILD => VELBUILD} (70%) delete mode 100644 packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-deinstall delete mode 100644 packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-install rename packages/prevent-notebook-zoomout/{APKBUILD => VELBUILD} (96%) rename packages/quicksettings-clock-serif/{APKBUILD => VELBUILD} (96%) rename packages/quicksettings-screenshot/{APKBUILD => VELBUILD} (96%) rename packages/random-sleep-screen/{APKBUILD => VELBUILD} (96%) rename packages/recents-tagged/{APKBUILD => VELBUILD} (96%) rename packages/rm-pokemon/{APKBUILD => VELBUILD} (96%) rename packages/rm-shot/{APKBUILD => VELBUILD} (96%) rename packages/rm-stylus/{APKBUILD => VELBUILD} (96%) rename packages/rm-version-switcher/{APKBUILD => VELBUILD} (97%) rename packages/rmfakecloud-proxy/{APKBUILD => VELBUILD} (55%) delete mode 100644 packages/rmfakecloud-proxy/rmfakecloud-proxy.post-install delete mode 100644 packages/rmfakecloud-proxy/rmfakecloud-proxy.post-os-upgrade delete mode 100644 packages/rmfakecloud-proxy/rmfakecloud-proxy.pre-deinstall rename packages/rmhacks-pre1/{APKBUILD => VELBUILD} (96%) rename packages/rmhacks-pre2/{APKBUILD => VELBUILD} (96%) rename packages/rmhacks-pre3/{APKBUILD => VELBUILD} (96%) rename packages/rmhacks/{APKBUILD => VELBUILD} (96%) rename packages/rmstream/{APKBUILD => VELBUILD} (73%) delete mode 100644 packages/rmstream/rmstream.post-deinstall delete mode 100644 packages/rmstream/rmstream.post-install rename packages/rmtree/{APKBUILD => VELBUILD} (96%) rename packages/rubber-eraser-rm1/{APKBUILD => VELBUILD} (96%) rename packages/scroll-screen-up-or-down/{APKBUILD => VELBUILD} (68%) delete mode 100644 packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-deinstall delete mode 100644 packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-install rename packages/selection-erase/{APKBUILD => VELBUILD} (96%) rename packages/selection-stuff/{APKBUILD => VELBUILD} (96%) rename packages/settings-rmsync-restart/{APKBUILD => VELBUILD} (96%) rename packages/shortcuts-to-choose-eraser/{APKBUILD => VELBUILD} (96%) rename packages/sidebar-clock/{APKBUILD => VELBUILD} (96%) rename packages/starship/{APKBUILD => VELBUILD} (62%) delete mode 100644 packages/starship/starship.post-deinstall delete mode 100644 packages/starship/starship.post-install delete mode 100644 packages/starship/starship.post-upgrade rename packages/stylus-button-eraser/{APKBUILD => VELBUILD} (96%) rename packages/stylus-button-undo-redo/{APKBUILD => VELBUILD} (96%) rename packages/swipe-to-hide-or-show-toolbar/{APKBUILD => VELBUILD} (96%) rename packages/tag-button/{APKBUILD => VELBUILD} (96%) rename packages/tailscale/{APKBUILD => VELBUILD} (58%) delete mode 100644 packages/tailscale/tailscale.post-install delete mode 100644 packages/tailscale/tailscale.post-os-upgrade delete mode 100644 packages/tailscale/tailscale.post-upgrade delete mode 100644 packages/tailscale/tailscale.pre-deinstall rename packages/tap-to-change-view-or-page/{APKBUILD => VELBUILD} (71%) delete mode 100644 packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-deinstall delete mode 100644 packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-install rename packages/three-finger-swipe-to-reset-view/{APKBUILD => VELBUILD} (96%) rename packages/tilem/{APKBUILD => VELBUILD} (71%) delete mode 100644 packages/tilem/tilem.post-deinstall delete mode 100644 packages/tilem/tilem.post-install rename packages/toolbar-icon/{APKBUILD => VELBUILD} (96%) rename packages/tripletap/{APKBUILD => VELBUILD} (50%) delete mode 100644 packages/tripletap/tripletap.post-install delete mode 100644 packages/tripletap/tripletap.post-os-upgrade delete mode 100644 packages/tripletap/tripletap.post-upgrade delete mode 100644 packages/tripletap/tripletap.pre-deinstall delete mode 100644 packages/tripletap/tripletap.pre-upgrade rename packages/uncompress-dock/{APKBUILD => VELBUILD} (96%) rename packages/unlock-methods-content/{APKBUILD => VELBUILD} (96%) rename packages/vellum-bash-completion/{APKBUILD => VELBUILD} (97%) rename packages/vellum-hosts/{APKBUILD => VELBUILD} (63%) delete mode 100644 packages/vellum-hosts/vellum-hosts.post-install delete mode 100644 packages/vellum-hosts/vellum-hosts.post-os-upgrade delete mode 100644 packages/vellum-hosts/vellum-hosts.post-upgrade delete mode 100644 packages/vellum-hosts/vellum-hosts.pre-deinstall rename packages/vellum/{APKBUILD => VELBUILD} (97%) rename packages/vnsee-qtfb/{APKBUILD => VELBUILD} (60%) delete mode 100644 packages/vnsee-qtfb/vnsee-qtfb.post-deinstall delete mode 100644 packages/vnsee-qtfb/vnsee-qtfb.post-install delete mode 100644 packages/vnsee-qtfb/vnsee-qtfb.post-upgrade rename packages/xovi-extensions-v16/{APKBUILD => VELBUILD} (93%) delete mode 100644 packages/xovi-extensions-v16/qt-resource-rebuilder.post-install rename packages/xovi-extensions/{APKBUILD => VELBUILD} (93%) delete mode 100644 packages/xovi-extensions/qt-resource-rebuilder.post-install rename packages/xovi/{APKBUILD => VELBUILD} (73%) delete mode 100644 packages/xovi/xovi.pre-deinstall rename packages/zig/{APKBUILD => VELBUILD} (97%) rename scripts/{validate-apkbuild.sh => validate-velbuild.sh} (60%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df7f909..ce8fa55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,14 +79,14 @@ jobs: CHANGED="${{ steps.changed.outputs.packages }}" # Get all noarch packages - all_noarch=$(for pkg in packages/*/APKBUILD; do + all_noarch=$(for pkg in packages/*/VELBUILD; do if grep -q '^arch="noarch"' "$pkg"; then basename $(dirname "$pkg") fi done) # Get all multiarch packages - all_multiarch=$(for pkg in packages/*/APKBUILD; do + all_multiarch=$(for pkg in packages/*/VELBUILD; do if grep -qE '^arch="(aarch64|armv7|aarch64 armv7)"' "$pkg"; then basename $(dirname "$pkg") fi @@ -135,7 +135,17 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Lint APKBUILD files + - &install-vbuild + name: Install vbuild + run: | + set -e + curl \ + --location \ + 'https://github.com/Eeems/vbuild/releases/0.0.7/download/vbuild-vbuild-ubuntu' \ + --output /usr/local/bin/vbuild + chmod +x /usr/local/bin/vbuild + + - name: Lint VELBUILD files run: | PACKAGES="${{ needs.setup.outputs.packages }}" if [ "$PACKAGES" == "all" ] || [ -z "$PACKAGES" ]; then @@ -158,6 +168,8 @@ jobs: steps: - uses: actions/checkout@v4 + - *install-vbuild + - name: Set up signing key run: | if [ -n "${{ secrets.SIGNING_KEY }}" ]; then @@ -168,10 +180,10 @@ jobs: - name: Build ${{ matrix.package }} run: ./scripts/build-package.sh "${{ matrix.package }}" - - name: Get package name from APKBUILD + - name: Get package name from VELBUILD id: pkgname run: | - pkgname=$(grep '^pkgname=' packages/${{ matrix.package }}/APKBUILD | cut -d= -f2) + pkgname=$(grep '^pkgname=' packages/${{ matrix.package }}/VELBUILD | cut -d= -f2) echo "name=$pkgname" >> $GITHUB_OUTPUT - name: Upload artifact @@ -214,6 +226,8 @@ jobs: steps: - uses: actions/checkout@v4 + - *install-vbuild + - name: Set up signing key run: | if [ -n "${{ secrets.SIGNING_KEY }}" ]; then @@ -224,10 +238,10 @@ jobs: - name: Build ${{ matrix.package }} for ${{ matrix.arch }} run: ./scripts/build-package.sh "${{ matrix.package }}" "${{ matrix.arch }}" - - name: Get package name from APKBUILD + - name: Get package name from VELBUILD id: pkgname run: | - pkgname=$(grep '^pkgname=' packages/${{ matrix.package }}/APKBUILD | cut -d= -f2) + pkgname=$(grep '^pkgname=' packages/${{ matrix.package }}/VELBUILD | cut -d= -f2) echo "name=$pkgname" >> $GITHUB_OUTPUT - name: Upload artifact @@ -379,4 +393,3 @@ jobs: git push origin main echo "Changes committed and pushed to vellum-index" fi - diff --git a/.gitignore b/.gitignore index e4f19b8..3882c00 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,13 @@ keys/ # abuild output packages/*/src/ +# we now use VELBUILD +packages/*/APKBUILD +packages/*/*.pre-install +packages/*/*.post-install +packages/*/*.pre-upgrade +packages/*/*.post-upgrade +packages/*/*.pre-os-upgrade +packages/*/*.post-os-upgrade +packages/*/*.pre-deinstall +packages/*/*.post-deinstall diff --git a/README.md b/README.md index a43c29f..64e9c94 100644 --- a/README.md +++ b/README.md @@ -55,27 +55,28 @@ These packages are auto-installed on every `vellum` command and allows extension ### Adding a new package 1. Create a directory under `packages/` with the package name -2. Add an `APKBUILD` file following Alpine's format. See [APKBUILD Reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference), [APKBUILD(5)](https://man.archlinux.org/man/APKBUILD.5.en), and [aports coding style](https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/CODINGSTYLE.md) +2. Add an `VELBUILD` file following Alpine's format. See [VELBUILD Reference](https://github.com/Eeems/vbuild?tab=readme-ov-file#velbuild-reference), and [aports coding style](https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/CODINGSTYLE.md) 3. Test it 4. Submit a PR -### APKBUILD template for QMD extensions +### VELBUILD template for QMD extensions ```sh maintainer="Your Name " pkgname=myextension pkgver=1.0.0 pkgrel=0 -_upstream_author="your-github-username" -_category="ui" +upstream_author="your-github-username" +category="ui" pkgdesc="Description of your extension" url="https://github.com/you/repo" arch="noarch" license="SPDX License Identifier for your license" depends="qt-resource-rebuilder remarkable-os>=3.24 remarkable-os<3.25" +_commit="1161639c9435372db1fb05024137407d20f6bb5e" source=" -https://raw.githubusercontent.com/you/repo/main/myextension.qmd -https://raw.githubusercontent.com/you/repo/main/LICENSE +https://raw.githubusercontent.com/you/repo/$_commit/myextension.qmd +https://raw.githubusercontent.com/you/repo/$_commit/LICENSE " options="!check !fhs" @@ -110,7 +111,7 @@ Use semantic versioning (`MAJOR.MINOR.PATCH`) for `pkgver`: - **MINOR**: new features, backward compatible - **PATCH**: bug fixes (including updating a QMD for compatibility with a new reMarkable software release) -Use `pkgrel` for packaging changes that don't affect the upstream version (e.g., fixing the APKBUILD, changing dependencies). Reset `pkgrel` to `0` when bumping `pkgver`. +Use `pkgrel` for packaging changes that don't affect the upstream version (e.g., fixing the VELBUILD, changing dependencies). Reset `pkgrel` to `0` when bumping `pkgver`. ```sh pkgver=1.2.0 @@ -147,18 +148,33 @@ mypackage-1.0.0 depends="!rm1 !rm2" # Compatible with Paper Pro and Move on ### Package Scripts -Packages can include lifecycle scripts. Add them to your package directory and reference in APKBUILD: +Packages can include lifecycle scripts. These are added as functions in the VELBUILD: ```sh -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" +postinstall(){ + # Make changes +} + +postupgrade(){ + # Call postinstall + /home/root/.vellum/share/my-package/my-package.post-install +} + +predeinstall(){ + # Undo changes from postinstall +} + ``` | Script | When it runs | |-------------------|----------------------------------------------------| -| `post-install` | After fresh install | -| `post-upgrade` | After upgrading to a new version | -| `pre-deinstall` | Before package removal | -| `post-os-upgrade` | After reMarkable OS update (via `vellum reenable`) | +| `preinstall` | Before fresh install | +| `postinstall` | After fresh install | +| `preupgrade` | Before upgrading to a new version | +| `postupgrade` | After upgrading to a new version | +| `predeinstall` | Before package removal | +| `postdeinstall` | After package removal | +| `postosupgrade` | After reMarkable OS update (via `vellum reenable`) | The `post-os-upgrade` hook runs when users execute `vellum reenable` after an OS update. Use this for packages that need to restore system files wiped by OS updates. Unlike standard apk hooks, `post-os-upgrade` is a Vellum-specific hook and must be manually installed in your `package()` function: @@ -188,31 +204,32 @@ It automatically detects if mount changes are required by the device. Example for a package with a systemd service: ```sh -# mypackage.post-install -#!/bin/sh -/home/root/.vellum/bin/mount-rw -cp /home/root/.vellum/share/mypackage/mypackage.service /etc/systemd/system/ -systemctl daemon-reload -systemctl enable --now mypackage -/home/root/.vellum/bin/mount-restore - -# mypackage.post-upgrade -#!/bin/sh -/home/root/.vellum/share/mypackage/mypackage.post-install - -# mypackage.post-os-upgrade (mount-rw/mount-restore handled by vellum reenable) -#!/bin/sh -cp /home/root/.vellum/share/mypackage/mypackage.service /etc/systemd/system/ -systemctl daemon-reload -systemctl enable --now mypackage - -# mypackage.pre-deinstall -#!/bin/sh -/home/root/.vellum/bin/mount-rw -systemctl disable --now mypackage 2>/dev/null || true -rm -f /etc/systemd/system/mypackage.service -systemctl daemon-reload -/home/root/.vellum/bin/mount-restore +postinstall(){ + /home/root/.vellum/bin/mount-rw + cp /home/root/.vellum/share/mypackage/mypackage.service /etc/systemd/system/ + systemctl daemon-reload + systemctl enable --now mypackage + /home/root/.vellum/bin/mount-restore +} + +postupgrade(){ + /home/root/.vellum/share/mypackage/mypackage.post-install +} + +postosupgrade(){ + # mount-rw/mount-restore handled by vellum reenable + cp /home/root/.vellum/share/mypackage/mypackage.service /etc/systemd/system/ + systemctl daemon-reload + systemctl enable --now mypackage +} + +predeinstall(){ + /home/root/.vellum/bin/mount-rw + systemctl disable --now mypackage 2>/dev/null || true + rm -f /etc/systemd/system/mypackage.service + systemctl daemon-reload + /home/root/.vellum/bin/mount-restore +} ``` ### Handling Purge @@ -220,14 +237,13 @@ systemctl daemon-reload When users run `vellum purge` (vs `vellum del`), they expect all data to be removed. Vellum sets `VELLUM_PURGE=1` in the environment so your scripts can detect this: ```sh -# mypackage.pre-deinstall -#!/bin/sh - -# Only remove user data on purge -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/.config/mypackage - rm -rf /home/root/.local/share/mypackage -fi +predeinstall(){ + # Only remove user data on purge + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf /home/root/.config/mypackage + rm -rf /home/root/.local/share/mypackage + fi +} ``` | Command | Behavior | @@ -266,7 +282,7 @@ When you modify source URLs or update package versions: # Build a single package ./scripts/build-package.sh mypackage aarch64 -# Build a noarch package (auto-detected from APKBUILD) +# Build a noarch package (auto-detected from VELBUILD) ./scripts/build-package.sh mypackage ``` Built packages are output to `dist//`. diff --git a/packages/add-finished-button/APKBUILD b/packages/add-finished-button/VELBUILD similarity index 96% rename from packages/add-finished-button/APKBUILD rename to packages/add-finished-button/VELBUILD index be09e62..6cc9fd2 100644 --- a/packages/add-finished-button/APKBUILD +++ b/packages/add-finished-button/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=add-finished-button pkgver=1.0.1 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Adds a Finished button when selecting documents, moving them to the first subfolder in the current folder" url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/appload/APKBUILD b/packages/appload/VELBUILD similarity index 93% rename from packages/appload/APKBUILD rename to packages/appload/VELBUILD index ae7a9a1..c88ab4c 100644 --- a/packages/appload/APKBUILD +++ b/packages/appload/VELBUILD @@ -2,15 +2,14 @@ maintainer="Mitchell Scott " pkgname=appload pkgver=0.4.1 pkgrel=2 -_upstream_author="asivery" -_category="framework" +upstream_author="asivery" +category="framework" pkgdesc="Xovi extension for windowed and fullscreen apps on reMarkable tablets" url="https://github.com/asivery/rm-appload" arch="aarch64 armv7" license="GPL-3.0" depends="qt-resource-rebuilder remarkable-os>=3.22" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-deinstall" source=" https://github.com/asivery/rm-appload/releases/download/v$pkgver/appload-aarch64.zip @@ -40,6 +39,9 @@ package() { echo "https://github.com/asivery/rm-appload/archive/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } +postdeinstall(){ + rmdir /home/root/shims 2>/dev/null || true +} sha512sums=" aaa6a8a81eb68caab0f386e4c4b6c9db3840505d31c514989450a12e043593d43f5a06804a478b516175651f9ffb8a0e04132ea12c0f04e0a430c74dc987848c appload-aarch64.zip fb30d4800d79a1bb6e820c9677c131e951dbf581074c97ad151ed27c001ff1e121c91a258f667e9500d8e75b33b12a17ede9ced7f634408465345d4207b4ebb1 appload-arm32.zip diff --git a/packages/appload/appload.post-deinstall b/packages/appload/appload.post-deinstall deleted file mode 100644 index 13a95b4..0000000 --- a/packages/appload/appload.post-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -rmdir /home/root/shims 2>/dev/null || true diff --git a/packages/bat/APKBUILD b/packages/bat/VELBUILD similarity index 91% rename from packages/bat/APKBUILD rename to packages/bat/VELBUILD index 253f9c4..523678a 100644 --- a/packages/bat/APKBUILD +++ b/packages/bat/VELBUILD @@ -2,14 +2,13 @@ maintainer="notfrants " pkgname=bat pkgver=0.26.1 pkgrel=0 -_upstream_author="sharkdp" -_category="utilities" +upstream_author="sharkdp" +category="utilities" pkgdesc="A cat(1) clone with wings." url="https://github.com/sharkdp/bat" arch="aarch64 armv7" license="Apache-2.0 OR MIT" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-deinstall" depends="less" source=" @@ -33,6 +32,11 @@ package() { echo "https://github.com/sharkdp/bat/archive/refs/tags/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -fr /home/root/.config/bat + fi +} sha512sums=" fbc805f5f40146af84540d3db481b36c8ff556f423c332e998ddad743cb9fa77b21a623389b11f37eb88e034cca668ded5a790400e5860812ecfed568552bdd5 bat-v0.26.1-aarch64-unknown-linux-gnu.tar.gz 112a84e2488f1d9770be1e4f32dc585771c71ea5139dc7f4fb261ff978b534e7f211e1d395d6d9d099fcffce3290442931587caacdc5f35bb7f8f8de60a04679 bat-v0.26.1-arm-unknown-linux-gnueabihf.tar.gz diff --git a/packages/bat/bat.post-deinstall b/packages/bat/bat.post-deinstall deleted file mode 100644 index 6bf49c6..0000000 --- a/packages/bat/bat.post-deinstall +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -fr /home/root/.config/bat -fi diff --git a/packages/bettertoc/APKBUILD b/packages/bettertoc/VELBUILD similarity index 96% rename from packages/bettertoc/APKBUILD rename to packages/bettertoc/VELBUILD index 2459d91..909b894 100644 --- a/packages/bettertoc/APKBUILD +++ b/packages/bettertoc/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=bettertoc pkgver=1.2.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Adds the ability to add, delete, and edit Table of Contents entries in notebooks, PDFs, and EPUBs." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/btop/APKBUILD b/packages/btop/VELBUILD similarity index 89% rename from packages/btop/APKBUILD rename to packages/btop/VELBUILD index 3129dfc..dc16d5b 100644 --- a/packages/btop/APKBUILD +++ b/packages/btop/VELBUILD @@ -2,14 +2,13 @@ maintainer="notfrants " pkgname=btop pkgver=1.4.6 pkgrel=2 -_upstream_author="aristocratos" -_category="utilities" +upstream_author="aristocratos" +category="utilities" pkgdesc="A monitor of resources" url="https://github.com/aristocratos/btop" arch="aarch64 armv7" license="Apache-2.0" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-deinstall" source=" https://github.com/aristocratos/btop/releases/download/v$pkgver/btop-aarch64-unknown-linux-musl.tbz @@ -36,6 +35,13 @@ package() { echo "https://github.com/aristocratos/btop/archive/refs/tags/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf \ + /home/root/.config/btop \ + /home/root/.local/state/btop.log + fi +} sha512sums=" ced22a6f147e99f3002f7916249b52999cae77d73795241a6fe0285c43c3bbe639731feeff581e128c8d337dea70493b023d321bfec14dd3d617696bb23703e1 btop-aarch64-unknown-linux-musl.tbz a717df7fa03c177350639fe91bcdeb701952ffa7574a058b86c23cb920aeb5a874a0aa5cf73e29d64180c42311167dc4bc7f37bb5dde535b8742e299407cbd38 btop-armv7-unknown-linux-musleabi.tbz diff --git a/packages/btop/btop.post-deinstall b/packages/btop/btop.post-deinstall deleted file mode 100644 index aaf13be..0000000 --- a/packages/btop/btop.post-deinstall +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/.config/btop - rm -f /home/root/.local/state/btop.log -fi diff --git a/packages/button-press-for-pen-change/APKBUILD b/packages/button-press-for-pen-change/VELBUILD similarity index 96% rename from packages/button-press-for-pen-change/APKBUILD rename to packages/button-press-for-pen-change/VELBUILD index 9da4321..5559533 100644 --- a/packages/button-press-for-pen-change/APKBUILD +++ b/packages/button-press-for-pen-change/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=button-press-for-pen-change pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Hold stylus button to select-erase, click once to change to selection, click twice to change pen." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/change-vertical-jump/APKBUILD b/packages/change-vertical-jump/VELBUILD similarity index 96% rename from packages/change-vertical-jump/APKBUILD rename to packages/change-vertical-jump/VELBUILD index 69a464c..af2e462 100644 --- a/packages/change-vertical-jump/APKBUILD +++ b/packages/change-vertical-jump/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=change-vertical-jump pkgver=1.0.0 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Increases scroll distance when scrolling down a page." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/convert-to-text-remover/APKBUILD b/packages/convert-to-text-remover/VELBUILD similarity index 96% rename from packages/convert-to-text-remover/APKBUILD rename to packages/convert-to-text-remover/VELBUILD index d23d92a..466c54b 100644 --- a/packages/convert-to-text-remover/APKBUILD +++ b/packages/convert-to-text-remover/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=convert-to-text-remover pkgver=1.0.0 pkgrel=0 -_upstream_author="NohamR" -_category="ui" +upstream_author="NohamR" +category="ui" pkgdesc="Removes the Convert to text option from selection menus and the toolbar." url="https://github.com/NohamR/xovi-qmd-extensions" arch="noarch" diff --git a/packages/createpages-paperpro/APKBUILD b/packages/createpages-paperpro/VELBUILD similarity index 96% rename from packages/createpages-paperpro/APKBUILD rename to packages/createpages-paperpro/VELBUILD index 53ad6d8..d7fb800 100644 --- a/packages/createpages-paperpro/APKBUILD +++ b/packages/createpages-paperpro/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=createpages-paperpro pkgver=1.0.3 pkgrel=0 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Overrides new page creation to use Paper Pro dimensions." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/createpages-rm2/APKBUILD b/packages/createpages-rm2/VELBUILD similarity index 96% rename from packages/createpages-rm2/APKBUILD rename to packages/createpages-rm2/VELBUILD index 6f467a0..2f50f67 100644 --- a/packages/createpages-rm2/APKBUILD +++ b/packages/createpages-rm2/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=createpages-rm2 pkgver=1.0.3 pkgrel=0 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Overrides new page creation to use reMarkable 2 dimensions." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/curl/APKBUILD b/packages/curl/VELBUILD similarity index 96% rename from packages/curl/APKBUILD rename to packages/curl/VELBUILD index a1b4408..44d69b0 100644 --- a/packages/curl/APKBUILD +++ b/packages/curl/VELBUILD @@ -2,8 +2,8 @@ maintainer="notfrants " pkgname=curl pkgver=8.11.0 pkgrel=1 -_upstream_author="curl" -_category="utilities" +upstream_author="curl" +category="utilities" pkgdesc="URL retrival utility and library" url="https://curl.se/" arch="aarch64 armv7" diff --git a/packages/delay-stroke-screen-refresh/APKBUILD b/packages/delay-stroke-screen-refresh/VELBUILD similarity index 96% rename from packages/delay-stroke-screen-refresh/APKBUILD rename to packages/delay-stroke-screen-refresh/VELBUILD index 2538559..abccb1a 100644 --- a/packages/delay-stroke-screen-refresh/APKBUILD +++ b/packages/delay-stroke-screen-refresh/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=delay-stroke-screen-refresh pkgver=1.0.0 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Delays color stroke refresh by 10 seconds of inactivity." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/disable-selection-autoscroll/APKBUILD b/packages/disable-selection-autoscroll/VELBUILD similarity index 96% rename from packages/disable-selection-autoscroll/APKBUILD rename to packages/disable-selection-autoscroll/VELBUILD index ac04e7b..259b1b1 100644 --- a/packages/disable-selection-autoscroll/APKBUILD +++ b/packages/disable-selection-autoscroll/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=disable-selection-autoscroll pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Disables the auto scrolling when moving a selection added in 3.24." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/enable-all-colors/APKBUILD b/packages/enable-all-colors/VELBUILD similarity index 96% rename from packages/enable-all-colors/APKBUILD rename to packages/enable-all-colors/VELBUILD index 1109d06..162f2a9 100644 --- a/packages/enable-all-colors/APKBUILD +++ b/packages/enable-all-colors/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=enable-all-colors pkgver=1.0.2 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Enables full color selection on rM1 and rM2." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/enable-extra-pen-on-move/APKBUILD b/packages/enable-extra-pen-on-move/VELBUILD similarity index 96% rename from packages/enable-extra-pen-on-move/APKBUILD rename to packages/enable-extra-pen-on-move/VELBUILD index f284d37..c8b5a89 100644 --- a/packages/enable-extra-pen-on-move/APKBUILD +++ b/packages/enable-extra-pen-on-move/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=enable-extra-pen-on-move pkgver=1.0.0 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Adds extra pen slot to toolbar (RMPPM only, requires qt-resource-rebuilder v16+)." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/enable-shortcuts-scroll-page/APKBUILD b/packages/enable-shortcuts-scroll-page/VELBUILD similarity index 96% rename from packages/enable-shortcuts-scroll-page/APKBUILD rename to packages/enable-shortcuts-scroll-page/VELBUILD index a7a1051..51983f1 100644 --- a/packages/enable-shortcuts-scroll-page/APKBUILD +++ b/packages/enable-shortcuts-scroll-page/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=enable-shortcuts-scroll-page pkgver=1.0.2 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Advanced shortcuts with scroll or page change (requires gestureTapToPage)." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/enable-shortcuts/APKBUILD b/packages/enable-shortcuts/VELBUILD similarity index 96% rename from packages/enable-shortcuts/APKBUILD rename to packages/enable-shortcuts/VELBUILD index 5d03df2..508a172 100644 --- a/packages/enable-shortcuts/APKBUILD +++ b/packages/enable-shortcuts/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=enable-shortcuts pkgver=1.0.1 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Enables keyboard shortcuts for arrow key page and scroll navigation." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/entware-rc/APKBUILD b/packages/entware-rc/VELBUILD similarity index 66% rename from packages/entware-rc/APKBUILD rename to packages/entware-rc/VELBUILD index 56fe69a..f20df84 100644 --- a/packages/entware-rc/APKBUILD +++ b/packages/entware-rc/VELBUILD @@ -3,14 +3,13 @@ pkgname=entware-rc pkgver=0.1 pkgrel=0 pkgdesc="Manage entware installed services" -_upstream_author="toltec-dev" -_category="utilities" +upstream_author="toltec-dev" +category="utilities" url="https://toltec-dev.org/" arch="noarch" license="MIT" depends="entware" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" _commit="c4ffc32a58765b27f49952640b616c2f48adb83b" source=" entware-rc@.service::https://raw.githubusercontent.com/toltec-dev/toltec/$_commit/package/entware-rc/entware-rc%40.service @@ -32,6 +31,30 @@ package() { install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ "$pkgdir/home/root/.vellum/hooks/post-os-upgrade/$pkgname" } +postinstall(){ + /home/root/.vellum/bin/mount-rw + cp /home/root/.vellum/share/entware-rc/entware-rc@.service /etc/systemd/system/ + systemctl daemon-reload + /home/root/.vellum/bin/mount-restore + /opt/bin/opkg install findutils + echo "" + echo "You can use rcctl to manage services installed by entware" +} +postupgrade(){ + /home/root/.vellum/share/entware-rc/entware-rc.post-install +} +postosupgrade(){ + cp /home/root/.vellum/share/entware-rc/entware-rc.service /etc/systemd/system/ + systemctl daemon-reload +} +predeinstall(){ + /home/root/.vellum/bin/mount-rw + /home/root/.vellum/bin/rcctl list | xargs -I {} systemctl disable --now entware-rc@{} + rm -f /etc/systemd/system/entware-rc@.service + systemctl daemon-reload + /home/root/.vellum/bin/mount-restore +} + sha512sums=" cbe0f92c4dc2119859fab575e6d224efb1f3c6c775609ad933766346036f500f3c9d44d4787c010d6e21ed835a349c7c8da9964c073374598bbd1ece7f6a053f entware-rc@.service 35c8405468eac12959fe53d48a21f287029b2cd1a65ae5ef915e435e24fba77cdb77608ddcbb18e59125330c27aa03de86a582d2c42ac2c34772131affc3c4ea rcctl diff --git a/packages/entware-rc/entware-rc.post-install b/packages/entware-rc/entware-rc.post-install deleted file mode 100644 index 81a9567..0000000 --- a/packages/entware-rc/entware-rc.post-install +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -/home/root/.vellum/bin/mount-rw -cp /home/root/.vellum/share/entware-rc/entware-rc@.service /etc/systemd/system/ -systemctl daemon-reload -/home/root/.vellum/bin/mount-restore -/opt/bin/opkg install findutils -echo "" -echo "You can use rcctl to manage services installed by entware" diff --git a/packages/entware-rc/entware-rc.post-os-upgrade b/packages/entware-rc/entware-rc.post-os-upgrade deleted file mode 100644 index f5c71b8..0000000 --- a/packages/entware-rc/entware-rc.post-os-upgrade +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cp /home/root/.vellum/share/entware-rc/entware-rc.service /etc/systemd/system/ -systemctl daemon-reload diff --git a/packages/entware-rc/entware-rc.post-upgrade b/packages/entware-rc/entware-rc.post-upgrade deleted file mode 100644 index 31f11f4..0000000 --- a/packages/entware-rc/entware-rc.post-upgrade +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/home/root/.vellum/share/entware-rc/entware-rc.post-install diff --git a/packages/entware-rc/entware-rc.pre-deinstall b/packages/entware-rc/entware-rc.pre-deinstall deleted file mode 100644 index 580798b..0000000 --- a/packages/entware-rc/entware-rc.pre-deinstall +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -/home/root/.vellum/bin/mount-rw -/home/root/.vellum/bin/rcctl list | xargs -I {} systemctl disable --now entware-rc@{} -rm -f /etc/systemd/system/entware-rc@.service -systemctl daemon-reload -/home/root/.vellum/bin/mount-restore diff --git a/packages/entware/APKBUILD b/packages/entware/VELBUILD similarity index 62% rename from packages/entware/APKBUILD rename to packages/entware/VELBUILD index 8b8cb12..5bb6f61 100644 --- a/packages/entware/APKBUILD +++ b/packages/entware/VELBUILD @@ -3,13 +3,12 @@ pkgname=entware pkgver=1.0.0 pkgrel=1 pkgdesc="Entware software repository for reMarkable tablets" -_upstream_author="Entware" -_category="utilities" +upstream_author="Entware" +category="utilities" url="https://entware.net/" arch="aarch64 armv7" license="GPL-2.0" depends="mount-utils" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall $pkgname.post-deinstall" options="!check !fhs !strip !tracedeps" source=" install-entware.sh @@ -65,6 +64,135 @@ package() { install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ "$pkgdir/home/root/.vellum/hooks/post-os-upgrade/$pkgname" } +postinstall(){ + /home/root/.local/share/entware/install-entware.sh + + BASHRC="/home/root/.bashrc" + PATH_LINE='export PATH=/opt/bin:/opt/sbin:$PATH' + BASHRC_CHANGED=false + + if [ -f "$BASHRC" ] && grep -qF "/opt/bin" "$BASHRC"; then + echo "Entware PATH already configured in $BASHRC" + else + echo "" >> "$BASHRC" + echo "$PATH_LINE" >> "$BASHRC" + echo "Added Entware to PATH in $BASHRC" + BASHRC_CHANGED=true + fi + + cat << 'EOF' + +====================================================== + Entware Installed +====================================================== + + Package management: + + opkg update Update package list + opkg install Install a package + opkg list List available packages + opkg list-installed List installed packages + opkg upgrade Upgrade all packages + + After OS updates, run to restore Entware: + + /home/root/.local/share/entware/reenable-entware.sh + +====================================================== +EOF + + if [ "$BASHRC_CHANGED" = true ]; then + echo "Run 'exec bash --login' to use Entware." + echo "" + fi +} +postupgrade(){ + /home/root/.vellum/bin/mount-rw + + /home/root/.local/share/entware/reenable-entware.sh + + /home/root/.vellum/bin/mount-restore + + if [ -x /opt/bin/opkg ]; then + /opt/bin/opkg update + /opt/bin/opkg upgrade opkg + fi + + cat << 'EOF' + +====================================================== + Entware Upgraded +====================================================== + + The opkg package manager has been updated. + Your installed Entware packages are preserved. + + To update all Entware packages: + + opkg update && opkg upgrade + +====================================================== + +EOF +} +postosupgrade(){ + /home/root/.local/share/entware/reenable-entware.sh +} +predeinstall(){ + VELLUM_BIN="/home/root/.vellum/bin" + + BASHRC="/home/root/.bashrc" + if [ -f "$BASHRC" ]; then + grep -v "/opt/bin:/opt/sbin" "$BASHRC" > "$BASHRC.tmp" && mv "$BASHRC.tmp" "$BASHRC" + fi + + "$VELLUM_BIN/mount-rw" + + if systemctl is-enabled opt.mount >/dev/null 2>&1; then + systemctl disable opt.mount || true + fi + + systemctl daemon-reload + + if mountpoint -q /opt 2>/dev/null; then + umount /opt || true + fi + + [ -f /etc/systemd/system/opt.mount ] && rm -f /etc/systemd/system/opt.mount + [ -d /opt ] && rmdir /opt 2>/dev/null || true + + systemctl daemon-reload + + "$VELLUM_BIN/mount-restore" +} +postdeinstall(){ + ENTWARE_DATA="/home/root/.entware" + + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf "$ENTWARE_DATA" + echo "Entware data purged from $ENTWARE_DATA" + elif [ -d "$ENTWARE_DATA" ]; then + cat << 'EOF' + +====================================================== + Entware data preserved at /home/root/.entware +====================================================== + + Your Entware packages and settings are still on disk. + + To fully remove all data: + + rm -rf /home/root/.entware + + To reinstall and restore your packages: + + vellum install entware + +====================================================== + +EOF + fi +} sha512sums=" 46d0c2c2487e074e48be2e7443df21aa14da0299f8591be4cb6efa5db6dc8062de0e71a440a31de1db7b1fe69347166493aaefd68f1e71e8a4e4ac8cdf6e879f install-entware.sh 26c1e0b37f7acce03213d5c5dff0aa7ff0d9311a0fe56f11fc6ee2507438f3adfc4be7904164e4416eda1453897bd469e954332460283aaabb2fd7b9297fd061 reenable-entware.sh diff --git a/packages/entware/entware.post-deinstall b/packages/entware/entware.post-deinstall deleted file mode 100644 index 37d6f14..0000000 --- a/packages/entware/entware.post-deinstall +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -ENTWARE_DATA="/home/root/.entware" - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf "$ENTWARE_DATA" - echo "Entware data purged from $ENTWARE_DATA" -else - if [ -d "$ENTWARE_DATA" ]; then - cat << 'EOF' - -====================================================== - Entware data preserved at /home/root/.entware -====================================================== - - Your Entware packages and settings are still on disk. - - To fully remove all data: - - rm -rf /home/root/.entware - - To reinstall and restore your packages: - - vellum install entware - -====================================================== - -EOF - fi -fi diff --git a/packages/entware/entware.post-install b/packages/entware/entware.post-install deleted file mode 100644 index bb52775..0000000 --- a/packages/entware/entware.post-install +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -set -e - -/home/root/.local/share/entware/install-entware.sh - -BASHRC="/home/root/.bashrc" -PATH_LINE='export PATH=/opt/bin:/opt/sbin:$PATH' -BASHRC_CHANGED=false - -if [ -f "$BASHRC" ] && grep -qF "/opt/bin" "$BASHRC"; then - echo "Entware PATH already configured in $BASHRC" -else - echo "" >> "$BASHRC" - echo "$PATH_LINE" >> "$BASHRC" - echo "Added Entware to PATH in $BASHRC" - BASHRC_CHANGED=true -fi - -cat << 'EOF' - -====================================================== - Entware Installed -====================================================== - - Package management: - - opkg update Update package list - opkg install Install a package - opkg list List available packages - opkg list-installed List installed packages - opkg upgrade Upgrade all packages - - After OS updates, run to restore Entware: - - /home/root/.local/share/entware/reenable-entware.sh - -====================================================== -EOF - -if [ "$BASHRC_CHANGED" = true ]; then - echo "Run 'exec bash --login' to use Entware." - echo "" -fi diff --git a/packages/entware/entware.post-os-upgrade b/packages/entware/entware.post-os-upgrade deleted file mode 100644 index 1c51fd1..0000000 --- a/packages/entware/entware.post-os-upgrade +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -e - -/home/root/.local/share/entware/reenable-entware.sh diff --git a/packages/entware/entware.post-upgrade b/packages/entware/entware.post-upgrade deleted file mode 100644 index e8d4542..0000000 --- a/packages/entware/entware.post-upgrade +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -set -e - -/home/root/.vellum/bin/mount-rw - -/home/root/.local/share/entware/reenable-entware.sh - -/home/root/.vellum/bin/mount-restore - -if [ -x /opt/bin/opkg ]; then - /opt/bin/opkg update - /opt/bin/opkg upgrade opkg -fi - -cat << 'EOF' - -====================================================== - Entware Upgraded -====================================================== - - The opkg package manager has been updated. - Your installed Entware packages are preserved. - - To update all Entware packages: - - opkg update && opkg upgrade - -====================================================== - -EOF diff --git a/packages/entware/entware.pre-deinstall b/packages/entware/entware.pre-deinstall deleted file mode 100644 index 0ef4b6e..0000000 --- a/packages/entware/entware.pre-deinstall +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -VELLUM_BIN="/home/root/.vellum/bin" - -BASHRC="/home/root/.bashrc" -if [ -f "$BASHRC" ]; then - grep -v "/opt/bin:/opt/sbin" "$BASHRC" > "$BASHRC.tmp" && mv "$BASHRC.tmp" "$BASHRC" -fi - -"$VELLUM_BIN/mount-rw" - -if systemctl is-enabled opt.mount >/dev/null 2>&1; then - systemctl disable opt.mount || true -fi - -systemctl daemon-reload - -if mountpoint -q /opt 2>/dev/null; then - umount /opt || true -fi - -[ -f /etc/systemd/system/opt.mount ] && rm -f /etc/systemd/system/opt.mount -[ -d /opt ] && rmdir /opt 2>/dev/null || true - -systemctl daemon-reload - -"$VELLUM_BIN/mount-restore" diff --git a/packages/extend-list-title-width/APKBUILD b/packages/extend-list-title-width/VELBUILD similarity index 96% rename from packages/extend-list-title-width/APKBUILD rename to packages/extend-list-title-width/VELBUILD index bc4f517..f74bc75 100644 --- a/packages/extend-list-title-width/APKBUILD +++ b/packages/extend-list-title-width/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=extend-list-title-width pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Removes extra right margin for titles in list view to fill more of the available space." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fastfetch/APKBUILD b/packages/fastfetch/VELBUILD similarity index 89% rename from packages/fastfetch/APKBUILD rename to packages/fastfetch/VELBUILD index dc9ae98..fe69837 100644 --- a/packages/fastfetch/APKBUILD +++ b/packages/fastfetch/VELBUILD @@ -2,14 +2,13 @@ maintainer="notfrants " pkgname=fastfetch pkgver=2.58.0_git11 pkgrel=2 -_upstream_author="fastfetch-cli" -_category="utilities" +upstream_author="fastfetch-cli" +category="utilities" pkgdesc="A maintained, feature-rich and performance oriented, neofetch like system information tool." url="https://github.com/fastfetch-cli/fastfetch" arch="aarch64 armv7" license="MIT" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-deinstall" source=" https://github.com/notfrants/vellum-builds/releases/download/v0.1.0/fastfetch-aarch64.tar.gz @@ -40,6 +39,15 @@ package() { install -m644 "$srcdir"/presets/examples/*.jsonc \ "$pkgdir"/home/root/.local/share/$pkgname/presets/examples/ } + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf \ + /home/root/.config/fastfetch \ + /home/root/.cache/fastfetch + fi +} + sha512sums=" 182245634ef31782a68f051ae1a479c2cf891258336286c8786cf590aa7bae3a340496da5be15dcc0067294f64ba48c3713f0fba3bd4c745b9f28637ecf08fd7 fastfetch-aarch64.tar.gz f6848c39be972ad1280fc97cc911c8a7b37069defbc3d8d8cbd8271fb0e31e00456b3b0a05059fea30c0402bd62e50a37f9895246238c6a86905b1d332478f08 fastfetch-arm32.tar.gz diff --git a/packages/fastfetch/fastfetch.post-deinstall b/packages/fastfetch/fastfetch.post-deinstall deleted file mode 100644 index f011629..0000000 --- a/packages/fastfetch/fastfetch.post-deinstall +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/.config/fastfetch - rm -fr /home/root/.cache/fastfetch -fi diff --git a/packages/fav-tag-button/APKBUILD b/packages/fav-tag-button/VELBUILD similarity index 96% rename from packages/fav-tag-button/APKBUILD rename to packages/fav-tag-button/VELBUILD index f639d10..8cb3d5d 100644 --- a/packages/fav-tag-button/APKBUILD +++ b/packages/fav-tag-button/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fav-tag-button pkgver=1.0.5 pkgrel=0 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Adds buttons to the navigator search/new note button that lets you open the favourites and tagged view with a click." url="https://github.com/FouzR/xovi-extensions" arch="noarch" diff --git a/packages/favorite-button/APKBUILD b/packages/favorite-button/VELBUILD similarity index 96% rename from packages/favorite-button/APKBUILD rename to packages/favorite-button/VELBUILD index 58391ea..f6389a0 100644 --- a/packages/favorite-button/APKBUILD +++ b/packages/favorite-button/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=favorite-button pkgver=1.0.0 pkgrel=0 -_upstream_author="NohamR" -_category="ui" +upstream_author="NohamR" +category="ui" pkgdesc="Restores a Favorite action in the document list header for faster pinning." url="https://github.com/NohamR/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fewer-light-steps/APKBUILD b/packages/fewer-light-steps/VELBUILD similarity index 96% rename from packages/fewer-light-steps/APKBUILD rename to packages/fewer-light-steps/VELBUILD index b0e87ad..56b4fec 100644 --- a/packages/fewer-light-steps/APKBUILD +++ b/packages/fewer-light-steps/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fewer-light-steps pkgver=1.0.1 pkgrel=2 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Changes 5-level light slider to 4-level." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fix-appload-rotation/APKBUILD b/packages/fix-appload-rotation/VELBUILD similarity index 96% rename from packages/fix-appload-rotation/APKBUILD rename to packages/fix-appload-rotation/VELBUILD index 4e82a85..fa8d43f 100644 --- a/packages/fix-appload-rotation/APKBUILD +++ b/packages/fix-appload-rotation/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fix-appload-rotation pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="fixes" +upstream_author="ingatellent" +category="fixes" pkgdesc="Fixes rotation issues with the appload app." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fix-battery-indicator/APKBUILD b/packages/fix-battery-indicator/VELBUILD similarity index 96% rename from packages/fix-battery-indicator/APKBUILD rename to packages/fix-battery-indicator/VELBUILD index 5361698..df5b1eb 100644 --- a/packages/fix-battery-indicator/APKBUILD +++ b/packages/fix-battery-indicator/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fix-battery-indicator pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="fixes ui" +upstream_author="rmitchellscott" +category="fixes ui" pkgdesc="Fixes battery icon not updating after charging while device is asleep" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fix-custom-fit/APKBUILD b/packages/fix-custom-fit/VELBUILD similarity index 96% rename from packages/fix-custom-fit/APKBUILD rename to packages/fix-custom-fit/VELBUILD index ac00967..74901d8 100644 --- a/packages/fix-custom-fit/APKBUILD +++ b/packages/fix-custom-fit/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fix-custom-fit pkgver=1.0.0 pkgrel=1 -_upstream_author="ingatellent" -_category="fixes ui" +upstream_author="ingatellent" +category="fixes ui" pkgdesc="Makes Custom Fit zoom consistent across devices and orientations, ensuring the same document area is shown everywhere." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fix-light-indicator-gap/APKBUILD b/packages/fix-light-indicator-gap/VELBUILD similarity index 96% rename from packages/fix-light-indicator-gap/APKBUILD rename to packages/fix-light-indicator-gap/VELBUILD index ff6db6a..110561a 100644 --- a/packages/fix-light-indicator-gap/APKBUILD +++ b/packages/fix-light-indicator-gap/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fix-light-indicator-gap pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="fixes ui" +upstream_author="rmitchellscott" +category="fixes ui" pkgdesc="Removes the gap reserved for the frontlight icon when the light is off on Paper Pro and Paper Pro Move." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fix-page-number-on-slider/APKBUILD b/packages/fix-page-number-on-slider/VELBUILD similarity index 96% rename from packages/fix-page-number-on-slider/APKBUILD rename to packages/fix-page-number-on-slider/VELBUILD index 878c301..1b14d8b 100644 --- a/packages/fix-page-number-on-slider/APKBUILD +++ b/packages/fix-page-number-on-slider/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fix-page-number-on-slider pkgver=1.0.1 pkgrel=1 -_upstream_author="rmitchellscott" -_category="fixes ui" +upstream_author="rmitchellscott" +category="fixes ui" pkgdesc="Restores the z-index for the pageLabel element so it appears on top of the page slider like in previous versions." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fix-quick-settings-temp-separator/APKBUILD b/packages/fix-quick-settings-temp-separator/VELBUILD similarity index 96% rename from packages/fix-quick-settings-temp-separator/APKBUILD rename to packages/fix-quick-settings-temp-separator/VELBUILD index ebe6ce9..be96c60 100644 --- a/packages/fix-quick-settings-temp-separator/APKBUILD +++ b/packages/fix-quick-settings-temp-separator/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fix-quick-settings-temp-separator pkgver=1.0.1 pkgrel=0 -_upstream_author="rmitchellscott" -_category="fixes ui" +upstream_author="rmitchellscott" +category="fixes ui" pkgdesc="Removes the duplicate horizontal separator in quick settings when high temp warnings are present on Paper Pro family devices." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/fix-sidebar-filters/APKBUILD b/packages/fix-sidebar-filters/VELBUILD similarity index 95% rename from packages/fix-sidebar-filters/APKBUILD rename to packages/fix-sidebar-filters/VELBUILD index b5b5e26..14f86fd 100644 --- a/packages/fix-sidebar-filters/APKBUILD +++ b/packages/fix-sidebar-filters/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=fix-sidebar-filters pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui fixes" +upstream_author="ingatellent" +category="ui fixes" pkgdesc="Fix highlighting selected filter in navigator sidebar" url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/floating-toolbar/APKBUILD b/packages/floating-toolbar/VELBUILD similarity index 85% rename from packages/floating-toolbar/APKBUILD rename to packages/floating-toolbar/VELBUILD index 77552d1..2aa85b0 100644 --- a/packages/floating-toolbar/APKBUILD +++ b/packages/floating-toolbar/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=floating-toolbar pkgver=1.0.9 pkgrel=0 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Floating toolbar for quick access to your favourite tools, presets, and layers." url="https://github.com/FouzR/xovi-extensions" arch="noarch" @@ -15,7 +15,6 @@ floating.qmd::https://raw.githubusercontent.com/FouzR/xovi-extensions/$_commit/3 LICENSE::https://raw.githubusercontent.com/FouzR/xovi-extensions/$_commit/LICENSE " options="!check !fhs" -install="$pkgname.post-deinstall" package() { install -Dm644 "$srcdir/floating.qmd" \ @@ -26,6 +25,16 @@ package() { echo "https://github.com/FouzR/xovi-extensions" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -f \ + /home/root/quickTool.json \ + /home/root/quickTool2.json \ + /home/root/quickTool3.json + fi +} + sha512sums=" 361fa1f216a22c8444d9c785b21cb74abca1c6b7faf66e7e4c45f561a4e189b2619e0d9131b21ae31e0e28b65790f50a7ca6e6778e173941cd223be57c97d6ce floating.qmd 48d498777fe609c2d71d0b6109fee48374e46aa533eed9a9514cc65be55574bd5b1e55313c0fe42dfeccfaaae757770c3a3e2ad513184e2343fbad74e26669ae LICENSE diff --git a/packages/floating-toolbar/floating-toolbar.post-deinstall b/packages/floating-toolbar/floating-toolbar.post-deinstall deleted file mode 100644 index f75a48f..0000000 --- a/packages/floating-toolbar/floating-toolbar.post-deinstall +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -f /home/root/quickTool.json - rm -f /home/root/quickTool2.json - rm -f /home/root/quickTool3.json -fi diff --git a/packages/force-koreader-landscape/APKBUILD b/packages/force-koreader-landscape/VELBUILD similarity index 96% rename from packages/force-koreader-landscape/APKBUILD rename to packages/force-koreader-landscape/VELBUILD index 469a389..d2b5483 100644 --- a/packages/force-koreader-landscape/APKBUILD +++ b/packages/force-koreader-landscape/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=force-koreader-landscape pkgver=1.0.0 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Keeps the KOReader appload app in the same aspect ratio as the screen" url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/force-sync/APKBUILD b/packages/force-sync/VELBUILD similarity index 96% rename from packages/force-sync/APKBUILD rename to packages/force-sync/VELBUILD index 5fb4e03..c10a29a 100644 --- a/packages/force-sync/APKBUILD +++ b/packages/force-sync/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=force-sync pkgver=1.0.0 pkgrel=0 -_upstream_author="NohamR" -_category="ui" +upstream_author="NohamR" +category="ui" pkgdesc="Adds a cloud button in Quick Settings that forces a library sync when tapped." url="https://github.com/NohamR/xovi-qmd-extensions" arch="noarch" diff --git a/packages/four-finger-change-filter/APKBUILD b/packages/four-finger-change-filter/VELBUILD similarity index 96% rename from packages/four-finger-change-filter/APKBUILD rename to packages/four-finger-change-filter/VELBUILD index 2d37fb1..4ec6093 100644 --- a/packages/four-finger-change-filter/APKBUILD +++ b/packages/four-finger-change-filter/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=four-finger-change-filter pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Four-finger tap to toggle contrast filter in PDF/EPUB documents." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/gesture-colour-settings/APKBUILD b/packages/gesture-colour-settings/VELBUILD similarity index 96% rename from packages/gesture-colour-settings/APKBUILD rename to packages/gesture-colour-settings/VELBUILD index c1a2795..4c59b86 100644 --- a/packages/gesture-colour-settings/APKBUILD +++ b/packages/gesture-colour-settings/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gesture-colour-settings pkgver=1.0.8 pkgrel=1 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Accessibility menu for colour preferences." url="https://github.com/FouzR/xovi-extensions" arch="noarch" diff --git a/packages/gesture-contrast-toggle/APKBUILD b/packages/gesture-contrast-toggle/VELBUILD similarity index 96% rename from packages/gesture-contrast-toggle/APKBUILD rename to packages/gesture-contrast-toggle/VELBUILD index 3fd3692..2031847 100644 --- a/packages/gesture-contrast-toggle/APKBUILD +++ b/packages/gesture-contrast-toggle/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gesture-contrast-toggle pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Four-finger tap to toggle contrast filter between Off and Fullpage in PDF/EPUB documents" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/gesture-reset-view/APKBUILD b/packages/gesture-reset-view/VELBUILD similarity index 96% rename from packages/gesture-reset-view/APKBUILD rename to packages/gesture-reset-view/VELBUILD index 4a59214..a7952a4 100644 --- a/packages/gesture-reset-view/APKBUILD +++ b/packages/gesture-reset-view/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gesture-reset-view pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Three-finger swipe down to reset pan and zoom (returns to 100% zoom, top of page)" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/gesture-tap-to-page/APKBUILD b/packages/gesture-tap-to-page/VELBUILD similarity index 96% rename from packages/gesture-tap-to-page/APKBUILD rename to packages/gesture-tap-to-page/VELBUILD index f35a58f..2712b0e 100644 --- a/packages/gesture-tap-to-page/APKBUILD +++ b/packages/gesture-tap-to-page/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gesture-tap-to-page pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Tap screen edges to navigate pages when toolbar is hidden (right=forward, left=back)" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/gesture-toolbar-hide/APKBUILD b/packages/gesture-toolbar-hide/VELBUILD similarity index 96% rename from packages/gesture-toolbar-hide/APKBUILD rename to packages/gesture-toolbar-hide/VELBUILD index 75c1401..5ff30ad 100644 --- a/packages/gesture-toolbar-hide/APKBUILD +++ b/packages/gesture-toolbar-hide/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gesture-toolbar-hide pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Single-finger swipe from toolbar edge to hide the toolbar" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/gesture-toolbar-show/APKBUILD b/packages/gesture-toolbar-show/VELBUILD similarity index 96% rename from packages/gesture-toolbar-show/APKBUILD rename to packages/gesture-toolbar-show/VELBUILD index 7d113ca..23bbfee 100644 --- a/packages/gesture-toolbar-show/APKBUILD +++ b/packages/gesture-toolbar-show/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gesture-toolbar-show pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Single-finger swipe from toolbar edge to show the toolbar" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/gestures-fouzr/APKBUILD b/packages/gestures-fouzr/VELBUILD similarity index 84% rename from packages/gestures-fouzr/APKBUILD rename to packages/gestures-fouzr/VELBUILD index 14118ef..59dcf4e 100644 --- a/packages/gestures-fouzr/APKBUILD +++ b/packages/gestures-fouzr/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gestures-fouzr pkgver=1.0.7 pkgrel=1 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Adds four-finger document drawer, and multiple swipe gestures to control pen settings." url="https://github.com/FouzR/xovi-extensions" arch="noarch" @@ -15,7 +15,6 @@ gestures.qmd::https://raw.githubusercontent.com/FouzR/xovi-extensions/$_commit/3 LICENSE::https://raw.githubusercontent.com/FouzR/xovi-extensions/$_commit/LICENSE " options="!check !fhs" -install="$pkgname.post-install $pkgname.post-deinstall" package() { install -Dm644 "$srcdir/gestures.qmd" \ @@ -26,6 +25,15 @@ package() { echo "https://github.com/FouzR/xovi-extensions" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } +postinstall(){ + echo "NOTE: Eraser swapping gestures require the floating-toolbar package" +} +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -f /home/root/colorSet.json + fi +} + sha512sums=" c0ed7823446c16a42032c9a2541e40a1e03064efd0d6e1e489f5a5f642ecf69a2a561e80e801836df4a346d0373b4aaa94db2b964cb22e7e2a68daaa96e6c8ea gestures.qmd 48d498777fe609c2d71d0b6109fee48374e46aa533eed9a9514cc65be55574bd5b1e55313c0fe42dfeccfaaae757770c3a3e2ad513184e2343fbad74e26669ae LICENSE diff --git a/packages/gestures-fouzr/gestures-fouzr.post-deinstall b/packages/gestures-fouzr/gestures-fouzr.post-deinstall deleted file mode 100644 index a2f2f81..0000000 --- a/packages/gestures-fouzr/gestures-fouzr.post-deinstall +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -f /home/root/colorSet.json -fi diff --git a/packages/gestures-fouzr/gestures-fouzr.post-install b/packages/gestures-fouzr/gestures-fouzr.post-install deleted file mode 100644 index 00d764d..0000000 --- a/packages/gestures-fouzr/gestures-fouzr.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "NOTE: Eraser swapping gestures require the floating-toolbar package" diff --git a/packages/gestures-ingatellent/APKBUILD b/packages/gestures-ingatellent/VELBUILD similarity index 96% rename from packages/gestures-ingatellent/APKBUILD rename to packages/gestures-ingatellent/VELBUILD index 3d7b1f8..ff6adbc 100644 --- a/packages/gestures-ingatellent/APKBUILD +++ b/packages/gestures-ingatellent/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gestures-ingatellent pkgver=1.0.3 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Multi-gesture support for toolbar, navigation, and view controls." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/gomarkablestream/APKBUILD b/packages/gomarkablestream/VELBUILD similarity index 96% rename from packages/gomarkablestream/APKBUILD rename to packages/gomarkablestream/VELBUILD index c9b0e91..af1158f 100644 --- a/packages/gomarkablestream/APKBUILD +++ b/packages/gomarkablestream/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=gomarkablestream pkgver=0.50.0 pkgrel=0 -_upstream_author="owulveryck" -_category="utilities" +upstream_author="owulveryck" +category="utilities" pkgdesc="Stream your reMarkable screen to a web browser" url="https://github.com/owulveryck/goMarkableStream" arch="aarch64 armv7" diff --git a/packages/hide-dev-mode-icon/APKBUILD b/packages/hide-dev-mode-icon/VELBUILD similarity index 96% rename from packages/hide-dev-mode-icon/APKBUILD rename to packages/hide-dev-mode-icon/VELBUILD index af9c10c..82b5afe 100644 --- a/packages/hide-dev-mode-icon/APKBUILD +++ b/packages/hide-dev-mode-icon/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=hide-dev-mode-icon pkgver=1.0.2 pkgrel=2 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Hides the developer mode icon next to the battery icon." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/hide-document-close/APKBUILD b/packages/hide-document-close/VELBUILD similarity index 96% rename from packages/hide-document-close/APKBUILD rename to packages/hide-document-close/VELBUILD index 26775d9..84e72aa 100644 --- a/packages/hide-document-close/APKBUILD +++ b/packages/hide-document-close/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=hide-document-close pkgver=1.0.5 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Hides close button, use slide-down from top instead." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/hide-page-labels-fullscreen/APKBUILD b/packages/hide-page-labels-fullscreen/VELBUILD similarity index 96% rename from packages/hide-page-labels-fullscreen/APKBUILD rename to packages/hide-page-labels-fullscreen/VELBUILD index b30bc2f..6af4d64 100644 --- a/packages/hide-page-labels-fullscreen/APKBUILD +++ b/packages/hide-page-labels-fullscreen/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=hide-page-labels-fullscreen pkgver=1.0.4 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Hides page numbers when toolbar is hidden (except on last page)." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/hide-show-toolbar/APKBUILD b/packages/hide-show-toolbar/VELBUILD similarity index 96% rename from packages/hide-show-toolbar/APKBUILD rename to packages/hide-show-toolbar/VELBUILD index b65b56e..b498964 100644 --- a/packages/hide-show-toolbar/APKBUILD +++ b/packages/hide-show-toolbar/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=hide-show-toolbar pkgver=1.0.5 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Hides the show toolbar button." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/hide-zoom-indicator/APKBUILD b/packages/hide-zoom-indicator/VELBUILD similarity index 96% rename from packages/hide-zoom-indicator/APKBUILD rename to packages/hide-zoom-indicator/VELBUILD index a6f9448..8b6b33e 100644 --- a/packages/hide-zoom-indicator/APKBUILD +++ b/packages/hide-zoom-indicator/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=hide-zoom-indicator pkgver=1.0.3 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Auto-hides zoom indicator after 4 seconds" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/hyfetch/APKBUILD b/packages/hyfetch/VELBUILD similarity index 67% rename from packages/hyfetch/APKBUILD rename to packages/hyfetch/VELBUILD index 3e16f00..e4ed630 100644 --- a/packages/hyfetch/APKBUILD +++ b/packages/hyfetch/VELBUILD @@ -2,14 +2,13 @@ maintainer="notfrants " pkgname=hyfetch pkgver=2.0.5_git6 pkgrel=3 -_upstream_author="hykilpikonna" -_category="utilities" +upstream_author="hykilpikonna" +category="utilities" pkgdesc="Neofetch with LGBTQ+ pride flags!" url="https://github.com/hykilpikonna/hyfetch" arch="aarch64 armv7" license="MIT" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" source=" https://github.com/notfrants/vellum-builds/releases/download/v0.1.1/hyfetch-aarch64.tar.gz @@ -32,6 +31,28 @@ package() { install -Dm644 "$srcdir"/SOURCES \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + +postinstall(){ + /home/root/.vellum/bin/hyfetch --bpaf-complete-style-bash > \ + /home/root/.vellum/share/bash-completion/completions/hyfetch +} + +postupgrade(){ + /home/root/.vellum/bin/hyfetch --bpaf-complete-style-bash > \ + /home/root/.vellum/share/bash-completion/completions/hyfetch +} + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf \ + /home/root/.config/hyfetch.json \ + /home/root/.config/neofetch \ + /home/root/.cache/hyfetch + fi + + rm -f /home/root/.vellum/share/bash-completion/completions/hyfetch +} + sha512sums=" 284d923ee90d62039f5e2f8a0725cee4418adf9ffca622a5fb3e806bc2fc746e13a634ce5a7e7680ef695b2234e01186a3b2d3d36fba5216905eb3d2f5b43a26 hyfetch-aarch64.tar.gz 0a8c6b1e7dda49052557fc7e97a48074a7a490e83f4b4154142bfe1c10d5a4c8343d2e31a586fa23b3396b51c4467660213518513227145cdef42a7fe08b52f1 hyfetch-arm32.tar.gz diff --git a/packages/hyfetch/hyfetch.post-deinstall b/packages/hyfetch/hyfetch.post-deinstall deleted file mode 100644 index 14d7714..0000000 --- a/packages/hyfetch/hyfetch.post-deinstall +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -f /home/root/.config/hyfetch.json - rm -fr /home/root/.config/neofetch - rm -fr /home/root/.cache/hyfetch -fi - -rm -f /home/root/.vellum/share/bash-completion/completions/hyfetch diff --git a/packages/hyfetch/hyfetch.post-install b/packages/hyfetch/hyfetch.post-install deleted file mode 100644 index 6b96a5e..0000000 --- a/packages/hyfetch/hyfetch.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/home/root/.vellum/bin/hyfetch --bpaf-complete-style-bash > \ - /home/root/.vellum/share/bash-completion/completions/hyfetch diff --git a/packages/hyfetch/hyfetch.post-upgrade b/packages/hyfetch/hyfetch.post-upgrade deleted file mode 100644 index 6b96a5e..0000000 --- a/packages/hyfetch/hyfetch.post-upgrade +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/home/root/.vellum/bin/hyfetch --bpaf-complete-style-bash > \ - /home/root/.vellum/share/bash-completion/completions/hyfetch diff --git a/packages/jq/APKBUILD b/packages/jq/VELBUILD similarity index 96% rename from packages/jq/APKBUILD rename to packages/jq/VELBUILD index 5764a17..84e2199 100644 --- a/packages/jq/APKBUILD +++ b/packages/jq/VELBUILD @@ -2,8 +2,8 @@ maintainer="notfrants " pkgname=jq pkgver=1.8.1 pkgrel=0 -_upstream_author="jqlang" -_category="utilities" +upstream_author="jqlang" +category="utilities" pkgdesc="Command-line JSON processor" url="https://jqlang.org/" arch="aarch64 armv7" diff --git a/packages/koreader/APKBUILD b/packages/koreader/VELBUILD similarity index 73% rename from packages/koreader/APKBUILD rename to packages/koreader/VELBUILD index 3fc6024..984bebb 100644 --- a/packages/koreader/APKBUILD +++ b/packages/koreader/VELBUILD @@ -2,15 +2,14 @@ maintainer="Mitchell Scott " pkgname=koreader pkgver=2025.10 pkgrel=1 -_upstream_author="koreader" -_category="apps" +upstream_author="koreader" +category="apps" pkgdesc="An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats." url="https://github.com/koreader/koreader" arch="aarch64 armv7" license="AGPL-3.0" depends="appload" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-install $pkgname.post-deinstall" source=" https://github.com/koreader/koreader/releases/download/v$pkgver/koreader-remarkable-aarch64-v$pkgver.zip @@ -36,6 +35,28 @@ package() { echo "https://github.com/koreader/koreader/archive/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + +postinstall(){ + echo "" + echo "==================================================" + echo " NOTE: To use KOReader, you must refresh AppLoad" + echo "==================================================" + echo "" +} + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf /home/root/xovi/exthome/appload/koreader + fi + + echo "" + echo "===============================================" + echo " NOTE: You must refresh AppLoad to see changes " + echo " reflected in the tablet UI " + echo "===============================================" + echo "" +} + sha512sums=" 2e51ad9e88ee2ba5670e6351223afbf63d9292e866f2f4bfeab638db54295287ffde4f37380cad2891b989f1197509b4b4acde3018dc82d43fb1f4424b95f128 koreader-remarkable-aarch64-v2025.10.zip cb4b5ab2736bc41545383967a3431d33342d8bcb65c0674b2b8975f622e10b39dad0581385aaacf5d88a0a99024105f0e27a766e871144510070dd09e8967237 koreader-remarkable-v2025.10.zip diff --git a/packages/koreader/koreader.post-deinstall b/packages/koreader/koreader.post-deinstall deleted file mode 100644 index 8bc02fc..0000000 --- a/packages/koreader/koreader.post-deinstall +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/xovi/exthome/appload/koreader -fi - -echo "" -echo "===============================================" -echo " NOTE: You must refresh AppLoad to see changes " -echo " reflected in the tablet UI " -echo "===============================================" -echo "" diff --git a/packages/koreader/koreader.post-install b/packages/koreader/koreader.post-install deleted file mode 100644 index aa40673..0000000 --- a/packages/koreader/koreader.post-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -echo "" -echo "==================================================" -echo " NOTE: To use KOReader, you must refresh AppLoad" -echo "==================================================" -echo "" diff --git a/packages/less/APKBUILD b/packages/less/VELBUILD similarity index 96% rename from packages/less/APKBUILD rename to packages/less/VELBUILD index 1c92869..e7adf8c 100644 --- a/packages/less/APKBUILD +++ b/packages/less/VELBUILD @@ -2,8 +2,8 @@ maintainer="notfrants " pkgname=less pkgver=692 pkgrel=0 -_upstream_author="gwsw" -_category="utilities" +upstream_author="gwsw" +category="utilities" pkgdesc="File pager" url="https://greenwoodsoftware.com/less/" arch="aarch64 armv7" diff --git a/packages/literm/APKBUILD b/packages/literm/VELBUILD similarity index 91% rename from packages/literm/APKBUILD rename to packages/literm/VELBUILD index e926a7e..7ed4ac3 100644 --- a/packages/literm/APKBUILD +++ b/packages/literm/VELBUILD @@ -2,15 +2,14 @@ maintainer="Mitchell Scott " pkgname=literm pkgver=0.1.6 pkgrel=3 -_upstream_author="asivery" -_category="apps" +upstream_author="asivery" +category="apps" pkgdesc="A terminal emulator using QtQuick." url="https://github.com/asivery/rm-literm" arch="aarch64 armv7" license="GPL-2.0" depends="qt-resource-rebuilder remarkable-os>=3.24 remarkable-os<3.26" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-deinstall" source=" https://github.com/asivery/rm-literm/releases/download/v$pkgver/literm-aarch64.so @@ -37,6 +36,13 @@ package() { echo "https://github.com/asivery/rm-literm/archive/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf /home/root/.config/literm + fi +} + sha512sums=" 9d7bda5918da7a58005b0be1db4f1875b89964bdf69c905da9b1bd9bc32268d5fa7a2660d03af0f83b85aa0c5ba9a762efef95b44f0c99261e0615de4ffeb113 literm-aarch64.so f4ad1aaded1cb8bf2852200be6348ff8bf54d4be976bd52af540ec600801bf4294660c15fb5956590dbe1ab924281363721e5eb3aa30ff402bc9ecbd1e3b3d3a literm-arm32.so diff --git a/packages/literm/literm.post-deinstall b/packages/literm/literm.post-deinstall deleted file mode 100644 index 9fe74ab..0000000 --- a/packages/literm/literm.post-deinstall +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/.config/literm -fi diff --git a/packages/micro/APKBUILD b/packages/micro/VELBUILD similarity index 97% rename from packages/micro/APKBUILD rename to packages/micro/VELBUILD index 721404a..2245a0e 100644 --- a/packages/micro/APKBUILD +++ b/packages/micro/VELBUILD @@ -2,8 +2,8 @@ maintainer="Nathaniel van Diepen " pkgname=micro pkgver=2.0.14 pkgrel=0 -_upstream_author="zyedidia" -_category="apps" +upstream_author="zyedidia" +category="apps" pkgdesc="Modern and intuitive terminal-based text editor" url="https://micro-editor.github.io/" arch="aarch64 armv7" diff --git a/packages/mini-light-sleep/APKBUILD b/packages/mini-light-sleep/VELBUILD similarity index 96% rename from packages/mini-light-sleep/APKBUILD rename to packages/mini-light-sleep/VELBUILD index 3e99e61..91f1f20 100644 --- a/packages/mini-light-sleep/APKBUILD +++ b/packages/mini-light-sleep/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=mini-light-sleep pkgver=1.0.4 pkgrel=0 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Replaces the light sleep banner with text saying Sleeping at the top right of the screen" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/more-light-settings/APKBUILD b/packages/more-light-settings/VELBUILD similarity index 96% rename from packages/more-light-settings/APKBUILD rename to packages/more-light-settings/VELBUILD index 9de21fd..251fb5e 100644 --- a/packages/more-light-settings/APKBUILD +++ b/packages/more-light-settings/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=more-light-settings pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Provides additional light intensity settings beyond the default options." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/mount-utils/APKBUILD b/packages/mount-utils/VELBUILD similarity index 95% rename from packages/mount-utils/APKBUILD rename to packages/mount-utils/VELBUILD index aa2c2d1..050587a 100644 --- a/packages/mount-utils/APKBUILD +++ b/packages/mount-utils/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=mount-utils pkgver=1.1.0 pkgrel=0 -_upstream_author="vellum-dev" -_category="utilities" +upstream_author="vellum-dev" +category="utilities" pkgdesc="Commands to toggle reMarkable filesystem between read-write and read-only" url="https://github.com/vellum-dev/vellum" arch="noarch" diff --git a/packages/navigate-using-arrow-keys/APKBUILD b/packages/navigate-using-arrow-keys/VELBUILD similarity index 70% rename from packages/navigate-using-arrow-keys/APKBUILD rename to packages/navigate-using-arrow-keys/VELBUILD index 3e851bf..8e3a6f9 100644 --- a/packages/navigate-using-arrow-keys/APKBUILD +++ b/packages/navigate-using-arrow-keys/VELBUILD @@ -2,14 +2,13 @@ maintainer="Mitchell Scott " pkgname=navigate-using-arrow-keys pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Keyboard arrow key navigation: left/right for pages, up/down for scrolling." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" license="GPL-2.0" depends="qt-resource-rebuilder scroll-screen-up-or-down remarkable-os>=3.25 remarkable-os<3.26" -install="$pkgname.post-install $pkgname.post-deinstall" _commit="82f0526a81a46751dd4c16d7c27f754a6afa23ec" source=" navigateUsingArrowKeys.qmd::https://raw.githubusercontent.com/ingatellent/xovi-qmd-extensions/$_commit/3.25/navigateUsingArrowKeys.qmd @@ -26,6 +25,30 @@ package() { echo "https://github.com/ingatellent/xovi-qmd-extensions" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } + +postinstall(){ + LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" + QMD_FILE="ingatellent/navigateUsingArrowKeys.qmd" + + touch "$LOADER" + + if ! grep -q "LOAD $QMD_FILE" "$LOADER"; then + echo "LOAD $QMD_FILE" >> "$LOADER" + fi +} + +postdeinstall(){ + LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" + if [ -f "$LOADER" ]; then + QMD_FILE="ingatellent/navigateUsingArrowKeys.qmd" + sed -i "\|^LOAD $QMD_FILE$|d" "$LOADER" + + if [ ! -s "$LOADER" ]; then + rm -f "$LOADER" + fi + fi +} + sha512sums=" 09c48812564f229bbdb2a2fb6cae2470fb71cb9e666feaf1abe6156b8b072c76d839778d8d296417523477248abcd925c6fc8b4799652bcfffa7d8d15ba2b0bd navigateUsingArrowKeys.qmd aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957 LICENSE diff --git a/packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-deinstall b/packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-deinstall deleted file mode 100644 index c4e6013..0000000 --- a/packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-deinstall +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" -QMD_FILE="ingatellent/navigateUsingArrowKeys.qmd" - -if [ -f "$LOADER" ]; then - sed -i "\|^LOAD $QMD_FILE$|d" "$LOADER" - - if [ ! -s "$LOADER" ]; then - rm -f "$LOADER" - fi -fi diff --git a/packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-install b/packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-install deleted file mode 100644 index 2e56b6c..0000000 --- a/packages/navigate-using-arrow-keys/navigate-using-arrow-keys.post-install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" -QMD_FILE="ingatellent/navigateUsingArrowKeys.qmd" - -touch "$LOADER" - -if ! grep -q "LOAD $QMD_FILE" "$LOADER"; then - echo "LOAD $QMD_FILE" >> "$LOADER" -fi diff --git a/packages/prevent-notebook-zoomout/APKBUILD b/packages/prevent-notebook-zoomout/VELBUILD similarity index 96% rename from packages/prevent-notebook-zoomout/APKBUILD rename to packages/prevent-notebook-zoomout/VELBUILD index 4ba8599..280fd37 100644 --- a/packages/prevent-notebook-zoomout/APKBUILD +++ b/packages/prevent-notebook-zoomout/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=prevent-notebook-zoomout pkgver=1.0.2 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Forces notebook pages to start at 1x zoom with optional horizontal offset in portrait mode" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/quicksettings-clock-serif/APKBUILD b/packages/quicksettings-clock-serif/VELBUILD similarity index 96% rename from packages/quicksettings-clock-serif/APKBUILD rename to packages/quicksettings-clock-serif/VELBUILD index bf9f23d..0228f20 100644 --- a/packages/quicksettings-clock-serif/APKBUILD +++ b/packages/quicksettings-clock-serif/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=quicksettings-clock-serif pkgver=1.0.2 pkgrel=0 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Adds a clock to the quick settings menu in serif font" url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/quicksettings-screenshot/APKBUILD b/packages/quicksettings-screenshot/VELBUILD similarity index 96% rename from packages/quicksettings-screenshot/APKBUILD rename to packages/quicksettings-screenshot/VELBUILD index c5df587..c81401e 100644 --- a/packages/quicksettings-screenshot/APKBUILD +++ b/packages/quicksettings-screenshot/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=quicksettings-screenshot pkgver=1.0.2 pkgrel=2 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Adds a screenshot button to the quick settings menu." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/random-sleep-screen/APKBUILD b/packages/random-sleep-screen/VELBUILD similarity index 96% rename from packages/random-sleep-screen/APKBUILD rename to packages/random-sleep-screen/VELBUILD index a3048bf..4c04b05 100644 --- a/packages/random-sleep-screen/APKBUILD +++ b/packages/random-sleep-screen/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=random-sleep-screen pkgver=1.0.4 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Picks random sleep screen from ~/sleepScreens/ folder." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/recents-tagged/APKBUILD b/packages/recents-tagged/VELBUILD similarity index 96% rename from packages/recents-tagged/APKBUILD rename to packages/recents-tagged/VELBUILD index acbdeea..c6f0391 100644 --- a/packages/recents-tagged/APKBUILD +++ b/packages/recents-tagged/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=recents-tagged pkgver=1.0.2 pkgrel=0 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Adds a new menu to the document drawer that shows only tagged files, sorted by last modified." url="https://github.com/FouzR/xovi-extensions" arch="noarch" diff --git a/packages/rm-pokemon/APKBUILD b/packages/rm-pokemon/VELBUILD similarity index 96% rename from packages/rm-pokemon/APKBUILD rename to packages/rm-pokemon/VELBUILD index e9a5a7a..42d84b2 100644 --- a/packages/rm-pokemon/APKBUILD +++ b/packages/rm-pokemon/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=rm-pokemon pkgver=0.2.0 pkgrel=0 -_upstream_author="rmitchellscott" -_category="utilities" +upstream_author="rmitchellscott" +category="utilities" pkgdesc="Display the Pokemon sprite matching your reMarkable firmware codename" url="https://github.com/rmitchellscott/rm-pokemon" arch="aarch64 armv7" diff --git a/packages/rm-shot/APKBUILD b/packages/rm-shot/VELBUILD similarity index 96% rename from packages/rm-shot/APKBUILD rename to packages/rm-shot/VELBUILD index 1e86048..9b888d1 100644 --- a/packages/rm-shot/APKBUILD +++ b/packages/rm-shot/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=rm-shot pkgver=1.0.3 pkgrel=1 -_upstream_author="rmitchellscott" -_category="utilities" +upstream_author="rmitchellscott" +category="utilities" pkgdesc="Screenshot extension for xovi framework" url="https://github.com/rmitchellscott/rm-shot" arch="aarch64 armv7" diff --git a/packages/rm-stylus/APKBUILD b/packages/rm-stylus/VELBUILD similarity index 96% rename from packages/rm-stylus/APKBUILD rename to packages/rm-stylus/VELBUILD index 19bbd0e..b0cdc1d 100644 --- a/packages/rm-stylus/APKBUILD +++ b/packages/rm-stylus/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=rm-stylus pkgver=0.3.0 pkgrel=2 -_upstream_author="rmitchellscott" -_category="utilities" +upstream_author="rmitchellscott" +category="utilities" pkgdesc="Xovi extension that exposes stylus button events as a QML type." url="https://github.com/rmitchellscott/rm-stylus" arch="aarch64 armv7" diff --git a/packages/rm-version-switcher/APKBUILD b/packages/rm-version-switcher/VELBUILD similarity index 97% rename from packages/rm-version-switcher/APKBUILD rename to packages/rm-version-switcher/VELBUILD index c4aebc6..cbd3cd5 100644 --- a/packages/rm-version-switcher/APKBUILD +++ b/packages/rm-version-switcher/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=rm-version-switcher pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="utilities" +upstream_author="rmitchellscott" +category="utilities" pkgdesc="Interactive CLI tool for switching between installed reMarkable OS versions" url="https://github.com/rmitchellscott/rm-version-switcher" arch="aarch64 armv7" diff --git a/packages/rmfakecloud-proxy/APKBUILD b/packages/rmfakecloud-proxy/VELBUILD similarity index 55% rename from packages/rmfakecloud-proxy/APKBUILD rename to packages/rmfakecloud-proxy/VELBUILD index b1fb65c..b78783d 100644 --- a/packages/rmfakecloud-proxy/APKBUILD +++ b/packages/rmfakecloud-proxy/VELBUILD @@ -3,12 +3,11 @@ pkgname=rmfakecloud-proxy pkgver=0.0.10 pkgrel=0 pkgdesc="HTTPS proxy for rmfakecloud - redirects reMarkable cloud traffic" -_upstream_author="ddvk" -_category="utilities" +upstream_author="ddvk" +category="utilities" url="https://github.com/ddvk/rmfakecloud-proxy" arch="aarch64 armv7" license="MIT" -install="$pkgname.post-install $pkgname.pre-deinstall" options="!check !fhs !strip !tracedeps" source=" @@ -33,6 +32,46 @@ package() { install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ "$pkgdir/home/root/.vellum/hooks/post-os-upgrade/$pkgname" } + +postinstall(){ + cat << 'EOF' + +══════════════════════════════════════════════════════════════════ + rmfakecloud-proxy installed +══════════════════════════════════════════════════════════════════ + + To complete setup, run: + + /home/root/rmfakecloud/install.sh install + + You will be prompted for your rmfakecloud server URL. + + IMPORTANT: You must re-run the installer after each OS update! + + Other commands: + install.sh setcloud - Change the cloud URL + install.sh gencert - Regenerate certificates + +══════════════════════════════════════════════════════════════════ + +EOF +} + +postosupgrade(){ + cat << 'EOF' + + rmfakecloud-proxy requires manual re-configuration. + Run: /home/root/rmfakecloud/install.sh install + +EOF +} + +predeinstall(){ + if [ -x /home/root/rmfakecloud/install.sh ]; then + /home/root/rmfakecloud/install.sh uninstall || true + fi +} + sha512sums=" 01ba8b26833bfed4be77eae01ba02661d0d42034c55d5593b41841979709bf6d50fc18a7ba67d5058b8b578a4af5e137224033bc0c7c24ab97ed543156d941ea installer-rmpro.sh a7b00d5c19c5146df9e77f2a41ec2b0e3fc8a01142942ad13a69f6724c21b3cdb6cfd2ddc36ddb3aafbbec8468ded1c58725758c346d453271e7ffca61b34669 installer-rm12.sh diff --git a/packages/rmfakecloud-proxy/rmfakecloud-proxy.post-install b/packages/rmfakecloud-proxy/rmfakecloud-proxy.post-install deleted file mode 100644 index f5d5fcf..0000000 --- a/packages/rmfakecloud-proxy/rmfakecloud-proxy.post-install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -cat << 'EOF' - -══════════════════════════════════════════════════════════════════ - rmfakecloud-proxy installed -══════════════════════════════════════════════════════════════════ - - To complete setup, run: - - /home/root/rmfakecloud/install.sh install - - You will be prompted for your rmfakecloud server URL. - - IMPORTANT: You must re-run the installer after each OS update! - - Other commands: - install.sh setcloud - Change the cloud URL - install.sh gencert - Regenerate certificates - -══════════════════════════════════════════════════════════════════ - -EOF diff --git a/packages/rmfakecloud-proxy/rmfakecloud-proxy.post-os-upgrade b/packages/rmfakecloud-proxy/rmfakecloud-proxy.post-os-upgrade deleted file mode 100644 index 815c404..0000000 --- a/packages/rmfakecloud-proxy/rmfakecloud-proxy.post-os-upgrade +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cat << 'EOF' - - rmfakecloud-proxy requires manual re-configuration. - Run: /home/root/rmfakecloud/install.sh install - -EOF diff --git a/packages/rmfakecloud-proxy/rmfakecloud-proxy.pre-deinstall b/packages/rmfakecloud-proxy/rmfakecloud-proxy.pre-deinstall deleted file mode 100644 index 32b928a..0000000 --- a/packages/rmfakecloud-proxy/rmfakecloud-proxy.pre-deinstall +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -if [ -x /home/root/rmfakecloud/install.sh ]; then - /home/root/rmfakecloud/install.sh uninstall || true -fi diff --git a/packages/rmhacks-pre1/APKBUILD b/packages/rmhacks-pre1/VELBUILD similarity index 96% rename from packages/rmhacks-pre1/APKBUILD rename to packages/rmhacks-pre1/VELBUILD index d77fb89..9a69257 100644 --- a/packages/rmhacks-pre1/APKBUILD +++ b/packages/rmhacks-pre1/VELBUILD @@ -3,8 +3,8 @@ pkgname=rmhacks pkgver=0.0.11_pre1 pkgrel=0 _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b -_upstream_author="asivery" -_category="ui" +upstream_author="asivery" +category="ui" pkgdesc="reMarkable hacks in QMD format" url="https://github.com/asivery/rm-hacks-qmd" arch="noarch" diff --git a/packages/rmhacks-pre2/APKBUILD b/packages/rmhacks-pre2/VELBUILD similarity index 96% rename from packages/rmhacks-pre2/APKBUILD rename to packages/rmhacks-pre2/VELBUILD index 9f91316..23749da 100644 --- a/packages/rmhacks-pre2/APKBUILD +++ b/packages/rmhacks-pre2/VELBUILD @@ -3,8 +3,8 @@ pkgname=rmhacks pkgver=0.0.11_pre2 pkgrel=0 _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b -_upstream_author="asivery" -_category="ui" +upstream_author="asivery" +category="ui" pkgdesc="reMarkable hacks in QMD format" url="https://github.com/asivery/rm-hacks-qmd" arch="noarch" diff --git a/packages/rmhacks-pre3/APKBUILD b/packages/rmhacks-pre3/VELBUILD similarity index 96% rename from packages/rmhacks-pre3/APKBUILD rename to packages/rmhacks-pre3/VELBUILD index 76b3e2f..9c7f54e 100644 --- a/packages/rmhacks-pre3/APKBUILD +++ b/packages/rmhacks-pre3/VELBUILD @@ -3,8 +3,8 @@ pkgname=rmhacks pkgver=0.0.11_pre3 pkgrel=0 _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b -_upstream_author="asivery" -_category="ui" +upstream_author="asivery" +category="ui" pkgdesc="reMarkable hacks in QMD format" url="https://github.com/asivery/rm-hacks-qmd" arch="noarch" diff --git a/packages/rmhacks/APKBUILD b/packages/rmhacks/VELBUILD similarity index 96% rename from packages/rmhacks/APKBUILD rename to packages/rmhacks/VELBUILD index 0fe3fdd..60faab7 100644 --- a/packages/rmhacks/APKBUILD +++ b/packages/rmhacks/VELBUILD @@ -3,8 +3,8 @@ pkgname=rmhacks pkgver=0.0.11_pre4 pkgrel=0 _commit=1c617914af95e2d3b8f25c7c0fd71ef11e21b461 -_upstream_author="asivery" -_category="ui" +upstream_author="asivery" +category="ui" pkgdesc="reMarkable hacks in QMD format" url="https://github.com/asivery/rm-hacks-qmd" arch="noarch" diff --git a/packages/rmstream/APKBUILD b/packages/rmstream/VELBUILD similarity index 73% rename from packages/rmstream/APKBUILD rename to packages/rmstream/VELBUILD index 9706e03..0a45687 100644 --- a/packages/rmstream/APKBUILD +++ b/packages/rmstream/VELBUILD @@ -2,14 +2,13 @@ maintainer="Mitchell Scott " pkgname=rmstream pkgver=0.1.1 pkgrel=1 -_upstream_author="asivery" -_category="apps" +upstream_author="asivery" +category="apps" pkgdesc="Stream your reMarkable's screen to any device on the local network via HTTP" url="https://github.com/asivery/appload-rmstream" arch="aarch64 armv7" license="GPL-3.0" depends="appload framebuffer-spy" -install="$pkgname.post-install $pkgname.post-deinstall" options="!check !fhs !strip !tracedeps" source=" @@ -42,6 +41,28 @@ package() { echo "https://github.com/asivery/appload-rmstream/archive/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + +postinstall(){ + echo "" + echo "===============================================" + echo " NOTE: You must refresh AppLoad to see changes " + echo " reflected in the tablet UI " + echo "===============================================" + echo "" +} +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf /home/root/xovi/exthome/appload/rmstream + fi + + echo "" + echo "===============================================" + echo " NOTE: You must refresh AppLoad to see changes " + echo " reflected in the tablet UI " + echo "===============================================" + echo "" +} + sha512sums=" 3e370b80beec32a83b3defb6a0be149d76fcb2e8ad827e695ab5a30930a4cb7a9be16db499123392f2338d942a26ff767585a6e3686c5b9455e71f507655aca1 rmstream-aarch64.zip ae2d9b8120945e5b27aef430078afbf84840a874ca4452c436bff7d8498a7909329e1d030003856c19a2865f35bb2c030a0f21dba27cc53c42e8ef012deb5579 rmstream-arm32.zip diff --git a/packages/rmstream/rmstream.post-deinstall b/packages/rmstream/rmstream.post-deinstall deleted file mode 100644 index 65b22bb..0000000 --- a/packages/rmstream/rmstream.post-deinstall +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/xovi/exthome/appload/rmstream -fi - -echo "" -echo "===============================================" -echo " NOTE: You must refresh AppLoad to see changes " -echo " reflected in the tablet UI " -echo "===============================================" -echo "" diff --git a/packages/rmstream/rmstream.post-install b/packages/rmstream/rmstream.post-install deleted file mode 100644 index 5634714..0000000 --- a/packages/rmstream/rmstream.post-install +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo "" -echo "===============================================" -echo " NOTE: You must refresh AppLoad to see changes " -echo " reflected in the tablet UI " -echo "===============================================" -echo "" diff --git a/packages/rmtree/APKBUILD b/packages/rmtree/VELBUILD similarity index 96% rename from packages/rmtree/APKBUILD rename to packages/rmtree/VELBUILD index 00db035..2fc9482 100644 --- a/packages/rmtree/APKBUILD +++ b/packages/rmtree/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=rmtree pkgver=1.0.1 pkgrel=1 -_upstream_author="rmitchellscott" -_category="utilities" +upstream_author="rmitchellscott" +category="utilities" pkgdesc="Display reMarkable document hierarchy in tree format" url="https://github.com/rmitchellscott/rmtree" arch="aarch64 armv7" diff --git a/packages/rubber-eraser-rm1/APKBUILD b/packages/rubber-eraser-rm1/VELBUILD similarity index 96% rename from packages/rubber-eraser-rm1/APKBUILD rename to packages/rubber-eraser-rm1/VELBUILD index c800d76..5559cfc 100644 --- a/packages/rubber-eraser-rm1/APKBUILD +++ b/packages/rubber-eraser-rm1/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=rubber-eraser-rm1 pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Make the rubber eraser on a pen work as eraser on rM1." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/scroll-screen-up-or-down/APKBUILD b/packages/scroll-screen-up-or-down/VELBUILD similarity index 68% rename from packages/scroll-screen-up-or-down/APKBUILD rename to packages/scroll-screen-up-or-down/VELBUILD index 75a287c..75e237d 100644 --- a/packages/scroll-screen-up-or-down/APKBUILD +++ b/packages/scroll-screen-up-or-down/VELBUILD @@ -2,14 +2,13 @@ maintainer="Mitchell Scott " pkgname=scroll-screen-up-or-down pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Screen scrolling with page change at boundaries. Prerequisite for tap and arrow key navigation." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" license="GPL-2.0" depends="qt-resource-rebuilder remarkable-os>=3.25 remarkable-os<3.26" -install="$pkgname.post-install $pkgname.post-deinstall" _commit="82f0526a81a46751dd4c16d7c27f754a6afa23ec" source=" scrollScreenUpOrDown.qmd::https://raw.githubusercontent.com/ingatellent/xovi-qmd-extensions/$_commit/3.25/scrollScreenUpOrDown.qmd @@ -26,6 +25,32 @@ package() { echo "https://github.com/ingatellent/xovi-qmd-extensions" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } + +postinstall(){ + LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" + QMD_FILE="ingatellent/scrollScreenUpOrDown.qmd" + + if ! grep -q "LOAD $QMD_FILE" "$LOADER" 2>/dev/null; then + if [ ! -s "$LOADER" ]; then + echo "LOAD $QMD_FILE" > "$LOADER" + else + sed -i "1i LOAD $QMD_FILE" "$LOADER" + fi + fi +} +postdeinstall(){ + LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" + + if [ -f "$LOADER" ]; then + QMD_FILE="ingatellent/scrollScreenUpOrDown.qmd" + sed -i "\|^LOAD $QMD_FILE$|d" "$LOADER" + + if [ ! -s "$LOADER" ]; then + rm -f "$LOADER" + fi + fi +} + sha512sums=" 12a79365f2e60262204cbe1cfb841d21d148a1d0997413a93138c37a39b156a285c1b19716ea565eebe5c85a3a826c6e2d8cecd845d1e427693f4cc13d484694 scrollScreenUpOrDown.qmd aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957 LICENSE diff --git a/packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-deinstall b/packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-deinstall deleted file mode 100644 index 20aa6cd..0000000 --- a/packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-deinstall +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" -QMD_FILE="ingatellent/scrollScreenUpOrDown.qmd" - -if [ -f "$LOADER" ]; then - sed -i "\|^LOAD $QMD_FILE$|d" "$LOADER" - - if [ ! -s "$LOADER" ]; then - rm -f "$LOADER" - fi -fi diff --git a/packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-install b/packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-install deleted file mode 100644 index 91de3aa..0000000 --- a/packages/scroll-screen-up-or-down/scroll-screen-up-or-down.post-install +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" -QMD_FILE="ingatellent/scrollScreenUpOrDown.qmd" - -if ! grep -q "LOAD $QMD_FILE" "$LOADER" 2>/dev/null; then - if [ ! -s "$LOADER" ]; then - echo "LOAD $QMD_FILE" > "$LOADER" - else - sed -i "1i LOAD $QMD_FILE" "$LOADER" - fi -fi diff --git a/packages/selection-erase/APKBUILD b/packages/selection-erase/VELBUILD similarity index 96% rename from packages/selection-erase/APKBUILD rename to packages/selection-erase/VELBUILD index dc9dbee..bef71be 100644 --- a/packages/selection-erase/APKBUILD +++ b/packages/selection-erase/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=selection-erase pkgver=1.0.3 pkgrel=1 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Adds the ability to delete a stroke once selected by the selection tool." url="https://github.com/FouzR/xovi-extensions" arch="noarch" diff --git a/packages/selection-stuff/APKBUILD b/packages/selection-stuff/VELBUILD similarity index 96% rename from packages/selection-stuff/APKBUILD rename to packages/selection-stuff/VELBUILD index 76c049a..05e57af 100644 --- a/packages/selection-stuff/APKBUILD +++ b/packages/selection-stuff/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=selection-stuff pkgver=1.0.2 pkgrel=1 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Adds the ability to select everything above the line." url="https://github.com/FouzR/xovi-extensions" arch="noarch" diff --git a/packages/settings-rmsync-restart/APKBUILD b/packages/settings-rmsync-restart/VELBUILD similarity index 96% rename from packages/settings-rmsync-restart/APKBUILD rename to packages/settings-rmsync-restart/VELBUILD index 3797f91..a8f2553 100644 --- a/packages/settings-rmsync-restart/APKBUILD +++ b/packages/settings-rmsync-restart/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=settings-rmsync-restart pkgver=1.0.0 pkgrel=0 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Adds a button to the cloud settings page to restart sync service." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/shortcuts-to-choose-eraser/APKBUILD b/packages/shortcuts-to-choose-eraser/VELBUILD similarity index 96% rename from packages/shortcuts-to-choose-eraser/APKBUILD rename to packages/shortcuts-to-choose-eraser/VELBUILD index be61eb1..f005fc5 100644 --- a/packages/shortcuts-to-choose-eraser/APKBUILD +++ b/packages/shortcuts-to-choose-eraser/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=shortcuts-to-choose-eraser pkgver=1.0.0 pkgrel=1 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Use stylus side button for erase selection and rubber eraser as regular eraser." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/sidebar-clock/APKBUILD b/packages/sidebar-clock/VELBUILD similarity index 96% rename from packages/sidebar-clock/APKBUILD rename to packages/sidebar-clock/VELBUILD index 49b789f..934479e 100644 --- a/packages/sidebar-clock/APKBUILD +++ b/packages/sidebar-clock/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=sidebar-clock pkgver=1.0.0 pkgrel=0 -_upstream_author="NohamR" -_category="ui" +upstream_author="NohamR" +category="ui" pkgdesc="Adds a live clock to the library sidebar; tap the entry to toggle seconds display." url="https://github.com/NohamR/xovi-qmd-extensions" arch="noarch" diff --git a/packages/starship/APKBUILD b/packages/starship/VELBUILD similarity index 62% rename from packages/starship/APKBUILD rename to packages/starship/VELBUILD index c81d32f..4df1c10 100644 --- a/packages/starship/APKBUILD +++ b/packages/starship/VELBUILD @@ -2,14 +2,13 @@ maintainer="notfrants " pkgname=starship pkgver=1.24.2 pkgrel=0 -_upstream_author="starship" -_category="utilities" +upstream_author="starship" +category="utilities" pkgdesc="The minimal, blazing-fast, and infinitely customizable prompt for any shell!" url="https://starship.rs/" arch="aarch64 armv7" license="ISC" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" source=" https://github.com/starship/starship/releases/download/v$pkgver/starship-aarch64-unknown-linux-musl.tar.gz @@ -33,6 +32,38 @@ package() { echo "https://github.com/starship/starship/archive/refs/tags/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + +postinstall(){ + /home/root/.vellum/bin/starship completions bash > \ + /home/root/.vellum/share/bash-completion/completions/starship + + echo "" + echo "===========================================================================" + echo " NOTE: To enable starship, you must add" + echo ' `eval "$(starship init bash)"`' + echo " to the end of ~/.bashrc." + echo "" + echo " See https://starship.rs/guide/#step-2-set-up-your-shell-to-use-starship" + echo " for more information." + echo "===========================================================================" + echo "" +} + +postupgrade(){ + /home/root/.vellum/bin/starship completions bash > \ + /home/root/.vellum/share/bash-completion/completions/starship +} + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf \ + /home/root/.config/starship.toml \ + /home/root/.cache/starship + fi + + rm -f /home/root/.vellum/share/bash-completion/completions/starship +} + sha512sums=" 053fbbb7c028ebc4eb4062a891d8b123bb00e228f3999a64a9e8632997d83d8a90da721a836f3206c3ea9955c14484d79bbfe72570cc453fc8ba989a32fdd23f starship-aarch64-unknown-linux-musl.tar.gz e7ccebe96b23e7b896ab81fbe92fff021c0d71a30e44f41fd4f2102b6100914bc8ed407d07ef441073cc928f6b58b94cabb864998debc35ed51f0b8218e21fa4 starship-arm-unknown-linux-musleabihf.tar.gz diff --git a/packages/starship/starship.post-deinstall b/packages/starship/starship.post-deinstall deleted file mode 100644 index 383239d..0000000 --- a/packages/starship/starship.post-deinstall +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -f /home/root/.config/starship.toml - rm -rf /home/root/.cache/starship -fi - -rm -f /home/root/.vellum/share/bash-completion/completions/starship diff --git a/packages/starship/starship.post-install b/packages/starship/starship.post-install deleted file mode 100644 index 4d62bfe..0000000 --- a/packages/starship/starship.post-install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -/home/root/.vellum/bin/starship completions bash > \ - /home/root/.vellum/share/bash-completion/completions/starship - -echo "" -echo "===========================================================================" -echo " NOTE: To enable starship, you must add" -echo ' `eval "$(starship init bash)"`' -echo " to the end of ~/.bashrc." -echo "" -echo " See https://starship.rs/guide/#step-2-set-up-your-shell-to-use-starship" -echo " for more information." -echo "===========================================================================" -echo "" diff --git a/packages/starship/starship.post-upgrade b/packages/starship/starship.post-upgrade deleted file mode 100644 index 99d1bee..0000000 --- a/packages/starship/starship.post-upgrade +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/home/root/.vellum/bin/starship completions bash > \ - /home/root/.vellum/share/bash-completion/completions/starship diff --git a/packages/stylus-button-eraser/APKBUILD b/packages/stylus-button-eraser/VELBUILD similarity index 96% rename from packages/stylus-button-eraser/APKBUILD rename to packages/stylus-button-eraser/VELBUILD index 5431098..4108371 100644 --- a/packages/stylus-button-eraser/APKBUILD +++ b/packages/stylus-button-eraser/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=stylus-button-eraser pkgver=2.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Erases when stylus side button is held." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/stylus-button-undo-redo/APKBUILD b/packages/stylus-button-undo-redo/VELBUILD similarity index 96% rename from packages/stylus-button-undo-redo/APKBUILD rename to packages/stylus-button-undo-redo/VELBUILD index bc190dd..847bc95 100644 --- a/packages/stylus-button-undo-redo/APKBUILD +++ b/packages/stylus-button-undo-redo/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=stylus-button-undo-redo pkgver=1.0.0 pkgrel=0 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Double-click stylus button to undo, triple-click to redo." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/swipe-to-hide-or-show-toolbar/APKBUILD b/packages/swipe-to-hide-or-show-toolbar/VELBUILD similarity index 96% rename from packages/swipe-to-hide-or-show-toolbar/APKBUILD rename to packages/swipe-to-hide-or-show-toolbar/VELBUILD index 8f71c95..4eabbab 100644 --- a/packages/swipe-to-hide-or-show-toolbar/APKBUILD +++ b/packages/swipe-to-hide-or-show-toolbar/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=swipe-to-hide-or-show-toolbar pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Swipe from toolbar edge to show/hide the toolbar." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/tag-button/APKBUILD b/packages/tag-button/VELBUILD similarity index 96% rename from packages/tag-button/APKBUILD rename to packages/tag-button/VELBUILD index 4c8a716..2c54f8c 100644 --- a/packages/tag-button/APKBUILD +++ b/packages/tag-button/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=tag-button pkgver=1.0.0 pkgrel=0 -_upstream_author="NohamR" -_category="ui" +upstream_author="NohamR" +category="ui" pkgdesc="Puts a Tag action next to other list controls to open the tag editor directly." url="https://github.com/NohamR/xovi-qmd-extensions" arch="noarch" diff --git a/packages/tailscale/APKBUILD b/packages/tailscale/VELBUILD similarity index 58% rename from packages/tailscale/APKBUILD rename to packages/tailscale/VELBUILD index c1bdb3e..859c900 100644 --- a/packages/tailscale/APKBUILD +++ b/packages/tailscale/VELBUILD @@ -2,8 +2,8 @@ maintainer="Interloper <45214659+0xdeb7ef@users.noreply.github.com>" pkgname=tailscale pkgver=1.94.1 pkgrel=0 -_upstream_author="tailscale" -_category="utilities" +upstream_author="tailscale" +category="utilities" pkgdesc="Tailscale VPN client" url="https://tailscale.com" arch="aarch64 armv7" @@ -11,11 +11,6 @@ license="BSD-3-Clause" options="!check !fhs !strip !tracedeps" depends="mount-utils" builddir="$srcdir/tailscale" -install=" -$pkgname.post-install -$pkgname.post-upgrade -$pkgname.pre-deinstall -" source=" https://dl.tailscale.com/stable/tailscale_${pkgver}_arm.tgz @@ -68,6 +63,78 @@ package() { "$pkgdir/home/root/.vellum/hooks/post-os-upgrade/$pkgname" } +postinstall(){ + /home/root/.vellum/bin/mount-rw + + echo "installing tailscaled.service..." + cp /home/root/.vellum/share/tailscale/systemd/tailscaled.service /etc/systemd/system/tailscaled.service + + echo "reloading systemd daemon" + systemctl daemon-reload + + echo "enabling tailscaled service..." + systemctl enable tailscaled.service + + /home/root/.vellum/bin/mount-restore + + echo "restarting tailscaled service..." + systemctl restart tailscaled.service +} + +postupgrade(){ + /home/root/.vellum/bin/mount-rw + + echo "installing tailscaled.service..." + cp /home/root/.vellum/share/tailscale/systemd/tailscaled.service /etc/systemd/system/tailscaled.service + + echo "reloading systemd daemon" + systemctl daemon-reload + + echo "enabling tailscaled service..." + systemctl enable tailscaled.service + + /home/root/.vellum/bin/mount-restore + + echo "restarting tailscaled service..." + systemctl restart tailscaled.service +} + +postosupgrade(){ + echo " * re-installing tailscaled.service..." + cp /home/root/.vellum/share/tailscale/systemd/tailscaled.service /etc/systemd/system/tailscaled.service + + echo " * reloading systemd daemon" + systemctl daemon-reload + + echo " * enabling tailscaled service..." + systemctl enable tailscaled.service + + echo " * restarting tailscaled service..." + systemctl restart tailscaled.service +} + +predeinstall(){ + /home/root/.vellum/bin/mount-rw + + echo "stopping tailscaled service..." + systemctl disable --now tailscaled.service + + echo "removing tailscaled.service..." + rm -f /etc/systemd/system/tailscaled.service + + /home/root/.vellum/bin/mount-restore + + echo "reloading systemd daemon" + systemctl daemon-reload + + if [ "$VELLUM_PURGE" = "1" ]; then + echo "deleting tailscale config files..." + rm -rf \ + /home/root/.local/var/lib/tailscale \ + /home/root/.config/tailscale + fi +} + sha512sums=" 861b8b7103707f7a9ee4719e136429759d903c9f61c435803ede82ee65cb93fac38f3133a7edcc537b6f2d00976426ebd751031cbf93a355d01aef3f7e88866b tailscale_1.94.1_arm.tgz 93fba9144a3df577c11dfb31dd92ef9635daf8dd52e599adf370c926d6e4aab8066f8b0711556af50db52802365f9b363c757a4509736dce8faad5c0cc57cc11 tailscale_1.94.1_arm64.tgz diff --git a/packages/tailscale/tailscale.post-install b/packages/tailscale/tailscale.post-install deleted file mode 100644 index ca6f667..0000000 --- a/packages/tailscale/tailscale.post-install +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -/home/root/.vellum/bin/mount-rw - -echo "installing tailscaled.service..." -cp /home/root/.vellum/share/tailscale/systemd/tailscaled.service /etc/systemd/system/tailscaled.service - -echo "reloading systemd daemon" -systemctl daemon-reload - -echo "enabling tailscaled service..." -systemctl enable tailscaled.service - -/home/root/.vellum/bin/mount-restore - -echo "restarting tailscaled service..." -systemctl restart tailscaled.service diff --git a/packages/tailscale/tailscale.post-os-upgrade b/packages/tailscale/tailscale.post-os-upgrade deleted file mode 100644 index 3bf6278..0000000 --- a/packages/tailscale/tailscale.post-os-upgrade +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -echo " * re-installing tailscaled.service..." -cp /home/root/.vellum/share/tailscale/systemd/tailscaled.service /etc/systemd/system/tailscaled.service - -echo " * reloading systemd daemon" -systemctl daemon-reload - -echo " * enabling tailscaled service..." -systemctl enable tailscaled.service - -echo " * restarting tailscaled service..." -systemctl restart tailscaled.service diff --git a/packages/tailscale/tailscale.post-upgrade b/packages/tailscale/tailscale.post-upgrade deleted file mode 100644 index ca6f667..0000000 --- a/packages/tailscale/tailscale.post-upgrade +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -/home/root/.vellum/bin/mount-rw - -echo "installing tailscaled.service..." -cp /home/root/.vellum/share/tailscale/systemd/tailscaled.service /etc/systemd/system/tailscaled.service - -echo "reloading systemd daemon" -systemctl daemon-reload - -echo "enabling tailscaled service..." -systemctl enable tailscaled.service - -/home/root/.vellum/bin/mount-restore - -echo "restarting tailscaled service..." -systemctl restart tailscaled.service diff --git a/packages/tailscale/tailscale.pre-deinstall b/packages/tailscale/tailscale.pre-deinstall deleted file mode 100644 index b29609c..0000000 --- a/packages/tailscale/tailscale.pre-deinstall +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -/home/root/.vellum/bin/mount-rw - -echo "stopping tailscaled service..." -systemctl disable --now tailscaled.service - -echo "removing tailscaled.service..." -rm -f /etc/systemd/system/tailscaled.service - -/home/root/.vellum/bin/mount-restore - -echo "reloading systemd daemon" -systemctl daemon-reload - -if [ "$VELLUM_PURGE" = "1" ]; then - echo "deleting tailscale config files..." - rm -rf /home/root/.local/var/lib/tailscale - rm -rf /home/root/.config/tailscale -fi diff --git a/packages/tap-to-change-view-or-page/APKBUILD b/packages/tap-to-change-view-or-page/VELBUILD similarity index 71% rename from packages/tap-to-change-view-or-page/APKBUILD rename to packages/tap-to-change-view-or-page/VELBUILD index aebc48c..f0ff9fc 100644 --- a/packages/tap-to-change-view-or-page/APKBUILD +++ b/packages/tap-to-change-view-or-page/VELBUILD @@ -2,15 +2,14 @@ maintainer="Mitchell Scott " pkgname=tap-to-change-view-or-page pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Tap screen edges to scroll/navigate pages when toolbar is hidden." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" license="GPL-2.0" depends="qt-resource-rebuilder scroll-screen-up-or-down remarkable-os>=3.25 remarkable-os<3.26" replaces="gesture-tap-to-page" -install="$pkgname.post-install $pkgname.post-deinstall" _commit="82f0526a81a46751dd4c16d7c27f754a6afa23ec" source=" tapToChangeViewOrPage.qmd::https://raw.githubusercontent.com/ingatellent/xovi-qmd-extensions/$_commit/3.25/tapToChangeViewOrPage.qmd @@ -27,6 +26,31 @@ package() { echo "https://github.com/ingatellent/xovi-qmd-extensions" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } + +postinstall(){ + LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" + QMD_FILE="ingatellent/tapToChangeViewOrPage.qmd" + + touch "$LOADER" + + if ! grep -q "LOAD $QMD_FILE" "$LOADER"; then + echo "LOAD $QMD_FILE" >> "$LOADER" + fi +} + +postdeinstall(){ + LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" + + if [ -f "$LOADER" ]; then + QMD_FILE="ingatellent/tapToChangeViewOrPage.qmd" + sed -i "\|^LOAD $QMD_FILE$|d" "$LOADER" + + if [ ! -s "$LOADER" ]; then + rm -f "$LOADER" + fi + fi +} + sha512sums=" c2ba6ead87d44ed7d04ce82f5d950bbefa5bc88fb57a82e7fa8226d53dcabdf0487ae12715cdb7e4ba391b9477cd6cdad1c158e450cb674b5557d83a73879459 tapToChangeViewOrPage.qmd aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957 LICENSE diff --git a/packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-deinstall b/packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-deinstall deleted file mode 100644 index fae7b4c..0000000 --- a/packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-deinstall +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" -QMD_FILE="ingatellent/tapToChangeViewOrPage.qmd" - -if [ -f "$LOADER" ]; then - sed -i "\|^LOAD $QMD_FILE$|d" "$LOADER" - - if [ ! -s "$LOADER" ]; then - rm -f "$LOADER" - fi -fi diff --git a/packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-install b/packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-install deleted file mode 100644 index 1982cbe..0000000 --- a/packages/tap-to-change-view-or-page/tap-to-change-view-or-page.post-install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -LOADER="/home/root/xovi/exthome/qt-resource-rebuilder/_ingatellent.qmd" -QMD_FILE="ingatellent/tapToChangeViewOrPage.qmd" - -touch "$LOADER" - -if ! grep -q "LOAD $QMD_FILE" "$LOADER"; then - echo "LOAD $QMD_FILE" >> "$LOADER" -fi diff --git a/packages/three-finger-swipe-to-reset-view/APKBUILD b/packages/three-finger-swipe-to-reset-view/VELBUILD similarity index 96% rename from packages/three-finger-swipe-to-reset-view/APKBUILD rename to packages/three-finger-swipe-to-reset-view/VELBUILD index 41c5cb0..945ec04 100644 --- a/packages/three-finger-swipe-to-reset-view/APKBUILD +++ b/packages/three-finger-swipe-to-reset-view/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=three-finger-swipe-to-reset-view pkgver=1.0.0 pkgrel=0 -_upstream_author="ingatellent" -_category="ui" +upstream_author="ingatellent" +category="ui" pkgdesc="Swipe down with three fingers to reset pan and zoom to 100%." url="https://github.com/ingatellent/xovi-qmd-extensions" arch="noarch" diff --git a/packages/tilem/APKBUILD b/packages/tilem/VELBUILD similarity index 71% rename from packages/tilem/APKBUILD rename to packages/tilem/VELBUILD index b9492e3..7c36b24 100644 --- a/packages/tilem/APKBUILD +++ b/packages/tilem/VELBUILD @@ -2,15 +2,14 @@ maintainer="notfrants " pkgname=tilem pkgver=0.1.3_git6 pkgrel=1 -_upstream_author="timower" -_category="apps" +upstream_author="timower" +category="apps" pkgdesc="A TI-84+ calculator emulator for the remarkable." url="https://github.com/timower/rM2-stuff" arch="aarch64 armv7" license="GPL-3.0" depends="appload curl" options="!check !fhs !strip !tracedeps" -install="$pkgname.post-install $pkgname.post-deinstall" source=" https://github.com/notfrants/vellum-builds/releases/download/v0.1.0/tilem-aarch64.tar.gz @@ -38,6 +37,28 @@ package() { install -Dm644 "$srcdir"/SOURCES \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + +postinstall(){ + echo "" + echo "================================================" + echo " NOTE: To use TilEm, you must refresh AppLoad" + echo "================================================" + echo "" +} + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf /home/root/xovi/exthome/appload/tilem + fi + + echo "" + echo "=================================================" + echo " NOTE: You must refresh AppLoad to see changes" + echo " reflected in the tablet UI" + echo "=================================================" + echo "" +} + sha512sums=" 462a21c0f440cc789fc383461f219cb8ccea968de03b278d1ef501eddad8995823febad468a5b7133ff2f97f3d7da08edac6787f496bdff554558f92e5e9a470 tilem-aarch64.tar.gz 7d8a159bd0294cabb29ab2e5cd5feaac8005462278b1e60d87af8e44cc540ca7f937cbcedea200beb3eb0b898083dc9427b0f14d039d2e3cc1b5b74337bc03c5 tilem-arm32.tar.gz diff --git a/packages/tilem/tilem.post-deinstall b/packages/tilem/tilem.post-deinstall deleted file mode 100644 index 8624e81..0000000 --- a/packages/tilem/tilem.post-deinstall +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/xovi/exthome/appload/tilem -fi - -echo "" -echo "=================================================" -echo " NOTE: You must refresh AppLoad to see changes" -echo " reflected in the tablet UI" -echo "=================================================" -echo "" diff --git a/packages/tilem/tilem.post-install b/packages/tilem/tilem.post-install deleted file mode 100644 index bc6e316..0000000 --- a/packages/tilem/tilem.post-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -echo "" -echo "================================================" -echo " NOTE: To use TilEm, you must refresh AppLoad" -echo "================================================" -echo "" diff --git a/packages/toolbar-icon/APKBUILD b/packages/toolbar-icon/VELBUILD similarity index 96% rename from packages/toolbar-icon/APKBUILD rename to packages/toolbar-icon/VELBUILD index 33e85df..754e362 100644 --- a/packages/toolbar-icon/APKBUILD +++ b/packages/toolbar-icon/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=toolbar-icon pkgver=1.0.7 pkgrel=0 -_upstream_author="FouzR" -_category="ui" +upstream_author="FouzR" +category="ui" pkgdesc="Adds an icon with current tool, thickness, and colour in place of the toolbar-expand button while the toolbar is hidden." url="https://github.com/FouzR/xovi-extensions" arch="noarch" diff --git a/packages/tripletap/APKBUILD b/packages/tripletap/VELBUILD similarity index 50% rename from packages/tripletap/APKBUILD rename to packages/tripletap/VELBUILD index f812118..7bb4aa9 100644 --- a/packages/tripletap/APKBUILD +++ b/packages/tripletap/VELBUILD @@ -2,14 +2,13 @@ maintainer="Mitchell Scott " pkgname=tripletap pkgver=1.0.0 pkgrel=1 -_upstream_author="rmitchellscott" -_category="utilities" +upstream_author="rmitchellscott" +category="utilities" pkgdesc="Start xovi by triple-pressing the power button" url="https://github.com/rmitchellscott/xovi-tripletap" arch="aarch64 armv7" license="MIT" depends="xovi mount-utils" -install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade $pkgname.pre-deinstall" source=" $pkgname-$pkgver.tar.gz::https://github.com/rmitchellscott/xovi-tripletap/archive/v$pkgver.tar.gz LICENSE::https://raw.githubusercontent.com/rmitchellscott/xovi-tripletap/main/LICENSE @@ -54,6 +53,74 @@ package() { install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ "$pkgdir/home/root/.vellum/hooks/post-os-upgrade/$pkgname" } + +postinstall(){ + /home/root/xovi-tripletap/enable.sh +} + +preupgrade(){ + CONFIG_FILE="/home/root/xovi-tripletap/config" + MAIN_SH="/home/root/xovi-tripletap/main.sh" + + [ -f "$CONFIG_FILE" ] && exit 0 + + DEFAULT_ENABLE_VERSION_SWITCHING="false" + DEFAULT_TRIGGER_ACTION='"start"' + DEFAULT_TIME_THRESHOLD="2" + DEFAULT_REQUIRED_PRESSES="3" + + if [ -f "$MAIN_SH" ]; then + ENABLE_VERSION_SWITCHING=$(grep -E '^ENABLE_VERSION_SWITCHING=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | cut -d'#' -f1 | tr -d ' ') + TRIGGER_ACTION=$(grep -E '^TRIGGER_ACTION=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | cut -d'#' -f1 | tr -d ' ') + TIME_THRESHOLD=$(grep -E '^TIME_THRESHOLD=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | tr -d ' ' | cut -d'#' -f1 | tr -d ' ') + REQUIRED_PRESSES=$(grep -E '^REQUIRED_PRESSES=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | tr -d ' ' | cut -d'#' -f1 | tr -d ' ') + fi + + ENABLE_VERSION_SWITCHING=${ENABLE_VERSION_SWITCHING:-$DEFAULT_ENABLE_VERSION_SWITCHING} + TRIGGER_ACTION=${TRIGGER_ACTION:-$DEFAULT_TRIGGER_ACTION} + TIME_THRESHOLD=${TIME_THRESHOLD:-$DEFAULT_TIME_THRESHOLD} + REQUIRED_PRESSES=${REQUIRED_PRESSES:-$DEFAULT_REQUIRED_PRESSES} + + cat > "$CONFIG_FILE" << EOF +ENABLE_VERSION_SWITCHING=${ENABLE_VERSION_SWITCHING} +TRIGGER_ACTION=${TRIGGER_ACTION} +TIME_THRESHOLD=${TIME_THRESHOLD} +REQUIRED_PRESSES=${REQUIRED_PRESSES} +PRE_START_COMMANDS=() +POST_START_COMMANDS=() +EOF +} + +postupgrade(){ + /home/root/xovi-tripletap/enable.sh +} + +postosupgrade(){ + cp /home/root/xovi-tripletap/xovi-tripletap.service /etc/systemd/system/ + systemctl daemon-reload + systemctl enable xovi-tripletap --now +} + +predeinstall(){ + /home/root/.vellum/bin/mount-rw + + if [ "$VELLUM_PURGE" = "1" ]; then + /home/root/xovi-tripletap/uninstall.sh + else + systemctl stop xovi-tripletap 2>/dev/null || true + systemctl disable xovi-tripletap 2>/dev/null || true + rm -f /etc/systemd/system/xovi-tripletap.service + systemctl daemon-reload + + if [ -f /home/root/xovi-tripletap/config ]; then + echo "Note: /home/root/xovi-tripletap/config preserved" + echo " Use 'vellum purge tripletap' to remove everything" + fi + fi + + /home/root/.vellum/bin/mount-restore +} + sha512sums=" 0ae119c57a2829877fb0ed7e82eea23938e1ad97d226b428e1e18b7f074ad3f35e0be520c2fc1d47f82151c0975bf54b4adc40c5eae9af68726633effed17b2f tripletap-1.0.0.tar.gz b7a86c9fc7a740ff680037b0e6b646ccd70e4e74fef78669b8ba92e18b873e4673fbba064272c595d13bc016288cd4a0532cd974534b7fef43a5b065f24add95 LICENSE diff --git a/packages/tripletap/tripletap.post-install b/packages/tripletap/tripletap.post-install deleted file mode 100644 index c61a473..0000000 --- a/packages/tripletap/tripletap.post-install +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/home/root/xovi-tripletap/enable.sh diff --git a/packages/tripletap/tripletap.post-os-upgrade b/packages/tripletap/tripletap.post-os-upgrade deleted file mode 100644 index 96382f0..0000000 --- a/packages/tripletap/tripletap.post-os-upgrade +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -cp /home/root/xovi-tripletap/xovi-tripletap.service /etc/systemd/system/ -systemctl daemon-reload -systemctl enable xovi-tripletap --now diff --git a/packages/tripletap/tripletap.post-upgrade b/packages/tripletap/tripletap.post-upgrade deleted file mode 100644 index c61a473..0000000 --- a/packages/tripletap/tripletap.post-upgrade +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/home/root/xovi-tripletap/enable.sh diff --git a/packages/tripletap/tripletap.pre-deinstall b/packages/tripletap/tripletap.pre-deinstall deleted file mode 100644 index fed3183..0000000 --- a/packages/tripletap/tripletap.pre-deinstall +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -/home/root/.vellum/bin/mount-rw - -if [ "$VELLUM_PURGE" = "1" ]; then - /home/root/xovi-tripletap/uninstall.sh -else - systemctl stop xovi-tripletap 2>/dev/null || true - systemctl disable xovi-tripletap 2>/dev/null || true - rm -f /etc/systemd/system/xovi-tripletap.service - systemctl daemon-reload - - if [ -f /home/root/xovi-tripletap/config ]; then - echo "Note: /home/root/xovi-tripletap/config preserved" - echo " Use 'vellum purge tripletap' to remove everything" - fi -fi - -/home/root/.vellum/bin/mount-restore diff --git a/packages/tripletap/tripletap.pre-upgrade b/packages/tripletap/tripletap.pre-upgrade deleted file mode 100644 index 003ce7a..0000000 --- a/packages/tripletap/tripletap.pre-upgrade +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -CONFIG_FILE="/home/root/xovi-tripletap/config" -MAIN_SH="/home/root/xovi-tripletap/main.sh" - -[ -f "$CONFIG_FILE" ] && exit 0 - -DEFAULT_ENABLE_VERSION_SWITCHING="false" -DEFAULT_TRIGGER_ACTION='"start"' -DEFAULT_TIME_THRESHOLD="2" -DEFAULT_REQUIRED_PRESSES="3" - -if [ -f "$MAIN_SH" ]; then - ENABLE_VERSION_SWITCHING=$(grep -E '^ENABLE_VERSION_SWITCHING=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | cut -d'#' -f1 | tr -d ' ') - TRIGGER_ACTION=$(grep -E '^TRIGGER_ACTION=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | cut -d'#' -f1 | tr -d ' ') - TIME_THRESHOLD=$(grep -E '^TIME_THRESHOLD=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | tr -d ' ' | cut -d'#' -f1 | tr -d ' ') - REQUIRED_PRESSES=$(grep -E '^REQUIRED_PRESSES=' "$MAIN_SH" | head -n 1 | cut -d'=' -f2 | tr -d ' ' | cut -d'#' -f1 | tr -d ' ') -fi - -ENABLE_VERSION_SWITCHING=${ENABLE_VERSION_SWITCHING:-$DEFAULT_ENABLE_VERSION_SWITCHING} -TRIGGER_ACTION=${TRIGGER_ACTION:-$DEFAULT_TRIGGER_ACTION} -TIME_THRESHOLD=${TIME_THRESHOLD:-$DEFAULT_TIME_THRESHOLD} -REQUIRED_PRESSES=${REQUIRED_PRESSES:-$DEFAULT_REQUIRED_PRESSES} - -cat > "$CONFIG_FILE" << EOF -ENABLE_VERSION_SWITCHING=${ENABLE_VERSION_SWITCHING} -TRIGGER_ACTION=${TRIGGER_ACTION} -TIME_THRESHOLD=${TIME_THRESHOLD} -REQUIRED_PRESSES=${REQUIRED_PRESSES} -PRE_START_COMMANDS=() -POST_START_COMMANDS=() -EOF diff --git a/packages/uncompress-dock/APKBUILD b/packages/uncompress-dock/VELBUILD similarity index 96% rename from packages/uncompress-dock/APKBUILD rename to packages/uncompress-dock/VELBUILD index d377701..cb64df9 100644 --- a/packages/uncompress-dock/APKBUILD +++ b/packages/uncompress-dock/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=uncompress-dock pkgver=1.0.0 pkgrel=0 -_upstream_author="NohamR" -_category="ui" +upstream_author="NohamR" +category="ui" pkgdesc="Replaces the More menu in the document dock with dedicated notebook, folder, and quick sheet buttons." url="https://github.com/NohamR/xovi-qmd-extensions" arch="noarch" diff --git a/packages/unlock-methods-content/APKBUILD b/packages/unlock-methods-content/VELBUILD similarity index 96% rename from packages/unlock-methods-content/APKBUILD rename to packages/unlock-methods-content/VELBUILD index 55e6d61..ef2466d 100644 --- a/packages/unlock-methods-content/APKBUILD +++ b/packages/unlock-methods-content/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=unlock-methods-content pkgver=1.0.2 pkgrel=1 -_upstream_author="rmitchellscott" -_category="ui" +upstream_author="rmitchellscott" +category="ui" pkgdesc="Bypasses subscription check for using on-device Methods templates and documents." url="https://github.com/rmitchellscott/xovi-qmd-extensions" arch="noarch" diff --git a/packages/vellum-bash-completion/APKBUILD b/packages/vellum-bash-completion/VELBUILD similarity index 97% rename from packages/vellum-bash-completion/APKBUILD rename to packages/vellum-bash-completion/VELBUILD index 41f6640..d56c5bf 100644 --- a/packages/vellum-bash-completion/APKBUILD +++ b/packages/vellum-bash-completion/VELBUILD @@ -2,8 +2,8 @@ maintainer="Mitchell Scott " pkgname=vellum-bash-completion pkgver=3.0.3 pkgrel=3 -_upstream_author="vellum-dev" -_category="utilities" +upstream_author="vellum-dev" +category="utilities" pkgdesc="Bash completion for vellum package manager" url="https://github.com/vellum-dev/apk-tools" arch="noarch" diff --git a/packages/vellum-hosts/APKBUILD b/packages/vellum-hosts/VELBUILD similarity index 63% rename from packages/vellum-hosts/APKBUILD rename to packages/vellum-hosts/VELBUILD index 615da6e..ac48f82 100644 --- a/packages/vellum-hosts/APKBUILD +++ b/packages/vellum-hosts/VELBUILD @@ -2,14 +2,13 @@ maintainer="Mitchell Scott " pkgname=vellum-hosts pkgver=1.0.0 pkgrel=0 -_upstream_author="vellum-dev" -_category="utilities" +upstream_author="vellum-dev" +category="utilities" pkgdesc="Adds packages.vellum.delivery IP addresses to /etc/hosts" url="https://github.com/vellum-dev/vellum" arch="noarch" license="MIT" depends="mount-utils" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" options="!check !fhs !strip !tracedeps" source=" update-hosts.sh @@ -31,6 +30,32 @@ package() { install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ "$pkgdir/home/root/.vellum/hooks/post-os-upgrade/$pkgname" } + +postinstall(){ + VELLUM_BIN="${VELLUM_BIN:-/home/root/.vellum/bin}" + "$VELLUM_BIN/mount-rw" + /home/root/.local/share/vellum-hosts/update-hosts.sh add + "$VELLUM_BIN/mount-restore" +} + +postupgrade(){ + VELLUM_BIN="${VELLUM_BIN:-/home/root/.vellum/bin}" + "$VELLUM_BIN/mount-rw" + /home/root/.local/share/vellum-hosts/update-hosts.sh add + "$VELLUM_BIN/mount-restore" +} + +postosupgrade(){ + /home/root/.local/share/vellum-hosts/update-hosts.sh add +} + +predeinstall(){ + VELLUM_BIN="${VELLUM_BIN:-/home/root/.vellum/bin}" + "$VELLUM_BIN/mount-rw" + /home/root/.local/share/vellum-hosts/update-hosts.sh remove + "$VELLUM_BIN/mount-restore" +} + sha512sums=" 949bc2a1fe273a655de772fdd5b6fc557c025c27c45fb3cf19e2b8cad0337b7a5ad08a2300232904a0b22061583aeb38b3f21a7a56e9eb747dfa1c0d9740b398 update-hosts.sh b7a86c9fc7a740ff680037b0e6b646ccd70e4e74fef78669b8ba92e18b873e4673fbba064272c595d13bc016288cd4a0532cd974534b7fef43a5b065f24add95 LICENSE diff --git a/packages/vellum-hosts/vellum-hosts.post-install b/packages/vellum-hosts/vellum-hosts.post-install deleted file mode 100644 index 82d3644..0000000 --- a/packages/vellum-hosts/vellum-hosts.post-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -VELLUM_BIN="${VELLUM_BIN:-/home/root/.vellum/bin}" -"$VELLUM_BIN/mount-rw" -/home/root/.local/share/vellum-hosts/update-hosts.sh add -"$VELLUM_BIN/mount-restore" diff --git a/packages/vellum-hosts/vellum-hosts.post-os-upgrade b/packages/vellum-hosts/vellum-hosts.post-os-upgrade deleted file mode 100644 index 178d579..0000000 --- a/packages/vellum-hosts/vellum-hosts.post-os-upgrade +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/home/root/.local/share/vellum-hosts/update-hosts.sh add diff --git a/packages/vellum-hosts/vellum-hosts.post-upgrade b/packages/vellum-hosts/vellum-hosts.post-upgrade deleted file mode 100644 index 82d3644..0000000 --- a/packages/vellum-hosts/vellum-hosts.post-upgrade +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -VELLUM_BIN="${VELLUM_BIN:-/home/root/.vellum/bin}" -"$VELLUM_BIN/mount-rw" -/home/root/.local/share/vellum-hosts/update-hosts.sh add -"$VELLUM_BIN/mount-restore" diff --git a/packages/vellum-hosts/vellum-hosts.pre-deinstall b/packages/vellum-hosts/vellum-hosts.pre-deinstall deleted file mode 100644 index c3a6d6b..0000000 --- a/packages/vellum-hosts/vellum-hosts.pre-deinstall +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -VELLUM_BIN="${VELLUM_BIN:-/home/root/.vellum/bin}" -"$VELLUM_BIN/mount-rw" -/home/root/.local/share/vellum-hosts/update-hosts.sh remove -"$VELLUM_BIN/mount-restore" diff --git a/packages/vellum/APKBUILD b/packages/vellum/VELBUILD similarity index 97% rename from packages/vellum/APKBUILD rename to packages/vellum/VELBUILD index 3f2c90a..e0c22b9 100644 --- a/packages/vellum/APKBUILD +++ b/packages/vellum/VELBUILD @@ -3,8 +3,8 @@ pkgname=vellum pkgver=0.2.1 pkgrel=0 _apk_ver=3.0.3 -_upstream_author="vellum-dev" -_category="utilities" +upstream_author="vellum-dev" +category="utilities" pkgdesc="Package manager wrapper for reMarkable tablets" url="https://github.com/vellum-dev/vellum-cli" arch="aarch64 armv7" diff --git a/packages/vnsee-qtfb/APKBUILD b/packages/vnsee-qtfb/VELBUILD similarity index 60% rename from packages/vnsee-qtfb/APKBUILD rename to packages/vnsee-qtfb/VELBUILD index 12f785c..1355516 100644 --- a/packages/vnsee-qtfb/APKBUILD +++ b/packages/vnsee-qtfb/VELBUILD @@ -2,15 +2,14 @@ maintainer="Interloper <45214659+0xdeb7ef@users.noreply.github.com>" pkgname=vnsee-qtfb pkgver=1.1.0 pkgrel=2 -_upstream_author="khyryra" -_category="apps" +upstream_author="khyryra" +category="apps" pkgdesc="VNC client for the reMarkable tablet allowing you to use the device as a second screen" url="https://github.com/khyryra/vnsee-qtfb" license="GPL-3.0" arch="aarch64 armv7" depends="appload" replaces="vnsee-qtfb-rm1 vnsee-qtfb-rm2 vnsee-qtfb-rmpp vnsee-qtfb-rmppm" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" options="!check !fhs !strip !tracedeps" source=" @@ -39,6 +38,38 @@ package() { echo "https://github.com/khyryra/vnsee-qtfb/archive/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + +postinstall(){ + echo "" + echo "=================================================================" + echo " NOTE: You have to update your connection parameters in" + echo " /home/root/xovi/exthome/appload/vnsee-X/external.manifest.json" + echo " Where X is the different vnsee display modes." + echo "=================================================================" + echo "" +} + +postupgrade(){ + echo "" + echo "=================================================================" + echo " NOTE: You have to update your connection parameters in" + echo " /home/root/xovi/exthome/appload/vnsee-X/external.manifest.json" + echo " Where X is the different vnsee display modes." + echo "=================================================================" + echo "" +} + +postdeinstall(){ + if [ "$VELLUM_PURGE" = "1" ]; then + rm -rf \ + /home/root/xovi/exthome/appload/vnsee \ + /home/root/xovi/exthome/appload/vnsee-0 \ + /home/root/xovi/exthome/appload/vnsee-1 \ + /home/root/xovi/exthome/appload/vnsee-2 \ + /home/root/xovi/exthome/appload/vnsee-3 + fi +} + sha512sums=" 12372589ae6e220b9fd80323889797d932c41062a45ffa960e07ecfd81ded97125fbf6aee87ee7917a0b97cb3898a5658615b3bd4478a6c736803e7fe1ca512f vnsee-rm2.zip 3ca1a84e4e42c06219eecb456963e5fad3b135dfe41bf9cea3d321f9347d8a19f20868ec0aabf120431135ceb8fe04f011ddcbda3fdc8be449224e33523e1d5e vnsee-ferrari.zip diff --git a/packages/vnsee-qtfb/vnsee-qtfb.post-deinstall b/packages/vnsee-qtfb/vnsee-qtfb.post-deinstall deleted file mode 100644 index 5821e11..0000000 --- a/packages/vnsee-qtfb/vnsee-qtfb.post-deinstall +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ "$VELLUM_PURGE" = "1" ]; then - rm -rf /home/root/xovi/exthome/appload/vnsee - rm -rf /home/root/xovi/exthome/appload/vnsee-0 - rm -rf /home/root/xovi/exthome/appload/vnsee-1 - rm -rf /home/root/xovi/exthome/appload/vnsee-2 - rm -rf /home/root/xovi/exthome/appload/vnsee-3 -fi diff --git a/packages/vnsee-qtfb/vnsee-qtfb.post-install b/packages/vnsee-qtfb/vnsee-qtfb.post-install deleted file mode 100644 index 4a298b6..0000000 --- a/packages/vnsee-qtfb/vnsee-qtfb.post-install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -echo "" -echo "=================================================================" -echo " NOTE: You have to update your connection parameters in" -echo " /home/root/xovi/exthome/appload/vnsee-X/external.manifest.json" -echo " Where X is the different vnsee display modes." -echo "=================================================================" -echo "" diff --git a/packages/vnsee-qtfb/vnsee-qtfb.post-upgrade b/packages/vnsee-qtfb/vnsee-qtfb.post-upgrade deleted file mode 100644 index 4a298b6..0000000 --- a/packages/vnsee-qtfb/vnsee-qtfb.post-upgrade +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -echo "" -echo "=================================================================" -echo " NOTE: You have to update your connection parameters in" -echo " /home/root/xovi/exthome/appload/vnsee-X/external.manifest.json" -echo " Where X is the different vnsee display modes." -echo "=================================================================" -echo "" diff --git a/packages/xovi-extensions-v16/APKBUILD b/packages/xovi-extensions-v16/VELBUILD similarity index 93% rename from packages/xovi-extensions-v16/APKBUILD rename to packages/xovi-extensions-v16/VELBUILD index 789ed68..fd940ca 100644 --- a/packages/xovi-extensions-v16/APKBUILD +++ b/packages/xovi-extensions-v16/VELBUILD @@ -2,15 +2,14 @@ maintainer="Mitchell Scott " pkgname=xovi-extensions pkgver=16.0.0 pkgrel=2 -_upstream_author="asivery" -_category="framework" +upstream_author="asivery" +category="framework" pkgdesc="Extensions for xovi framework" url="https://github.com/asivery/rm-xovi-extensions" arch="aarch64 armv7" license="GPL-3.0" depends="xovi remarkable-os>=3.20 remarkable-os<3.26" options="!check !fhs !strip !tracedeps" -install="qt-resource-rebuilder.post-install" subpackages=" qt-resource-rebuilder:qt_resource_rebuilder @@ -124,6 +123,16 @@ webserver_remote() { install -Dm755 "$srcdir"/webserver-remote.so \ "$subpkgdir"/home/root/xovi/extensions.d/webserver-remote.so } + +postinstall(){ + echo "" + echo "===============================================" + echo " NOTE: Before using any QT modifications," + echo " you must run: xovi/rebuild_hashtable" + echo "===============================================" + echo "" +} + sha512sums=" 2688a21c3f2e01f0b08fde3cb3a455907aa5f8ad9cd62599d0db21a5d533b7e60ad57a0755819879369c873966c25a53546fbf87d533150a44c2c6e0249fb532 extensions-aarch64.zip e2b0231ef9e00859c9d094af2150031664d6ed414db05b0c6d9d0291273acb013fdd054b9f920f8f8974bb2c5402c85726c22e3af7af963637d76cace38fcb8c extensions-arm32-testing.zip diff --git a/packages/xovi-extensions-v16/qt-resource-rebuilder.post-install b/packages/xovi-extensions-v16/qt-resource-rebuilder.post-install deleted file mode 100644 index 09077ea..0000000 --- a/packages/xovi-extensions-v16/qt-resource-rebuilder.post-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -echo "" -echo "===============================================" -echo " NOTE: Before using any QT modifications," -echo " you must run: xovi/rebuild_hashtable" -echo "===============================================" -echo "" diff --git a/packages/xovi-extensions/APKBUILD b/packages/xovi-extensions/VELBUILD similarity index 93% rename from packages/xovi-extensions/APKBUILD rename to packages/xovi-extensions/VELBUILD index a008a17..fbf1e64 100644 --- a/packages/xovi-extensions/APKBUILD +++ b/packages/xovi-extensions/VELBUILD @@ -2,15 +2,14 @@ maintainer="Mitchell Scott " pkgname=xovi-extensions pkgver=17.0.0 pkgrel=4 -_upstream_author="asivery" -_category="framework" +upstream_author="asivery" +category="framework" pkgdesc="Extensions for xovi framework" url="https://github.com/asivery/rm-xovi-extensions" arch="aarch64 armv7" license="GPL-3.0" depends="xovi remarkable-os>=3.20 remarkable-os<3.26" options="!check !fhs !strip !tracedeps" -install="qt-resource-rebuilder.post-install" subpackages=" qt-resource-rebuilder:qt_resource_rebuilder @@ -116,6 +115,16 @@ webserver_remote() { install -Dm755 "$srcdir"/webserver-remote.so \ "$subpkgdir"/home/root/xovi/extensions.d/webserver-remote.so } + +postinstall(){ + echo "" + echo "===============================================" + echo " NOTE: Before using any QT modifications," + echo " you must run: xovi/rebuild_hashtable" + echo "===============================================" + echo "" +} + sha512sums=" bedd792ee72c0fc37246d292e7e030abd40fcebedc0ac99c1ee5d2df1e22920cefd4f09a4223bc547795ec33f4b1df97d190ac21dfbcac4c2c9d8b2ac087e68b extensions-aarch64.zip 69561e979048454de51d4205ba45b0dcb5117909a690cc978c049cc61dc46aa227c1e93b7f1e970c0a8846b5d470a2f48244beb4c85df5eca080ce9c55c54dc6 extensions-arm32-testing.zip diff --git a/packages/xovi-extensions/qt-resource-rebuilder.post-install b/packages/xovi-extensions/qt-resource-rebuilder.post-install deleted file mode 100644 index 09077ea..0000000 --- a/packages/xovi-extensions/qt-resource-rebuilder.post-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -echo "" -echo "===============================================" -echo " NOTE: Before using any QT modifications," -echo " you must run: xovi/rebuild_hashtable" -echo "===============================================" -echo "" diff --git a/packages/xovi/APKBUILD b/packages/xovi/VELBUILD similarity index 73% rename from packages/xovi/APKBUILD rename to packages/xovi/VELBUILD index b075a1f..f8c46fa 100644 --- a/packages/xovi/APKBUILD +++ b/packages/xovi/VELBUILD @@ -2,13 +2,12 @@ maintainer="Mitchell Scott " pkgname=xovi pkgver=0.3.2 pkgrel=0 -_upstream_author="asivery" -_category="framework" +upstream_author="asivery" +category="framework" pkgdesc="Core xovi framework for reMarkable tablets" url="https://github.com/asivery/xovi" arch="aarch64 armv7" license="GPL-3.0" -install="$pkgname.pre-deinstall" options="!check !fhs !strip !tracedeps" source=" @@ -67,6 +66,35 @@ package() { echo "https://github.com/asivery/xovi/archive/refs/tags/v$pkgver.tar.gz" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } + +predeinstall(){ + # Revert to stock xochitl + [ -x /home/root/xovi/stock ] && /home/root/xovi/stock + + if [ "$VELLUM_PURGE" = "1" ]; then + # Purge: remove everything + rm -rf /home/root/xovi + else + # Preserve user-added content in extensions.d and exthome + rm -f \ + /home/root/xovi/xovi.so \ + /home/root/xovi/start \ + /home/root/xovi/stock \ + /home/root/xovi/debug + + # Remove empty directories, but preserve if user has untracked files + rmdir /home/root/xovi/extensions.d 2>/dev/null || true + rmdir /home/root/xovi/exthome 2>/dev/null || true + rmdir /home/root/xovi 2>/dev/null || true + + # Notify user if untracked files remain + if [ -d /home/root/xovi ]; then + echo "Note: /home/root/xovi preserved (contains untracked files)" + echo " Use 'vellum purge xovi' to remove everything" + fi + fi +} + sha512sums=" 72570b63fcd072a20abba298715334d1b9ecce6f8ae02b53c09bfe4c61263f95eb78302b494d3337e173841d3eaf840c14fbb4b4d9c76292bbb5e9389ee8870c xovi-aarch64.so 6ad3b6db12ae486357d50aaaf2d8a257cdadec0d7a1ac7b27029db7357f6588962cba3309ae6a2298cfaebe2694d1f0264c2753c1252a6dd223fd138f6ee996d xovi-armv7.so diff --git a/packages/xovi/xovi.pre-deinstall b/packages/xovi/xovi.pre-deinstall deleted file mode 100644 index 563811d..0000000 --- a/packages/xovi/xovi.pre-deinstall +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Revert to stock xochitl -[ -x /home/root/xovi/stock ] && /home/root/xovi/stock - -if [ "$VELLUM_PURGE" = "1" ]; then - # Purge: remove everything - rm -rf /home/root/xovi -else - # Preserve user-added content in extensions.d and exthome - rm -f /home/root/xovi/xovi.so - rm -f /home/root/xovi/start - rm -f /home/root/xovi/stock - rm -f /home/root/xovi/debug - - # Remove empty directories, but preserve if user has untracked files - rmdir /home/root/xovi/extensions.d 2>/dev/null || true - rmdir /home/root/xovi/exthome 2>/dev/null || true - rmdir /home/root/xovi 2>/dev/null || true - - # Notify user if untracked files remain - if [ -d /home/root/xovi ]; then - echo "Note: /home/root/xovi preserved (contains untracked files)" - echo " Use 'vellum purge xovi' to remove everything" - fi -fi diff --git a/packages/zig/APKBUILD b/packages/zig/VELBUILD similarity index 97% rename from packages/zig/APKBUILD rename to packages/zig/VELBUILD index 5820f99..ba76d82 100644 --- a/packages/zig/APKBUILD +++ b/packages/zig/VELBUILD @@ -2,8 +2,8 @@ maintainer="Interloper <45214659+0xdeb7ef@users.noreply.github.com>" pkgname=zig pkgver=0.15.2 pkgrel=0 -_upstream_author="ziglang" -_category="utilities" +upstream_author="ziglang" +category="utilities" pkgdesc="A general-purpose programming language and toolchain for maintaining robust, optimal and reusable software" url="https://ziglang.org" arch="aarch64 armv7" diff --git a/scripts/build-package.sh b/scripts/build-package.sh index 88d4c16..e0d163d 100755 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Build a single package using Alpine's abuild in a container +# Build a single package using vbuild # Usage: ./build-package.sh [arch] # # Requires: docker or podman @@ -24,14 +24,13 @@ if [ ! -d "$PACKAGE_DIR" ]; then exit 1 fi -if command -v podman >/dev/null 2>&1; then - CONTAINER_CMD="podman" -else - CONTAINER_CMD="docker" +if ! command -v vbuild >/dev/null 2>&1; then + echo "Error: vbuild not found" + exit 1 fi if [ -z "$ARCH" ]; then - if grep -q '^arch="noarch"' "$PACKAGE_DIR/APKBUILD"; then + if grep -q '^arch="noarch"' "$PACKAGE_DIR/VELBUILD"; then ARCH="noarch" else ARCH="aarch64" @@ -39,19 +38,19 @@ if [ -z "$ARCH" ]; then fi # Skip if the requested arch isn't supported by this package -PKG_ARCH=$(grep '^arch=' "$PACKAGE_DIR/APKBUILD" | sed 's/arch="\(.*\)"/\1/') +PKG_ARCH=$(grep '^arch=' "$PACKAGE_DIR/VELBUILD" | sed 's/arch="\(.*\)"/\1/') if [ "$PKG_ARCH" != "noarch" ] && ! echo "$PKG_ARCH" | grep -qw "$ARCH"; then echo "Skipping $PACKAGE: arch $ARCH not in supported architectures ($PKG_ARCH)" exit 0 fi -echo "Building $PACKAGE for $ARCH using $CONTAINER_CMD..." +echo "Building $PACKAGE for $ARCH..." mkdir -p "$REPO_ROOT/dist/$ARCH" # Use production key if available, otherwise generate dev key if [ -f "$REPO_ROOT/keys/packages.rsa" ]; then - KEY_NAME="packages" + KEY_PATH="$REPO_ROOT/keys/packages.rsa" else KEY_NAME="vellum-dev" KEY_PATH="$REPO_ROOT/keys/$KEY_NAME.rsa" @@ -63,68 +62,28 @@ else chmod 600 "$KEY_PATH" fi fi +cp "$KEY_PATH" ~/.config/vbuild/vbuild.rsa +cp "$KEY_PATH.pub" ~/.config/vbuild/vbuild.rsa.pub # Get reproducible timestamp from git (last commit to this package) SOURCE_DATE_EPOCH=$(git log -1 --format=%ct -- "$PACKAGE_DIR") if [ -z "$SOURCE_DATE_EPOCH" ]; then - SOURCE_DATE_EPOCH=$(stat -c %Y "$PACKAGE_DIR/APKBUILD" 2>/dev/null || stat -f %m "$PACKAGE_DIR/APKBUILD") + SOURCE_DATE_EPOCH=$(stat -c %Y "$PACKAGE_DIR/VELBUILD" 2>/dev/null || stat -f %m "$PACKAGE_DIR/VELBUILD") fi echo "Using SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH for reproducible build" - -CARCH_ENV="-e CARCH=$ARCH -e SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH" - -if [ "$CONTAINER_CMD" = "podman" ]; then - SRC_MOUNT="-v $REPO_ROOT:/work:O" -else - SRC_MOUNT="-v $REPO_ROOT:/work-src:Z,ro" +set +e +WORK_DIR=$(mktemp -d) +ret=$? +if [ $ret -ne 0 ]; then + echo "Failed to create working directory" + exit $ret fi - -$CONTAINER_CMD run --rm \ - $SRC_MOUNT \ - -v "$REPO_ROOT/dist:/work/dist:Z" \ - $CARCH_ENV \ - alpine:3 \ - sh -c ' - set -e - - apk add --no-cache alpine-sdk - - # Docker: copy source to writable /work - if [ -d /work-src ]; then - cp -r /work-src/packages /work/ - cp -r /work-src/keys /work/ - fi - - mkdir -p /work/dist/'$ARCH' - cd /work/packages/'$PACKAGE' - - # Set up signing key - mkdir -p /root/.abuild - cp /work/keys/'$KEY_NAME'.rsa /root/.abuild/ - cp /work/keys/'$KEY_NAME'.rsa.pub /root/.abuild/ - echo "PACKAGER_PRIVKEY=/root/.abuild/'$KEY_NAME'.rsa" > /root/.abuild/abuild.conf - cp /work/keys/'$KEY_NAME'.rsa.pub /etc/apk/keys/ - - REPODEST=/work/dist abuild -d -r -F - ' - -# Docker: fix ownership so host user can access dist files -if [ "$CONTAINER_CMD" = "docker" ]; then - $CONTAINER_CMD run --rm \ - -v "$REPO_ROOT/dist:/work/dist:Z" \ - alpine:3 \ - chown -R "$(id -u):$(id -g)" /work/dist -fi - -# Move packages from nested structure to flat -if [ -d "$REPO_ROOT/dist/packages/noarch" ]; then - mkdir -p "$REPO_ROOT/dist/noarch" - mv "$REPO_ROOT/dist/packages/noarch"/*.apk "$REPO_ROOT/dist/noarch/" 2>/dev/null || true -fi -if [ -d "$REPO_ROOT/dist/packages/$ARCH" ]; then - mv "$REPO_ROOT/dist/packages/$ARCH"/*.apk "$REPO_ROOT/dist/$ARCH/" 2>/dev/null || true -fi -rm -rf "$REPO_ROOT/dist/packages" +set -e +echo "Working directory $WORK_DIR" +cp -r "$REPO_ROOT/packages/$PACKAGE/." "$WORK_DIR" +CARCH=$ARCH vbuild -C "$WORK_DIR" all +cp -r "$WORK_DIR/dist/." "$REPO_ROOT/dist/" +rm -rf "$WORK_DIR" echo "Build complete." ls -la "$REPO_ROOT/dist/"*/*.apk 2>/dev/null || echo "No .apk files found" diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index 29fae53..4bb5934 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -19,7 +19,7 @@ WARNED=0 usage() { echo "Usage: $0 [OPTIONS] [PACKAGE...]" echo "" - echo "Lint APKBUILD files for vellum packages." + echo "Lint VELBUILD files for vellum packages." echo "" echo "Options:" echo " --apkbuild-lint Also run apkbuild-lint (requires Docker or atools)" @@ -71,7 +71,7 @@ if [ -z "$PACKAGES" ]; then exit 0 fi else - PACKAGES=$(ls -d "$REPO_ROOT"/packages/*/APKBUILD 2>/dev/null | xargs -I{} dirname {} | xargs -I{} basename {}) + PACKAGES=$(ls -d "$REPO_ROOT"/packages/*/VELBUILD 2>/dev/null | xargs -I{} dirname {} | xargs -I{} basename {}) fi fi @@ -79,28 +79,54 @@ run_apkbuild_lint() { local pkg_path="$1" local pkg_name="$2" + if ! command -v vbuild >/dev/null 2>&1; then + echo "Error: vbuild not found" + exit 1 + fi + + set +e + work_dir=$(mktemp -d) + ret=$? + if [ $ret -ne 0 ]; then + echo "Failed to create working directory" 2>&1 + exit $ret + fi + set -e + + cp -r "$(dirname $pkg_path)/." "$work_dir" + vbuild -C "$work_dir" gen + apkbuild_path="$work_dir/APKBUILD" + if command -v apkbuild-lint >/dev/null 2>&1; then - apkbuild-lint "$pkg_path" 2>&1 + apkbuild-lint "$apkbuild_path" 2>&1 + elif command -v podman >/dev/null 2>&1; then + podman run --rm \ + -v "$work_dir:/src:ro" \ + -w "/src" \ + alpine:edge \ + sh -c "apk add --no-cache atools >/dev/null 2>&1 && apkbuild-lint APKBUILD" 2>&1 elif command -v docker >/dev/null 2>&1; then docker run --rm \ - -v "$REPO_ROOT:/repo:ro" \ - -w "/repo/packages/$pkg_name" \ + -v "$work_dir:/src:ro" \ + -w "/src" \ alpine:edge \ sh -c "apk add --no-cache atools >/dev/null 2>&1 && apkbuild-lint APKBUILD" 2>&1 else - echo " (apkbuild-lint skipped - install atools or Docker)" + echo " (apkbuild-lint skipped - install atools, podman, or docker)" + rm -r "$work_dir" return 0 fi + rm -r "$work_dir" } echo "Linting packages..." echo "" for pkg in $PACKAGES; do - APKBUILD_PATH="$REPO_ROOT/packages/$pkg/APKBUILD" + VELBUILD_PATH="$REPO_ROOT/packages/$pkg/VELBUILD" - if [ ! -f "$APKBUILD_PATH" ]; then - printf "${RED}SKIP${NC}: %s (APKBUILD not found)\n" "$pkg" + if [ ! -f "$VELBUILD_PATH" ]; then + printf "${RED}SKIP${NC}: %s (VELBUILD not found)\n" "$pkg" continue fi @@ -110,7 +136,7 @@ for pkg in $PACKAGES; do lint_output="" status=0 - result=$("$SCRIPT_DIR/validate-apkbuild.sh" "$APKBUILD_PATH" 2>&1) || status=$? + result=$("$SCRIPT_DIR/validate-velbuild.sh" "$VELBUILD_PATH" 2>&1) || status=$? if [ $status -ne 0 ]; then validate_output=$(echo "$result" | grep -v "^FAIL:" | sed 's/^/ /') @@ -122,7 +148,7 @@ for pkg in $PACKAGES; do if [ "$RUN_APKBUILD_LINT" = "true" ]; then lint_status=0 - lint_output=$(run_apkbuild_lint "$APKBUILD_PATH" "$pkg") || lint_status=$? + lint_output=$(run_apkbuild_lint "$VELBUILD_PATH" "$pkg") || lint_status=$? if [ $lint_status -ne 0 ]; then pkg_status="fail" fi diff --git a/scripts/update-checksums.sh b/scripts/update-checksums.sh index 7a2bf52..d088349 100755 --- a/scripts/update-checksums.sh +++ b/scripts/update-checksums.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Update checksums in APKBUILD files using Alpine's abuild +# Update checksums in VELBUILD files using vbuild # Usage: ./update-checksums.sh [package2] ... set -e @@ -13,10 +13,9 @@ if [ $# -eq 0 ]; then exit 1 fi -if command -v podman >/dev/null 2>&1; then - CONTAINER_CMD="podman" -else - CONTAINER_CMD="docker" +if ! command -v vbuild >/dev/null 2>&1; then + echo "Error: vbuild not found" + exit 1 fi for PACKAGE in "$@"; do @@ -28,19 +27,6 @@ for PACKAGE in "$@"; do fi echo "Updating checksums for $PACKAGE..." - - $CONTAINER_CMD run --rm \ - -v "$REPO_ROOT/packages:/work/packages:Z" \ - -w "/work/packages/$PACKAGE" \ - alpine:3 \ - sh -c 'apk add --no-cache abuild >/dev/null 2>&1 && abuild -F checksum && rm -rf src' + vbuild -C "$PACKAGE_DIR" checksum echo "Done: $PACKAGE" done - -# Docker: fix ownership so host user can access modified files -if [ "$CONTAINER_CMD" = "docker" ]; then - $CONTAINER_CMD run --rm \ - -v "$REPO_ROOT/packages:/work/packages:Z" \ - alpine:3 \ - chown -R "$(id -u):$(id -g)" /work/packages -fi diff --git a/scripts/validate-apkbuild.sh b/scripts/validate-velbuild.sh similarity index 60% rename from scripts/validate-apkbuild.sh rename to scripts/validate-velbuild.sh index 3ba4a90..aee3c02 100755 --- a/scripts/validate-apkbuild.sh +++ b/scripts/validate-velbuild.sh @@ -1,17 +1,17 @@ #!/bin/sh set -e -APKBUILD_PATH="$1" +VELBUILD_PATH="$1" ERRORS="" WARNINGS="" -if [ -z "$APKBUILD_PATH" ]; then - echo "Usage: $0 " +if [ -z "$VELBUILD_PATH" ]; then + echo "Usage: $0 " exit 1 fi -if [ ! -f "$APKBUILD_PATH" ]; then - echo "Error: $APKBUILD_PATH not found" +if [ ! -f "$VELBUILD_PATH" ]; then + echo "Error: $VELBUILD_PATH not found" exit 1 fi @@ -25,23 +25,23 @@ add_warning() { pkgname="" pkgdesc="" -_upstream_author="" -_category="" +upstream_author="" +category="" license="" -eval "$(grep -E '^(pkgname|pkgdesc|_upstream_author|_category|license)=' "$APKBUILD_PATH")" +eval "$(grep -E '^(pkgname|pkgdesc|upstream_author|category|license)=' "$VELBUILD_PATH")" -if [ -z "$_upstream_author" ]; then - add_error "_upstream_author is not set" +if [ -z "$upstream_author" ]; then + add_error "upstream_author is not set" fi -if [ -z "$_category" ]; then - add_error "_category is not set" +if [ -z "$category" ]; then + add_error "category is not set" else valid_categories="ui fixes utilities apps framework" - for cat in $_category; do + for cat in $category; do if ! echo "$valid_categories" | grep -qw "$cat"; then - add_error "_category contains invalid value '$cat' (valid: $valid_categories)" + add_error "category contains invalid value '$cat' (valid: $valid_categories)" fi done fi @@ -55,11 +55,11 @@ if [ "$pkgdesc_len" -ge 128 ]; then add_error "pkgdesc is too long ($pkgdesc_len chars, must be <128)" fi -if grep -q '^# Maintainer:' "$APKBUILD_PATH"; then +if grep -q '^# Maintainer:' "$VELBUILD_PATH"; then add_error "uses '# Maintainer:' comment instead of 'maintainer=' variable" fi -if ! grep -q '^maintainer=' "$APKBUILD_PATH"; then +if ! grep -q '^maintainer=' "$VELBUILD_PATH"; then add_error "maintainer variable is not set" fi From 47be3be186d76f07511d631484591c81f0239e07 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 11:46:23 -0700 Subject: [PATCH 02/19] Fix download url --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce8fa55..fc24018 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: set -e curl \ --location \ - 'https://github.com/Eeems/vbuild/releases/0.0.7/download/vbuild-vbuild-ubuntu' \ + 'https://github.com/Eeems/vbuild/releases/download/0.0.7/vbuild-vbuild-ubuntu' \ --output /usr/local/bin/vbuild chmod +x /usr/local/bin/vbuild From 9a4f1c337531dc346c7f4a358aced7105731a4d3 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 12:10:13 -0700 Subject: [PATCH 03/19] Get lint to fail locally --- packages/appload/VELBUILD | 2 ++ scripts/lint-packages.sh | 47 ++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/packages/appload/VELBUILD b/packages/appload/VELBUILD index c88ab4c..a7f76bc 100644 --- a/packages/appload/VELBUILD +++ b/packages/appload/VELBUILD @@ -39,9 +39,11 @@ package() { echo "https://github.com/asivery/rm-appload/archive/v$pkgver.tar.gz" > \ "$pkgdir"/home/root/.vellum/licenses/$pkgname/SOURCES } + postdeinstall(){ rmdir /home/root/shims 2>/dev/null || true } + sha512sums=" aaa6a8a81eb68caab0f386e4c4b6c9db3840505d31c514989450a12e043593d43f5a06804a478b516175651f9ffb8a0e04132ea12c0f04e0a430c74dc987848c appload-aarch64.zip fb30d4800d79a1bb6e820c9677c131e951dbf581074c97ad151ed27c001ff1e121c91a258f667e9500d8e75b33b12a17ede9ced7f634408465345d4207b4ebb1 appload-arm32.zip diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index 4bb5934..a436022 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -77,46 +77,25 @@ fi run_apkbuild_lint() { local pkg_path="$1" - local pkg_name="$2" - - if ! command -v vbuild >/dev/null 2>&1; then - echo "Error: vbuild not found" - exit 1 - fi - - set +e - work_dir=$(mktemp -d) - ret=$? - if [ $ret -ne 0 ]; then - echo "Failed to create working directory" 2>&1 - exit $ret - fi - set -e - - cp -r "$(dirname $pkg_path)/." "$work_dir" - vbuild -C "$work_dir" gen - apkbuild_path="$work_dir/APKBUILD" if command -v apkbuild-lint >/dev/null 2>&1; then - apkbuild-lint "$apkbuild_path" 2>&1 + apkbuild-lint "$pkg_path/APKBUILD" 2>&1 elif command -v podman >/dev/null 2>&1; then podman run --rm \ - -v "$work_dir:/src:ro" \ + -v "$pkg_path:/src:ro" \ -w "/src" \ alpine:edge \ sh -c "apk add --no-cache atools >/dev/null 2>&1 && apkbuild-lint APKBUILD" 2>&1 elif command -v docker >/dev/null 2>&1; then docker run --rm \ - -v "$work_dir:/src:ro" \ + -v "$pkg_path:/src:ro" \ -w "/src" \ alpine:edge \ sh -c "apk add --no-cache atools >/dev/null 2>&1 && apkbuild-lint APKBUILD" 2>&1 else echo " (apkbuild-lint skipped - install atools, podman, or docker)" - rm -r "$work_dir" return 0 fi - rm -r "$work_dir" } echo "Linting packages..." @@ -147,8 +126,26 @@ for pkg in $PACKAGES; do fi if [ "$RUN_APKBUILD_LINT" = "true" ]; then + if ! command -v vbuild >/dev/null 2>&1; then + echo "Error: vbuild not found" + exit 1 + fi + set +e + work_dir=$(mktemp -d) + ret=$? + if [ $ret -ne 0 ]; then + echo "Fatal Error: Failed to create working directory" 2>&1 + exit $ret + fi + set -e + + cp -r "$(dirname $VELBUILD_PATH)/." "$work_dir" + vbuild -C "$work_dir" gen + apkbuild_path="$work_dir/APKBUILD" + lint_status=0 - lint_output=$(run_apkbuild_lint "$VELBUILD_PATH" "$pkg") || lint_status=$? + lint_output=$(run_apkbuild_lint "$work_dir") || lint_status=$? + rm -r "$work_dir" if [ $lint_status -ne 0 ]; then pkg_status="fail" fi From f7ec670d25e748f67af2de3afe8704e9a0890da6 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 12:25:35 -0700 Subject: [PATCH 04/19] Skip whitespace check for now, vbuild will need to be enhanced for this later --- scripts/lint-packages.sh | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index a436022..1cd1bc4 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -79,19 +79,19 @@ run_apkbuild_lint() { local pkg_path="$1" if command -v apkbuild-lint >/dev/null 2>&1; then - apkbuild-lint "$pkg_path/APKBUILD" 2>&1 + SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint "$pkg_path/APKBUILD" 2>&1 elif command -v podman >/dev/null 2>&1; then podman run --rm \ -v "$pkg_path:/src:ro" \ -w "/src" \ alpine:edge \ - sh -c "apk add --no-cache atools >/dev/null 2>&1 && apkbuild-lint APKBUILD" 2>&1 + sh -c "apk add --no-cache atools >/dev/null 2>&1 && SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 elif command -v docker >/dev/null 2>&1; then docker run --rm \ -v "$pkg_path:/src:ro" \ -w "/src" \ alpine:edge \ - sh -c "apk add --no-cache atools >/dev/null 2>&1 && apkbuild-lint APKBUILD" 2>&1 + sh -c "apk add --no-cache atools >/dev/null 2>&1 && SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 else echo " (apkbuild-lint skipped - install atools, podman, or docker)" return 0 @@ -112,6 +112,7 @@ for pkg in $PACKAGES; do pkg_status="pass" pkg_warned=false validate_output="" + vbuild_output="" lint_output="" status=0 @@ -140,14 +141,19 @@ for pkg in $PACKAGES; do set -e cp -r "$(dirname $VELBUILD_PATH)/." "$work_dir" - vbuild -C "$work_dir" gen - apkbuild_path="$work_dir/APKBUILD" - - lint_status=0 - lint_output=$(run_apkbuild_lint "$work_dir") || lint_status=$? - rm -r "$work_dir" - if [ $lint_status -ne 0 ]; then + vbuild_status=0 + vbuild_output=$(vbuild -C "$work_dir" gen) || vbuild_status=$? + if [ $vbuild_status -ne 0 ]; then pkg_status="fail" + else + vbuild_output="" + apkbuild_path="$work_dir/APKBUILD" + lint_status=0 + lint_output=$(run_apkbuild_lint "$work_dir") || lint_status=$? + rm -r "$work_dir" + if [ $lint_status -ne 0 ]; then + pkg_status="fail" + fi fi fi @@ -168,6 +174,7 @@ for pkg in $PACKAGES; do esac [ -n "$validate_output" ] && echo "$validate_output" + [ -n "$vbuild_output" ] && echo "$vbuild_output" if [ -n "$lint_output" ]; then echo " apkbuild-lint:" echo "$lint_output" | sed 's/^/ /' From aa3708c7b431a7218371397878f068e3331ebcad Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 12:28:37 -0700 Subject: [PATCH 05/19] Ensure config folder exists --- scripts/build-package.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-package.sh b/scripts/build-package.sh index e0d163d..48565f0 100755 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -62,6 +62,7 @@ else chmod 600 "$KEY_PATH" fi fi +mkdir -p ~/.config/vbuild cp "$KEY_PATH" ~/.config/vbuild/vbuild.rsa cp "$KEY_PATH.pub" ~/.config/vbuild/vbuild.rsa.pub From a8f6220e568dbe6e7bc76c5179dd820fa4315e0c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 13:03:41 -0700 Subject: [PATCH 06/19] Fix most failed builds --- packages/entware-rc/VELBUILD | 2 +- packages/entware/VELBUILD | 2 +- packages/gomarkablestream/VELBUILD | 8 ++++---- packages/mount-utils/VELBUILD | 2 +- packages/rmfakecloud-proxy/VELBUILD | 8 ++++---- packages/rmhacks-pre1/VELBUILD | 1 + packages/rmhacks-pre2/VELBUILD | 1 + packages/rmhacks-pre3/VELBUILD | 1 + packages/rmhacks/VELBUILD | 1 + packages/tailscale/VELBUILD | 9 +++++---- packages/tripletap/VELBUILD | 6 +++--- packages/vellum-hosts/VELBUILD | 2 +- packages/vellum/VELBUILD | 12 ++++++------ scripts/lint-packages.sh | 8 ++++---- scripts/update-checksums.sh | 13 ++++++++++++- 15 files changed, 46 insertions(+), 30 deletions(-) diff --git a/packages/entware-rc/VELBUILD b/packages/entware-rc/VELBUILD index f20df84..d6ff82f 100644 --- a/packages/entware-rc/VELBUILD +++ b/packages/entware-rc/VELBUILD @@ -20,7 +20,7 @@ LICENSE::https://raw.githubusercontent.com/toltec-dev/toltec/refs/heads/stable/L package() { install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" - echo "https://github.com/$_upstream_author/toltec/tree/stable/package/entware-rc" > \ + echo "https://github.com/$upstream_author/toltec/tree/stable/package/entware-rc" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" install -D -m 666 -t "$pkgdir"/home/root/.vellum/share/$pkgname/ \ diff --git a/packages/entware/VELBUILD b/packages/entware/VELBUILD index 5bb6f61..e4898bd 100644 --- a/packages/entware/VELBUILD +++ b/packages/entware/VELBUILD @@ -58,7 +58,7 @@ package() { install -Dm644 "$srcdir/COPYING" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/COPYING" - echo "https://github.com/$_upstream_author/Entware" > \ + echo "https://github.com/$upstream_author/Entware" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ diff --git a/packages/gomarkablestream/VELBUILD b/packages/gomarkablestream/VELBUILD index af1158f..687d0d6 100644 --- a/packages/gomarkablestream/VELBUILD +++ b/packages/gomarkablestream/VELBUILD @@ -12,9 +12,9 @@ depends="!rmppm !rm1" options="!check !fhs !strip !tracedeps" source=" -$pkgname-$pkgver-aarch64::https://github.com/$_upstream_author/goMarkableStream/releases/download/v$pkgver/gomarkablestream-RMPRO -$pkgname-$pkgver-armv7::https://github.com/$_upstream_author/goMarkableStream/releases/download/v$pkgver/gomarkablestream-RM2 -LICENSE::https://raw.githubusercontent.com/$_upstream_author/goMarkableStream/master/LICENSE +$pkgname-$pkgver-aarch64::https://github.com/$upstream_author/goMarkableStream/releases/download/v$pkgver/gomarkablestream-RMPRO +$pkgname-$pkgver-armv7::https://github.com/$upstream_author/goMarkableStream/releases/download/v$pkgver/gomarkablestream-RM2 +LICENSE::https://raw.githubusercontent.com/$upstream_author/goMarkableStream/v$pkgver/LICENSE " package() { @@ -23,7 +23,7 @@ package() { install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" - echo "https://github.com/$_upstream_author/goMarkableStream/archive/refs/tags/v$pkgver.tar.gz" > \ + echo "https://github.com/$upstream_author/goMarkableStream/archive/refs/tags/v$pkgver.tar.gz" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } sha512sums=" diff --git a/packages/mount-utils/VELBUILD b/packages/mount-utils/VELBUILD index 050587a..f6f2d9b 100644 --- a/packages/mount-utils/VELBUILD +++ b/packages/mount-utils/VELBUILD @@ -24,7 +24,7 @@ package() { install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" - echo "https://github.com/$_upstream_author/vellum" > \ + echo "https://github.com/$upstream_author/vellum" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } sha512sums=" diff --git a/packages/rmfakecloud-proxy/VELBUILD b/packages/rmfakecloud-proxy/VELBUILD index b78783d..da712d3 100644 --- a/packages/rmfakecloud-proxy/VELBUILD +++ b/packages/rmfakecloud-proxy/VELBUILD @@ -11,9 +11,9 @@ license="MIT" options="!check !fhs !strip !tracedeps" source=" - installer-rmpro.sh::https://github.com/$_upstream_author/rmfakecloud-proxy/releases/download/v$pkgver/installer-rmpro.sh - installer-rm12.sh::https://github.com/$_upstream_author/rmfakecloud-proxy/releases/download/v$pkgver/installer-rm12.sh - LICENSE::https://raw.githubusercontent.com/$_upstream_author/rmfakecloud-proxy/master/LICENSE + installer-rmpro.sh::https://github.com/$upstream_author/rmfakecloud-proxy/releases/download/v$pkgver/installer-rmpro.sh + installer-rm12.sh::https://github.com/$upstream_author/rmfakecloud-proxy/releases/download/v$pkgver/installer-rm12.sh + LICENSE::https://raw.githubusercontent.com/$upstream_author/rmfakecloud-proxy/master/LICENSE " package() { @@ -27,7 +27,7 @@ package() { esac install -Dm644 "$srcdir/LICENSE" "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" - echo "https://github.com/$_upstream_author/rmfakecloud-proxy" > "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" + echo "https://github.com/$upstream_author/rmfakecloud-proxy" > "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ "$pkgdir/home/root/.vellum/hooks/post-os-upgrade/$pkgname" diff --git a/packages/rmhacks-pre1/VELBUILD b/packages/rmhacks-pre1/VELBUILD index 9a69257..ff54b0d 100644 --- a/packages/rmhacks-pre1/VELBUILD +++ b/packages/rmhacks-pre1/VELBUILD @@ -17,6 +17,7 @@ rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_ builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre1" package() { + _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks-pre2/VELBUILD b/packages/rmhacks-pre2/VELBUILD index 23749da..9c10aad 100644 --- a/packages/rmhacks-pre2/VELBUILD +++ b/packages/rmhacks-pre2/VELBUILD @@ -17,6 +17,7 @@ rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_ builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre2" package() { + _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks-pre3/VELBUILD b/packages/rmhacks-pre3/VELBUILD index 9c7f54e..4966200 100644 --- a/packages/rmhacks-pre3/VELBUILD +++ b/packages/rmhacks-pre3/VELBUILD @@ -17,6 +17,7 @@ rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_ builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre3" package() { + _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks/VELBUILD b/packages/rmhacks/VELBUILD index 60faab7..060b03e 100644 --- a/packages/rmhacks/VELBUILD +++ b/packages/rmhacks/VELBUILD @@ -17,6 +17,7 @@ rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_ builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre4" package() { + _commit=1c617914af95e2d3b8f25c7c0fd71ef11e21b461 install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/tailscale/VELBUILD b/packages/tailscale/VELBUILD index 859c900..2f7941b 100644 --- a/packages/tailscale/VELBUILD +++ b/packages/tailscale/VELBUILD @@ -10,7 +10,6 @@ arch="aarch64 armv7" license="BSD-3-Clause" options="!check !fhs !strip !tracedeps" depends="mount-utils" -builddir="$srcdir/tailscale" source=" https://dl.tailscale.com/stable/tailscale_${pkgver}_arm.tgz @@ -38,9 +37,11 @@ unpack() { msg "Unpacking $_tar..." tar -C "$srcdir" -zxf "$_tar" mv "$srcdir/tailscale_${pkgver}_$_arch" "$srcdir/tailscale" + msg "Unpacked." } package() { + cd "$srcdir/tailscale" install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" echo "https://github.com/tailscale/tailscale/tree/$pkgver/licenses" > \ @@ -135,11 +136,11 @@ predeinstall(){ fi } -sha512sums=" +sha512sums=' 861b8b7103707f7a9ee4719e136429759d903c9f61c435803ede82ee65cb93fac38f3133a7edcc537b6f2d00976426ebd751031cbf93a355d01aef3f7e88866b tailscale_1.94.1_arm.tgz 93fba9144a3df577c11dfb31dd92ef9635daf8dd52e599adf370c926d6e4aab8066f8b0711556af50db52802365f9b363c757a4509736dce8faad5c0cc57cc11 tailscale_1.94.1_arm64.tgz d9e05b6d2d70e945ab5c968cfcffa3bf5d5399058c9721bd2198d89c1a5466f137bcaa4ff5a1aaf81ee08f7c7c197607b1d73d3f472f158b877d8df9fa71c790 LICENSE b0cbcd5e94001fc8f91ae6bc0dca40bac8f34d92112d2a0ad83189c8e6bb79fe415dce9dda6a554c8094a59f1bfd6bf1109439c47ef5f1d0b3eb522af3a62c95 10-defaults.patch daa522461020dacce029f6baa03421c051d05bf8627560c3c417141f03e1e82c8fe81c3dd0f1eeb2d11a9ff559e034689a0f27720829a19c93351dfca6bad8e1 10-service.patch -9990a0d3dd0ee0cdfce1140d30f1f747b5f7fc21af7a13bb87db546c3a0883d4c1d7bf4825972f1ba3097182a0599dbdd53add24458f1c4c657283cac1104f8e tailscale.post-os-upgrade -" +2100dd4f6936569ea683d6cec4e55a5d5940edb9dd9a4f75dff5faa1a7037af3c817a1a6987796f4ad96d2958b8943ebb236141f359428520d57a760f36a58aa tailscale.post-os-upgrade +' diff --git a/packages/tripletap/VELBUILD b/packages/tripletap/VELBUILD index 7bb4aa9..18cb143 100644 --- a/packages/tripletap/VELBUILD +++ b/packages/tripletap/VELBUILD @@ -11,12 +11,12 @@ license="MIT" depends="xovi mount-utils" source=" $pkgname-$pkgver.tar.gz::https://github.com/rmitchellscott/xovi-tripletap/archive/v$pkgver.tar.gz -LICENSE::https://raw.githubusercontent.com/rmitchellscott/xovi-tripletap/main/LICENSE +LICENSE::https://raw.githubusercontent.com/rmitchellscott/xovi-tripletap/v$pkgver/LICENSE " -builddir="$srcdir/xovi-tripletap-$pkgver" options="!check !fhs !strip !tracedeps" package() { + cd "$srcdir/xovi-tripletap-$pkgver" local install_dir="$pkgdir/home/root/xovi-tripletap" mkdir -p "$install_dir" @@ -47,7 +47,7 @@ package() { install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" - echo "https://github.com/rmitchellscott/xovi-tripletap/archive/v$pkgver.tar.gz" > \ + echo "https://github.com/$upstream_author/xovi-tripletap/archive/v$pkgver.tar.gz" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ diff --git a/packages/vellum-hosts/VELBUILD b/packages/vellum-hosts/VELBUILD index ac48f82..93504ea 100644 --- a/packages/vellum-hosts/VELBUILD +++ b/packages/vellum-hosts/VELBUILD @@ -24,7 +24,7 @@ package() { mkdir -p "$pkgdir/home/root/.vellum/licenses/$pkgname" install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" - echo "https://github.com/$_upstream_author/vellum" > \ + echo "https://github.com/$upstream_author/vellum" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" install -Dm755 "$startdir/$pkgname.post-os-upgrade" \ diff --git a/packages/vellum/VELBUILD b/packages/vellum/VELBUILD index e0c22b9..ef9a419 100644 --- a/packages/vellum/VELBUILD +++ b/packages/vellum/VELBUILD @@ -11,11 +11,11 @@ arch="aarch64 armv7" license="MIT" options="!check !fhs !strip !tracedeps" source=" -vellum-aarch64::https://github.com/$_upstream_author/vellum-cli/releases/download/v$pkgver/vellum-linux-arm64 -vellum-armv7::https://github.com/$_upstream_author/vellum-cli/releases/download/v$pkgver/vellum-linux-armv7 -apk-aarch64::https://github.com/$_upstream_author/apk-tools/releases/download/v$_apk_ver/apk-aarch64 -apk-armv7::https://github.com/$_upstream_author/apk-tools/releases/download/v$_apk_ver/apk-armv7 -LICENSE::https://raw.githubusercontent.com/$_upstream_author/vellum-cli/main/LICENSE +vellum-aarch64::https://github.com/$upstream_author/vellum-cli/releases/download/v$pkgver/vellum-linux-arm64 +vellum-armv7::https://github.com/$upstream_author/vellum-cli/releases/download/v$pkgver/vellum-linux-armv7 +apk-aarch64::https://github.com/$upstream_author/apk-tools/releases/download/v$_apk_ver/apk-aarch64 +apk-armv7::https://github.com/$upstream_author/apk-tools/releases/download/v$_apk_ver/apk-armv7 +LICENSE::https://github.com/vellum-dev/vellum-cli/raw/refs/tags/v$pkgver/LICENSE " package() { @@ -43,7 +43,7 @@ package() { install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" - echo "https://github.com/$_upstream_author/vellum-cli" > \ + echo "https://github.com/$upstream_author/vellum-cli" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/SOURCES" } sha512sums=" diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index 1cd1bc4..b5ff70c 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -84,14 +84,14 @@ run_apkbuild_lint() { podman run --rm \ -v "$pkg_path:/src:ro" \ -w "/src" \ - alpine:edge \ - sh -c "apk add --no-cache atools >/dev/null 2>&1 && SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 + ghcr.io/eeems/vbuild-builder:main \ + sh -c "SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 elif command -v docker >/dev/null 2>&1; then docker run --rm \ -v "$pkg_path:/src:ro" \ -w "/src" \ - alpine:edge \ - sh -c "apk add --no-cache atools >/dev/null 2>&1 && SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 + ghcr.io/eeems/vbuild-builder:main \ + sh -c "SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 else echo " (apkbuild-lint skipped - install atools, podman, or docker)" return 0 diff --git a/scripts/update-checksums.sh b/scripts/update-checksums.sh index d088349..42c1cb2 100755 --- a/scripts/update-checksums.sh +++ b/scripts/update-checksums.sh @@ -27,6 +27,17 @@ for PACKAGE in "$@"; do fi echo "Updating checksums for $PACKAGE..." - vbuild -C "$PACKAGE_DIR" checksum + set +e + work_dir=$(mktemp -d) + ret=$? + if [ $ret -ne 0 ]; then + echo "Fatal Error: Failed to create working directory" 2>&1 + exit $ret + fi + set -e + cp -r "$PACKAGE_DIR/." "$work_dir" + vbuild -C "$work_dir" checksum + cp "$work_dir/VELBUILD" "$PACKAGE_DIR/" + rm -r "$work_dir" echo "Done: $PACKAGE" done From 6d1fc80b806269302b0ac0ecd6a6704a1cadbcba Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 13:28:18 -0700 Subject: [PATCH 07/19] Speed up linting --- scripts/lint-packages.sh | 58 +++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index b5ff70c..7919518 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -98,6 +98,28 @@ run_apkbuild_lint() { fi } +if [ "$RUN_APKBUILD_LINT" = "true" ]; then + echo "Generating APKBUILD..." + echo "" + if ! command -v vbuild >/dev/null 2>&1; then + echo "Error: vbuild not found" + exit 1 + fi + set +e + work_dir=$(mktemp -d) + ret=$? + if [ $ret -ne 0 ]; then + echo "Fatal Error: Failed to create working directory" 2>&1 + exit $ret + fi + set -e + cpus=$(nproc) + echo "$PACKAGES" \ + | xargs -n1 \ + | xargs -P "$(( cpus * 2 ))" -I {} \ + bash -c "cp -r '$REPO_ROOT/packages/{}' '$work_dir' && vbuild -C '$work_dir/{}' gen" +fi + echo "Linting packages..." echo "" @@ -112,7 +134,6 @@ for pkg in $PACKAGES; do pkg_status="pass" pkg_warned=false validate_output="" - vbuild_output="" lint_output="" status=0 @@ -127,33 +148,11 @@ for pkg in $PACKAGES; do fi if [ "$RUN_APKBUILD_LINT" = "true" ]; then - if ! command -v vbuild >/dev/null 2>&1; then - echo "Error: vbuild not found" - exit 1 - fi - set +e - work_dir=$(mktemp -d) - ret=$? - if [ $ret -ne 0 ]; then - echo "Fatal Error: Failed to create working directory" 2>&1 - exit $ret - fi - set -e - - cp -r "$(dirname $VELBUILD_PATH)/." "$work_dir" - vbuild_status=0 - vbuild_output=$(vbuild -C "$work_dir" gen) || vbuild_status=$? - if [ $vbuild_status -ne 0 ]; then + apkbuild_path="$work_dir/$pkg/APKBUILD" + lint_status=0 + lint_output=$(run_apkbuild_lint "$work_dir/$pkg") || lint_status=$? + if [ $lint_status -ne 0 ]; then pkg_status="fail" - else - vbuild_output="" - apkbuild_path="$work_dir/APKBUILD" - lint_status=0 - lint_output=$(run_apkbuild_lint "$work_dir") || lint_status=$? - rm -r "$work_dir" - if [ $lint_status -ne 0 ]; then - pkg_status="fail" - fi fi fi @@ -174,7 +173,6 @@ for pkg in $PACKAGES; do esac [ -n "$validate_output" ] && echo "$validate_output" - [ -n "$vbuild_output" ] && echo "$vbuild_output" if [ -n "$lint_output" ]; then echo " apkbuild-lint:" echo "$lint_output" | sed 's/^/ /' @@ -184,6 +182,10 @@ done echo "" echo "Summary: $PASSED passed, $WARNED warnings, $FAILED failed" +if [ "$RUN_APKBUILD_LINT" = "true" ]; then + rm -r "$work_dir" +fi + if [ $FAILED -gt 0 ]; then exit 1 fi From 4ab44b5f751a021e5e907e9b97b90eb7f335545d Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 13:29:54 -0700 Subject: [PATCH 08/19] Fix rmhacks building --- packages/rmhacks-pre1/VELBUILD | 3 +-- packages/rmhacks-pre2/VELBUILD | 3 +-- packages/rmhacks-pre3/VELBUILD | 3 +-- packages/rmhacks/VELBUILD | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/rmhacks-pre1/VELBUILD b/packages/rmhacks-pre1/VELBUILD index ff54b0d..0f77b4c 100644 --- a/packages/rmhacks-pre1/VELBUILD +++ b/packages/rmhacks-pre1/VELBUILD @@ -14,10 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " -builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre1" package() { - _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b + cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre1" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks-pre2/VELBUILD b/packages/rmhacks-pre2/VELBUILD index 9c10aad..5e734e9 100644 --- a/packages/rmhacks-pre2/VELBUILD +++ b/packages/rmhacks-pre2/VELBUILD @@ -14,10 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " -builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre2" package() { - _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b + cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre2" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks-pre3/VELBUILD b/packages/rmhacks-pre3/VELBUILD index 4966200..3b5b1a7 100644 --- a/packages/rmhacks-pre3/VELBUILD +++ b/packages/rmhacks-pre3/VELBUILD @@ -14,10 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " -builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre3" package() { - _commit=a5a921cda5b0db3fa9a93fd016187a8928abfe9b + cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre3" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks/VELBUILD b/packages/rmhacks/VELBUILD index 060b03e..b4bb703 100644 --- a/packages/rmhacks/VELBUILD +++ b/packages/rmhacks/VELBUILD @@ -14,10 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " -builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre4" package() { - _commit=1c617914af95e2d3b8f25c7c0fd71ef11e21b461 + cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre4" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" From eef4a9236e8502fe2fd3ffc5cec8951a0c50ee58 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 13:37:46 -0700 Subject: [PATCH 09/19] Fix tailscale build --- packages/tailscale/10-defaults.patch | 4 ++-- packages/tailscale/10-service.patch | 4 ++-- packages/tailscale/VELBUILD | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/tailscale/10-defaults.patch b/packages/tailscale/10-defaults.patch index b326ca1..0f3e0b1 100644 --- a/packages/tailscale/10-defaults.patch +++ b/packages/tailscale/10-defaults.patch @@ -1,8 +1,8 @@ Author: Interloper <45214659+0xdeb7ef@users.noreply.github.com> Summary: Enables user-space networking by default. ---- ---- a/systemd/tailscaled.defaults.orig 2026-01-28 21:08:07.208238949 -0800 -+++ b/systemd/tailscaled.defaults 2026-01-28 21:08:15.415061137 -0800 +--- a/tailscale/systemd/tailscaled.defaults.orig 2026-01-28 21:08:07.208238949 -0800 ++++ b/tailscale/systemd/tailscaled.defaults 2026-01-28 21:08:15.415061137 -0800 @@ -5,4 +5,4 @@ PORT="41641" diff --git a/packages/tailscale/10-service.patch b/packages/tailscale/10-service.patch index 2baff51..6676bfa 100644 --- a/packages/tailscale/10-service.patch +++ b/packages/tailscale/10-service.patch @@ -1,8 +1,8 @@ Author: Interloper <45214659+0xdeb7ef@users.noreply.github.com> Summary: Patches the service file to use the appropriate paths. ---- ---- a/systemd/tailscaled.service.orig 2026-01-28 21:22:00.964033235 -0800 -+++ a/systemd/tailscaled.service 2026-01-28 21:22:31.017935774 -0800 +--- a/tailscale/systemd/tailscaled.service.orig 2026-01-28 21:22:00.964033235 -0800 ++++ a/tailscale/systemd/tailscaled.service 2026-01-28 21:22:31.017935774 -0800 @@ -5,9 +5,9 @@ Wants=network-pre.target After=network-pre.target NetworkManager.service systemd-resolved.service diff --git a/packages/tailscale/VELBUILD b/packages/tailscale/VELBUILD index 2f7941b..fc3ec87 100644 --- a/packages/tailscale/VELBUILD +++ b/packages/tailscale/VELBUILD @@ -36,18 +36,18 @@ unpack() { msg "Unpacking $_tar..." tar -C "$srcdir" -zxf "$_tar" - mv "$srcdir/tailscale_${pkgver}_$_arch" "$srcdir/tailscale" + mkdir -p "$srcdir/$pkgname-$pkgver" + mv "$srcdir/tailscale_${pkgver}_$_arch" "$srcdir/$pkgname-$pkgver/tailscale" msg "Unpacked." } package() { - cd "$srcdir/tailscale" install -Dm644 "$srcdir/LICENSE" \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSE" echo "https://github.com/tailscale/tailscale/tree/$pkgver/licenses" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSES-3RD-PARTY" - cd "$srcdir/tailscale" + cd "$srcdir/$pkgname-$pkgver/tailscale" install -Dm744 tailscaled \ "$pkgdir/home/root/.vellum/bin/tailscaled" @@ -140,7 +140,7 @@ sha512sums=' 861b8b7103707f7a9ee4719e136429759d903c9f61c435803ede82ee65cb93fac38f3133a7edcc537b6f2d00976426ebd751031cbf93a355d01aef3f7e88866b tailscale_1.94.1_arm.tgz 93fba9144a3df577c11dfb31dd92ef9635daf8dd52e599adf370c926d6e4aab8066f8b0711556af50db52802365f9b363c757a4509736dce8faad5c0cc57cc11 tailscale_1.94.1_arm64.tgz d9e05b6d2d70e945ab5c968cfcffa3bf5d5399058c9721bd2198d89c1a5466f137bcaa4ff5a1aaf81ee08f7c7c197607b1d73d3f472f158b877d8df9fa71c790 LICENSE -b0cbcd5e94001fc8f91ae6bc0dca40bac8f34d92112d2a0ad83189c8e6bb79fe415dce9dda6a554c8094a59f1bfd6bf1109439c47ef5f1d0b3eb522af3a62c95 10-defaults.patch -daa522461020dacce029f6baa03421c051d05bf8627560c3c417141f03e1e82c8fe81c3dd0f1eeb2d11a9ff559e034689a0f27720829a19c93351dfca6bad8e1 10-service.patch +665463289bf08707b57c4ff165c131854270dbe026a626f1c66450b66f1a8ad9cccbdd30be574a72e8c237e7acf8cb879ca5451dd853ade645bb89ec117d278a 10-defaults.patch +d6c9a6a3f0230d1e9fff6366013078c823070621c1cfd5efbac80215ec32019d4192d631428f69d0d362f0069998ce0137f037bc8a9a1886c75bc41896df88cd 10-service.patch 2100dd4f6936569ea683d6cec4e55a5d5940edb9dd9a4f75dff5faa1a7037af3c817a1a6987796f4ad96d2958b8943ebb236141f359428520d57a760f36a58aa tailscale.post-os-upgrade ' From f2aa2d143b1f477062dfbb82f05e187fed4556a2 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 21 Feb 2026 23:35:41 -0700 Subject: [PATCH 10/19] Clean before removing work dir --- scripts/build-package.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-package.sh b/scripts/build-package.sh index 48565f0..5a084e0 100755 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -84,6 +84,7 @@ echo "Working directory $WORK_DIR" cp -r "$REPO_ROOT/packages/$PACKAGE/." "$WORK_DIR" CARCH=$ARCH vbuild -C "$WORK_DIR" all cp -r "$WORK_DIR/dist/." "$REPO_ROOT/dist/" +vbuild -C "$WORK_DIR" clean rm -rf "$WORK_DIR" echo "Build complete." From dd2aedb3f5b437957add6055ab6e0581bfaeab6a Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 22 Feb 2026 11:59:44 -0700 Subject: [PATCH 11/19] Update vbuild --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc24018..92a7563 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: set -e curl \ --location \ - 'https://github.com/Eeems/vbuild/releases/download/0.0.7/vbuild-vbuild-ubuntu' \ + 'https://github.com/Eeems/vbuild/releases/download/0.0.10/vbuild-vbuild-ubuntu' \ --output /usr/local/bin/vbuild chmod +x /usr/local/bin/vbuild From bcf975ca8168068a1bb383f3278812a3b00f29a7 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 22 Feb 2026 12:10:57 -0700 Subject: [PATCH 12/19] Revert builddir changes --- packages/rmhacks-pre1/VELBUILD | 2 +- packages/rmhacks-pre2/VELBUILD | 2 +- packages/rmhacks-pre3/VELBUILD | 2 +- packages/rmhacks/VELBUILD | 2 +- packages/tailscale/10-defaults.patch | 4 ++-- packages/tailscale/10-service.patch | 4 ++-- packages/tailscale/VELBUILD | 12 ++++++------ packages/tripletap/VELBUILD | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/rmhacks-pre1/VELBUILD b/packages/rmhacks-pre1/VELBUILD index 0f77b4c..9a69257 100644 --- a/packages/rmhacks-pre1/VELBUILD +++ b/packages/rmhacks-pre1/VELBUILD @@ -14,9 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " +builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre1" package() { - cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre1" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks-pre2/VELBUILD b/packages/rmhacks-pre2/VELBUILD index 5e734e9..23749da 100644 --- a/packages/rmhacks-pre2/VELBUILD +++ b/packages/rmhacks-pre2/VELBUILD @@ -14,9 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " +builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre2" package() { - cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre2" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks-pre3/VELBUILD b/packages/rmhacks-pre3/VELBUILD index 3b5b1a7..9c7f54e 100644 --- a/packages/rmhacks-pre3/VELBUILD +++ b/packages/rmhacks-pre3/VELBUILD @@ -14,9 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " +builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre3" package() { - cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre3" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/rmhacks/VELBUILD b/packages/rmhacks/VELBUILD index b4bb703..60faab7 100644 --- a/packages/rmhacks/VELBUILD +++ b/packages/rmhacks/VELBUILD @@ -14,9 +14,9 @@ options="!check !fhs" source=" rm-hacks-qmd-$_commit.tar.gz::https://github.com/asivery/rm-hacks-qmd/archive/$_commit.tar.gz " +builddir="$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre4" package() { - cd "$srcdir/rm-hacks-qmd-$_commit/0.0.11-pre4" install -Dm644 zz_rmhacks.qmd \ "$pkgdir/home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd" diff --git a/packages/tailscale/10-defaults.patch b/packages/tailscale/10-defaults.patch index 0f3e0b1..b326ca1 100644 --- a/packages/tailscale/10-defaults.patch +++ b/packages/tailscale/10-defaults.patch @@ -1,8 +1,8 @@ Author: Interloper <45214659+0xdeb7ef@users.noreply.github.com> Summary: Enables user-space networking by default. ---- ---- a/tailscale/systemd/tailscaled.defaults.orig 2026-01-28 21:08:07.208238949 -0800 -+++ b/tailscale/systemd/tailscaled.defaults 2026-01-28 21:08:15.415061137 -0800 +--- a/systemd/tailscaled.defaults.orig 2026-01-28 21:08:07.208238949 -0800 ++++ b/systemd/tailscaled.defaults 2026-01-28 21:08:15.415061137 -0800 @@ -5,4 +5,4 @@ PORT="41641" diff --git a/packages/tailscale/10-service.patch b/packages/tailscale/10-service.patch index 6676bfa..2baff51 100644 --- a/packages/tailscale/10-service.patch +++ b/packages/tailscale/10-service.patch @@ -1,8 +1,8 @@ Author: Interloper <45214659+0xdeb7ef@users.noreply.github.com> Summary: Patches the service file to use the appropriate paths. ---- ---- a/tailscale/systemd/tailscaled.service.orig 2026-01-28 21:22:00.964033235 -0800 -+++ a/tailscale/systemd/tailscaled.service 2026-01-28 21:22:31.017935774 -0800 +--- a/systemd/tailscaled.service.orig 2026-01-28 21:22:00.964033235 -0800 ++++ a/systemd/tailscaled.service 2026-01-28 21:22:31.017935774 -0800 @@ -5,9 +5,9 @@ Wants=network-pre.target After=network-pre.target NetworkManager.service systemd-resolved.service diff --git a/packages/tailscale/VELBUILD b/packages/tailscale/VELBUILD index fcbf228..7c8d54a 100644 --- a/packages/tailscale/VELBUILD +++ b/packages/tailscale/VELBUILD @@ -19,6 +19,7 @@ https://raw.githubusercontent.com/tailscale/tailscale/refs/tags/v$pkgver/LICENSE 10-service.patch $pkgname.post-os-upgrade " +builddir="$srcdir/tailscale" unpack() { if [ -z "$force" ]; then @@ -36,8 +37,7 @@ unpack() { msg "Unpacking $_tar..." tar -C "$srcdir" -zxf "$_tar" - mkdir -p "$srcdir/$pkgname-$pkgver" - mv "$srcdir/tailscale_${pkgver}_$_arch" "$srcdir/$pkgname-$pkgver/tailscale" + mv "$srcdir/tailscale_${pkgver}_$_arch" "$srcdir/tailscale" msg "Unpacked." } @@ -47,7 +47,7 @@ package() { echo "https://github.com/tailscale/tailscale/tree/$pkgver/licenses" > \ "$pkgdir/home/root/.vellum/licenses/$pkgname/LICENSES-3RD-PARTY" - cd "$srcdir/$pkgname-$pkgver/tailscale" + cd "$srcdir/tailscale" install -Dm744 tailscaled \ "$pkgdir/home/root/.vellum/bin/tailscaled" @@ -140,7 +140,7 @@ sha512sums=' 7e193b8738a3fb28bf74c30eacbe846eb4d05fb818dc243ae0884e27eeccd90d8879242051f0ea3ddd685172dbd3e24e6eed01984db70f144443f017f0e7a023 tailscale_1.94.2_arm.tgz baf3f3ba20eaaa9b36996b6902a45c1a68a3c98d2dc0d796c93c746523fce2e7d3bce0b4ecfb3406af8730e5fbd20a93e0c545199c27405d9b5a7ec5a8ee97c9 tailscale_1.94.2_arm64.tgz d9e05b6d2d70e945ab5c968cfcffa3bf5d5399058c9721bd2198d89c1a5466f137bcaa4ff5a1aaf81ee08f7c7c197607b1d73d3f472f158b877d8df9fa71c790 LICENSE -665463289bf08707b57c4ff165c131854270dbe026a626f1c66450b66f1a8ad9cccbdd30be574a72e8c237e7acf8cb879ca5451dd853ade645bb89ec117d278a 10-defaults.patch -d6c9a6a3f0230d1e9fff6366013078c823070621c1cfd5efbac80215ec32019d4192d631428f69d0d362f0069998ce0137f037bc8a9a1886c75bc41896df88cd 10-service.patch +b0cbcd5e94001fc8f91ae6bc0dca40bac8f34d92112d2a0ad83189c8e6bb79fe415dce9dda6a554c8094a59f1bfd6bf1109439c47ef5f1d0b3eb522af3a62c95 10-defaults.patch +daa522461020dacce029f6baa03421c051d05bf8627560c3c417141f03e1e82c8fe81c3dd0f1eeb2d11a9ff559e034689a0f27720829a19c93351dfca6bad8e1 10-service.patch 2100dd4f6936569ea683d6cec4e55a5d5940edb9dd9a4f75dff5faa1a7037af3c817a1a6987796f4ad96d2958b8943ebb236141f359428520d57a760f36a58aa tailscale.post-os-upgrade -' \ No newline at end of file +' diff --git a/packages/tripletap/VELBUILD b/packages/tripletap/VELBUILD index 18cb143..3686366 100644 --- a/packages/tripletap/VELBUILD +++ b/packages/tripletap/VELBUILD @@ -14,9 +14,9 @@ $pkgname-$pkgver.tar.gz::https://github.com/rmitchellscott/xovi-tripletap/archiv LICENSE::https://raw.githubusercontent.com/rmitchellscott/xovi-tripletap/v$pkgver/LICENSE " options="!check !fhs !strip !tracedeps" +builddir="$srcdir/xovi-tripletap-$pkgver" package() { - cd "$srcdir/xovi-tripletap-$pkgver" local install_dir="$pkgdir/home/root/xovi-tripletap" mkdir -p "$install_dir" From 968c323d1c2be6125c83d82043f33669db290f08 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 22 Feb 2026 12:12:34 -0700 Subject: [PATCH 13/19] Skip integer quoting lint for now --- scripts/lint-packages.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index 7919518..22c775e 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -79,19 +79,19 @@ run_apkbuild_lint() { local pkg_path="$1" if command -v apkbuild-lint >/dev/null 2>&1; then - SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint "$pkg_path/APKBUILD" 2>&1 + SKIP_AL8=1 SKIP_AL7=1 SKIP_AL28=1 apkbuild-lint "$pkg_path/APKBUILD" 2>&1 elif command -v podman >/dev/null 2>&1; then podman run --rm \ -v "$pkg_path:/src:ro" \ -w "/src" \ ghcr.io/eeems/vbuild-builder:main \ - sh -c "SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 + sh -c "SKIP_AL8=1 SKIP_AL7=1 SKIP_AL28=1 apkbuild-lint APKBUILD" 2>&1 elif command -v docker >/dev/null 2>&1; then docker run --rm \ -v "$pkg_path:/src:ro" \ -w "/src" \ ghcr.io/eeems/vbuild-builder:main \ - sh -c "SKIP_AL8=1 SKIP_AL7=1 apkbuild-lint APKBUILD" 2>&1 + sh -c "SKIP_AL8=1 SKIP_AL7=1 SKIP_AL28=1 apkbuild-lint APKBUILD" 2>&1 else echo " (apkbuild-lint skipped - install atools, podman, or docker)" return 0 From 794676522deb4ddecc1b9840b1a93f35fdc3170a Mon Sep 17 00:00:00 2001 From: Mitchell Scott Date: Sun, 22 Feb 2026 12:21:15 -0700 Subject: [PATCH 14/19] update metadata generation with vbuild changes --- scripts/generate-metadata.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/generate-metadata.sh b/scripts/generate-metadata.sh index 16e1a5b..2ae1bf8 100755 --- a/scripts/generate-metadata.sh +++ b/scripts/generate-metadata.sh @@ -1,7 +1,7 @@ #!/bin/sh -# Generates packages-metadata.json from APKINDEX + APKBUILD metadata +# Generates packages-metadata.json from APKINDEX + VELBUILD metadata # APKINDEX provides: package versions, depends, arch, license, url, pkgdesc -# APKBUILD provides: _category, _upstream_author +# VELBUILD provides: category, upstream_author set -e @@ -62,24 +62,24 @@ done [ ! -f "$WORKDIR/all-packages.tsv" ] && { echo "No packages found"; exit 0; } -for apkbuild in packages/*/APKBUILD; do - [ -f "$apkbuild" ] || continue +for velbuild in packages/*/VELBUILD; do + [ -f "$velbuild" ] || continue - pkgname=$(grep -E '^pkgname=' "$apkbuild" | head -1 | sed 's/^pkgname=//' | tr -d '"') - _category=$(grep -E '^_category=' "$apkbuild" | head -1 | sed 's/^_category=//' | tr -d '"') - _upstream_author=$(grep -E '^_upstream_author=' "$apkbuild" | head -1 | sed 's/^_upstream_author=//' | tr -d '"') - maintainer=$(grep -E '^maintainer=' "$apkbuild" | head -1 | sed 's/^maintainer=//' | tr -d '"') + pkgname=$(grep -E '^pkgname=' "$velbuild" | head -1 | sed 's/^pkgname=//' | tr -d '"') + _category=$(grep -E '^category=' "$velbuild" | head -1 | sed 's/^category=//' | tr -d '"') + _upstream_author=$(grep -E '^upstream_author=' "$velbuild" | head -1 | sed 's/^upstream_author=//' | tr -d '"') + maintainer=$(grep -E '^maintainer=' "$velbuild" | head -1 | sed 's/^maintainer=//' | tr -d '"') _cat="${_category:-other}" _auth="${_upstream_author:-unknown}" _maint="${maintainer:-unknown}" - pkgdir=$(dirname "$apkbuild") + pkgdir=$(dirname "$velbuild") _modsys="false" - [ -f "$pkgdir/$pkgname.post-os-upgrade" ] && _modsys="true" + grep -q '^postosupgrade()' "$velbuild" && _modsys="true" echo "$pkgname $_cat $_auth $_maint $_modsys" >> "$WORKDIR/apkbuild-meta.tsv" # Extract subpackages (may be multiline) - subpackages=$(awk '/^subpackages="/{flag=1; sub(/^subpackages="/, ""); if (/"$/) {sub(/"$/, ""); print; next}} flag{if (/"$/) {sub(/"$/, ""); print; flag=0; next} print}' "$apkbuild" | tr '\n\t' ' ') + subpackages=$(awk '/^subpackages="/{flag=1; sub(/^subpackages="/, ""); if (/"$/) {sub(/"$/, ""); print; next}} flag{if (/"$/) {sub(/"$/, ""); print; flag=0; next} print}' "$velbuild" | tr '\n\t' ' ') for subpkg in $subpackages; do subpkg_name="${subpkg%%:*}" @@ -96,8 +96,8 @@ for apkbuild in packages/*/APKBUILD; do subpkg_cat=$(awk -v fn="$func_name" ' $0 ~ "^"fn"\\(\\)" { in_func=1; next } in_func && /^}/ { exit } - in_func && /_category=/ { gsub(/.*_category=["'"'"']?|["'"'"'].*/, ""); print; exit } - ' "$apkbuild") + in_func && /category=/ { gsub(/.*category=["'"'"']?|["'"'"'].*/, ""); print; exit } + ' "$velbuild") subpkg_cat="${subpkg_cat:-$_cat}" echo "$subpkg_name $subpkg_cat $_auth $_maint $_modsys" >> "$WORKDIR/apkbuild-meta.tsv" @@ -105,7 +105,7 @@ for apkbuild in packages/*/APKBUILD; do done while IFS=' ' read -r pkg ver desc url lic deps arch provides install_if origin apkindex_maint; do - # Try to get metadata from APKBUILD - first check the package itself, then fall back to origin (parent) + # Try to get metadata from VELBUILD - first check the package itself, then fall back to origin (parent) apkbuild_line=$(grep -E "^${pkg} " "$WORKDIR/apkbuild-meta.tsv" 2>/dev/null | head -1 || true) if [ -z "$apkbuild_line" ] && [ -n "$origin" ] && [ "$origin" != "_" ] && [ "$origin" != "$pkg" ]; then apkbuild_line=$(grep -E "^${origin} " "$WORKDIR/apkbuild-meta.tsv" 2>/dev/null | head -1 || true) From 6f4c5af4e2af28f397fd7a97f2d8536ac575ac9f Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 22 Feb 2026 14:00:38 -0700 Subject: [PATCH 15/19] Clean up naming --- .gitignore | 2 ++ scripts/generate-metadata.sh | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3882c00..ce2542a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ packages/*/*.pre-os-upgrade packages/*/*.post-os-upgrade packages/*/*.pre-deinstall packages/*/*.post-deinstall +packages-metadata.json +tmp.json diff --git a/scripts/generate-metadata.sh b/scripts/generate-metadata.sh index 2ae1bf8..e5fad65 100755 --- a/scripts/generate-metadata.sh +++ b/scripts/generate-metadata.sh @@ -66,12 +66,12 @@ for velbuild in packages/*/VELBUILD; do [ -f "$velbuild" ] || continue pkgname=$(grep -E '^pkgname=' "$velbuild" | head -1 | sed 's/^pkgname=//' | tr -d '"') - _category=$(grep -E '^category=' "$velbuild" | head -1 | sed 's/^category=//' | tr -d '"') - _upstream_author=$(grep -E '^upstream_author=' "$velbuild" | head -1 | sed 's/^upstream_author=//' | tr -d '"') + category=$(grep -E '^category=' "$velbuild" | head -1 | sed 's/^category=//' | tr -d '"') + upstream_author=$(grep -E '^upstream_author=' "$velbuild" | head -1 | sed 's/^upstream_author=//' | tr -d '"') maintainer=$(grep -E '^maintainer=' "$velbuild" | head -1 | sed 's/^maintainer=//' | tr -d '"') - _cat="${_category:-other}" - _auth="${_upstream_author:-unknown}" + _cat="${category:-other}" + _auth="${upstream_author:-unknown}" _maint="${maintainer:-unknown}" pkgdir=$(dirname "$velbuild") _modsys="false" @@ -92,7 +92,7 @@ for velbuild in packages/*/VELBUILD; do func_name=$(echo "$subpkg_name" | tr '-' '_') fi - # Extract _category from subpackage function body, fall back to parent + # Extract category from subpackage function body, fall back to parent subpkg_cat=$(awk -v fn="$func_name" ' $0 ~ "^"fn"\\(\\)" { in_func=1; next } in_func && /^}/ { exit } From 542489198ede576875bb438274bce891100eea5d Mon Sep 17 00:00:00 2001 From: Mitchell Scott Date: Sun, 22 Feb 2026 14:34:27 -0700 Subject: [PATCH 16/19] fix(metadata): some shell script fixes --- scripts/generate-metadata.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/generate-metadata.sh b/scripts/generate-metadata.sh index e5fad65..bf6131d 100755 --- a/scripts/generate-metadata.sh +++ b/scripts/generate-metadata.sh @@ -76,7 +76,7 @@ for velbuild in packages/*/VELBUILD; do pkgdir=$(dirname "$velbuild") _modsys="false" grep -q '^postosupgrade()' "$velbuild" && _modsys="true" - echo "$pkgname $_cat $_auth $_maint $_modsys" >> "$WORKDIR/apkbuild-meta.tsv" + printf '%s\t%s\t%s\t%s\t%s\n' "$pkgname" "$_cat" "$_auth" "$_maint" "$_modsys" >> "$WORKDIR/apkbuild-meta.tsv" # Extract subpackages (may be multiline) subpackages=$(awk '/^subpackages="/{flag=1; sub(/^subpackages="/, ""); if (/"$/) {sub(/"$/, ""); print; next}} flag{if (/"$/) {sub(/"$/, ""); print; flag=0; next} print}' "$velbuild" | tr '\n\t' ' ') @@ -100,11 +100,11 @@ for velbuild in packages/*/VELBUILD; do ' "$velbuild") subpkg_cat="${subpkg_cat:-$_cat}" - echo "$subpkg_name $subpkg_cat $_auth $_maint $_modsys" >> "$WORKDIR/apkbuild-meta.tsv" + printf '%s\t%s\t%s\t%s\t%s\n' "$subpkg_name" "$subpkg_cat" "$_auth" "$_maint" "$_modsys" >> "$WORKDIR/apkbuild-meta.tsv" done done -while IFS=' ' read -r pkg ver desc url lic deps arch provides install_if origin apkindex_maint; do +while IFS=' ' read -r pkg ver desc url lic deps arch provides install_if origin apkindex_maint <&3; do # Try to get metadata from VELBUILD - first check the package itself, then fall back to origin (parent) apkbuild_line=$(grep -E "^${pkg} " "$WORKDIR/apkbuild-meta.tsv" 2>/dev/null | head -1 || true) if [ -z "$apkbuild_line" ] && [ -n "$origin" ] && [ "$origin" != "_" ] && [ "$origin" != "$pkg" ]; then @@ -246,7 +246,7 @@ while IFS=' ' read -r pkg ver desc url lic deps arch provides install_if origin fi echo "Processed: $pkg $ver ($arch)" -done < "$WORKDIR/all-packages.tsv" +done 3< "$WORKDIR/all-packages.tsv" # Compute reverse conflicts (if A conflicts with B, B should also show conflict with A) echo "Computing reverse conflicts..." From 111362ecfd1ac2dbd875f0faac29b0454ac5f8fd Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 22 Feb 2026 17:24:24 -0700 Subject: [PATCH 17/19] Use ghcr.io/eeems/vbuild-builder:main --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e99fc4..2ae76b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,7 +187,7 @@ jobs: docker run --rm \ -v "$PWD/dist:/dist:ro" \ -v "$PWD/keys:/keys:ro" \ - alpine:edge \ + ghcr.io/eeems/vbuild-builder:main \ sh -c " cp /keys/packages.rsa.pub /etc/apk/keys/ for apk in /dist/*/*.apk; do @@ -351,9 +351,8 @@ jobs: -v "$PWD/s3-packages/$arch:/packages:Z" \ -v "$PWD/keys:/keys:ro" \ -w /packages \ - alpine:edge \ + ghcr.io/eeems/vbuild-builder:main \ sh -c " - apk add --no-cache apk-tools abuild cp /keys/packages.rsa.pub /etc/apk/keys/ apk index --rewrite-arch $arch -o APKINDEX.tar.gz *.apk abuild-sign -k /keys/packages.rsa APKINDEX.tar.gz From b80a2f5d3b57435a62d32e4f0b35bfb190e92a31 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 22 Feb 2026 17:28:07 -0700 Subject: [PATCH 18/19] Use anchors for duplicate steps --- .github/workflows/build.yml | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ae76b7..61fc303 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,8 @@ jobs: - *install-vbuild - - name: Set up signing key + - &set-up-signing-key + name: Set up signing key run: | if [ -n "${{ secrets.SIGNING_KEY }}" ]; then echo "${{ secrets.SIGNING_KEY }}" > keys/packages.rsa @@ -196,7 +197,8 @@ jobs: done " - - name: Get package name from VELBUILD + - &get-package-name + name: Get package name from VELBUILD id: pkgname run: | pkgname=$(grep '^pkgname=' packages/${{ matrix.package }}/VELBUILD | cut -d= -f2) @@ -210,7 +212,8 @@ jobs: path: dist/noarch/${{ steps.pkgname.outputs.name }}-*.apk if-no-files-found: error - - name: Upload to S3 + - &upload-to-s3 + name: Upload to S3 if: github.repository == 'vellum-dev/vellum' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' uses: aws-actions/configure-aws-credentials@v4 with: @@ -244,23 +247,14 @@ jobs: - *install-vbuild - - name: Set up signing key - run: | - if [ -n "${{ secrets.SIGNING_KEY }}" ]; then - echo "${{ secrets.SIGNING_KEY }}" > keys/packages.rsa - chmod 600 keys/packages.rsa - fi + - *set-up-signing-key - name: Build ${{ matrix.package }} for ${{ matrix.arch }} run: ./scripts/build-package.sh "${{ matrix.package }}" "${{ matrix.arch }}" - *verify-signature - - name: Get package name from VELBUILD - id: pkgname - run: | - pkgname=$(grep '^pkgname=' packages/${{ matrix.package }}/VELBUILD | cut -d= -f2) - echo "name=$pkgname" >> $GITHUB_OUTPUT + - *get-package-name - name: Upload artifact if: github.event_name == 'pull_request' @@ -270,13 +264,7 @@ jobs: path: dist/${{ matrix.arch }}/${{ steps.pkgname.outputs.name }}-*.apk if-no-files-found: warn - - name: Upload to S3 - if: github.repository == 'vellum-dev/vellum' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' - uses: aws-actions/configure-aws-credentials@v4 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-2 + - *upload-to-s3 - name: Upload packages to S3 if: github.repository == 'vellum-dev/vellum' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' @@ -307,12 +295,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-2 - - name: Set up signing key - run: | - if [ -n "${{ secrets.SIGNING_KEY }}" ]; then - echo "${{ secrets.SIGNING_KEY }}" > keys/packages.rsa - chmod 600 keys/packages.rsa - fi + - *set-up-signing-key - name: Regenerate APKINDEX from S3 run: | From 95b476201c06c6d1d90e91381323fa2b6dea8db8 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 22 Feb 2026 20:07:15 -0700 Subject: [PATCH 19/19] Update to vbuild 0.0.11 --- .github/workflows/build.yml | 2 +- scripts/build-package.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61fc303..4f3fcef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: set -e curl \ --location \ - 'https://github.com/Eeems/vbuild/releases/download/0.0.10/vbuild-vbuild-ubuntu' \ + 'https://github.com/Eeems/vbuild/releases/download/0.0.11/vbuild-vbuild-ubuntu' \ --output /usr/local/bin/vbuild chmod +x /usr/local/bin/vbuild diff --git a/scripts/build-package.sh b/scripts/build-package.sh index 5a084e0..8d488a4 100755 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -50,6 +50,7 @@ mkdir -p "$REPO_ROOT/dist/$ARCH" # Use production key if available, otherwise generate dev key if [ -f "$REPO_ROOT/keys/packages.rsa" ]; then + KEY_NAME=packages KEY_PATH="$REPO_ROOT/keys/packages.rsa" else KEY_NAME="vellum-dev" @@ -63,8 +64,8 @@ else fi fi mkdir -p ~/.config/vbuild -cp "$KEY_PATH" ~/.config/vbuild/vbuild.rsa -cp "$KEY_PATH.pub" ~/.config/vbuild/vbuild.rsa.pub +cp "$KEY_PATH" ~/.config/vbuild/"$KEY_NAME".rsa +cp "$KEY_PATH.pub" ~/.config/vbuild/"$KEY_NAME".rsa.pub # Get reproducible timestamp from git (last commit to this package) SOURCE_DATE_EPOCH=$(git log -1 --format=%ct -- "$PACKAGE_DIR") @@ -82,7 +83,7 @@ fi set -e echo "Working directory $WORK_DIR" cp -r "$REPO_ROOT/packages/$PACKAGE/." "$WORK_DIR" -CARCH=$ARCH vbuild -C "$WORK_DIR" all +VBUILD_KEY_NAME=$KEY_NAME CARCH=$ARCH vbuild -C "$WORK_DIR" all cp -r "$WORK_DIR/dist/." "$REPO_ROOT/dist/" vbuild -C "$WORK_DIR" clean rm -rf "$WORK_DIR"