3.22 support

.github/workflows/pr.yml

@@ -13,27 +13,86 @@ jobs:
         run: make format
       - name: Check for erroneous constructs
         run: make lint
-  pr:
-    name: Check that it builds without error
+  dependencies:
+    name: Generate dependency chains
     runs-on: ubuntu-24.04
-    needs: lint
+    outputs:
+      recipes-matrix: ${{ steps.recipes-matrix.outputs.JSON_CONTENT }}
     steps:
       - name: Checkout the Git repository
         uses: actions/checkout@v4
       - name: Setup Toltec dependencies
         uses: ./.github/actions/setup
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: ${{ github.base_ref }}-${{ hashFiles('package/*/package') }}
+      - name: Get recipe lists
+        id: recipes-matrix
+        run: |
+          make .venv/bin/activate
+          echo 'JSON_CONTENT<<EOF' >> $GITHUB_OUTPUT
+          echo '{"include":' >> $GITHUB_OUTPUT
+          make dependency-chain >> $GITHUB_OUTPUT
+          echo "}" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}//${{ github.base_ref }}
+  build:
+    name: Build ${{ matrix.recipes }}
+    runs-on: ubuntu-24.04
+    needs: [lint, dependencies]
+    strategy:
+      matrix: ${{ fromJson(needs.dependencies.outputs.recipes-matrix) }}
+      fail-fast: false
+    steps:
+      - name: Checkout the Git repository
+        uses: actions/checkout@v4
+      - name: Setup Toltec dependencies
+        uses: ./.github/actions/setup
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: ${{ github.base_ref }}-${{ hashFiles('package/*/package') }}
       - name: Build packages
-        run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
-      - name: Save the build output
+        run: make repo-new
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}//${{ github.base_ref }} --filter "${{ matrix.recipes }}"
+          CLEANUP: 1
+      - name: Upload all ipk
         uses: actions/upload-artifact@v4
         with:
-          name: repo
+          name: recipes-${{ matrix.recipes }}
+          path: build/repo/**/*.ipk
+  deploy:
+    name: Deploy experimental branch
+    runs-on: ubuntu-24.04
+    needs: [build]
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }}
+    steps:
+      - name: Checkout the Git repository
+        uses: actions/checkout@v4
+      - name: Setup Toltec dependencies
+        uses: ./.github/actions/setup
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: ${{ github.base_ref }}-${{ hashFiles('package/*/package') }}
+      - name: Download all packages
+        uses: actions/download-artifact@v5
+        with:
           path: build/repo
+          pattern: recipes-*
+          merge-multiple: true
       - name: Build packages for experimental
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }}
-        run: make repo FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
+        run: make repo
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}//${{ github.base_ref }}
+          CLEANUP: 1
       - name: Sync packages with the remote repository
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }}
         uses: ./.github/actions/sync-repository
         with:
           local-path: build/repo/

.github/workflows/stable.yml

@@ -4,17 +4,84 @@ on:
     branches:
       - stable
 jobs:
-  stable:
-    name: Build and publish the stable channel
+  dependencies:
+    name: Generate dependency chains
     runs-on: ubuntu-24.04
+    outputs:
+      recipes-matrix: ${{ steps.recipes-matrix.outputs.JSON_CONTENT }}
     steps:
       - name: Checkout the Git repository
         uses: actions/checkout@v4
       - name: Setup Toltec dependencies
         uses: ./.github/actions/setup
-      - name: Build packages
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: stable-${{ hashFiles('package/*/package') }}
+      - name: Get recipe lists
+        id: recipes-matrix
         run: |
-          make repo FLAGS='--remote-repo ${{ secrets.REMOTE_HTTP }}/stable'
+          make .venv/bin/activate
+          echo 'JSON_CONTENT<<EOF' >> $GITHUB_OUTPUT
+          echo '{"include":' >> $GITHUB_OUTPUT
+          make dependency-chain >> $GITHUB_OUTPUT
+          echo "}" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}/stable
+  build:
+    name: Build ${{ matrix.recipes }}
+    runs-on: ubuntu-24.04
+    needs: [dependencies]
+    strategy:
+      matrix: ${{ fromJson(needs.dependencies.outputs.recipes-matrix) }}
+      fail-fast: false
+    steps:
+      - name: Checkout the Git repository
+        uses: actions/checkout@v4
+      - name: Setup Toltec dependencies
+        uses: ./.github/actions/setup
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: stable-${{ hashFiles('package/*/package') }}
+      - name: Build packages
+        run: make repo-new
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}/stable --filter "${{ matrix.recipes }}"
+          CLEANUP: 1
+      - name: Upload all ipk
+        uses: actions/upload-artifact@v4
+        with:
+          name: recipes-${{ matrix.recipes }}
+          path: build/repo/**/*.ipk
+  deploy:
+    name: Deploy stable branch
+    runs-on: ubuntu-24.04
+    needs: [build]
+    steps:
+      - name: Checkout the Git repository
+        uses: actions/checkout@v4
+      - name: Setup Toltec dependencies
+        uses: ./.github/actions/setup
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: stable-${{ hashFiles('package/*/package') }}
+      - name: Download all packages
+        uses: actions/download-artifact@v5
+        with:
+          path: build/repo
+          pattern: recipes-*
+          merge-multiple: true
+      - name: Build packages for stable
+        run: make repo
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}//stable
+          CLEANUP: 1
       - name: Sync packages with the remote repository
         uses: ./.github/actions/sync-repository
         with:

.github/workflows/testing.yml

@@ -4,17 +4,84 @@ on:
     branches:
       - testing
 jobs:
-  testing:
-    name: Build and publish the testing channel
+  dependencies:
+    name: Generate dependency chains
     runs-on: ubuntu-24.04
+    outputs:
+      recipes-matrix: ${{ steps.recipes-matrix.outputs.JSON_CONTENT }}
     steps:
       - name: Checkout the Git repository
         uses: actions/checkout@v4
       - name: Setup Toltec dependencies
         uses: ./.github/actions/setup
-      - name: Build packages
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: testing-${{ hashFiles('package/*/package') }}
+      - name: Get recipe lists
+        id: recipes-matrix
         run: |
-          make repo FLAGS='--remote-repo ${{ secrets.REMOTE_HTTP }}/testing'
+          make .venv/bin/activate
+          echo 'JSON_CONTENT<<EOF' >> $GITHUB_OUTPUT
+          echo '{"include":' >> $GITHUB_OUTPUT
+          make dependency-chain >> $GITHUB_OUTPUT
+          echo "}" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}//testing
+  build:
+    name: Build ${{ matrix.recipes }}
+    runs-on: ubuntu-24.04
+    needs: [dependencies]
+    strategy:
+      matrix: ${{ fromJson(needs.dependencies.outputs.recipes-matrix) }}
+      fail-fast: false
+    steps:
+      - name: Checkout the Git repository
+        uses: actions/checkout@v4
+      - name: Setup Toltec dependencies
+        uses: ./.github/actions/setup
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: testing-${{ hashFiles('package/*/package') }}
+      - name: Build packages
+        run: make repo-new
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}//testing --filter "${{ matrix.recipes }}"
+          CLEANUP: 1
+      - name: Upload all ipk
+        uses: actions/upload-artifact@v4
+        with:
+          name: recipes-${{ matrix.recipes }}
+          path: build/repo/**/*.ipk
+  deploy:
+    name: Deploy testing branch
+    runs-on: ubuntu-24.04
+    needs: [build]
+    steps:
+      - name: Checkout the Git repository
+        uses: actions/checkout@v4
+      - name: Setup Toltec dependencies
+        uses: ./.github/actions/setup
+      - name: Cache repo
+        uses: actions/cache@v4
+        with:
+          path: build/repo
+          key: testing-${{ hashFiles('package/*/package') }}
+      - name: Download all packages
+        uses: actions/download-artifact@v5
+        with:
+          path: build/repo
+          pattern: recipes-*
+          merge-multiple: true
+      - name: Build packages for testing
+        run: make repo
+        env:
+          FLAGS: --remote-repo ${{ secrets.REMOTE_HTTP }}//testing
+          CLEANUP: 1
       - name: Sync packages with the remote repository
         uses: ./.github/actions/sync-repository
         with:

Makefile

@@ -8,6 +8,13 @@ RECIPES_CLEAN=$(foreach app, $(RECIPES), $(app)-clean)
 
 ifeq ($(RUNNER_DEBUG), 1)
 FLAGS+= --verbose
+else
+ifeq ($(VERBOSE), 1)
+FLAGS+= --verbose
+endif
+endif
+ifeq ($(CLEANUP), 1)
+FLAGS+= --cleanup
 endif
 
 define USAGE
@@ -62,6 +69,10 @@ repo-local: .venv/bin/activate
 	. .venv/bin/activate; \
 	./scripts/repo_build.py --local $(FLAGS)
 
+dependency-chain: .venv/bin/activate
+	@. .venv/bin/activate; \
+	./scripts/dependency_chain.py $(FLAGS)
+
 repo-new: .venv/bin/activate
 	. .venv/bin/activate; \
 	./scripts/repo_build.py --diff $(FLAGS)
@@ -112,7 +123,7 @@ format-fix: .venv/bin/activate
 
 lint: .venv/bin/activate
 	@echo "==> Linting Bash scripts"
-# 	shellcheck $$(shfmt -f .) -P SCRIPTDIR
+	shellcheck $$(shfmt -f .) -P SCRIPTDIR
 	@echo "==> Typechecking Python files"
 	. .venv/bin/activate; \
 	MYPYPATH=scripts mypy --disallow-untyped-defs scripts
@@ -130,6 +141,8 @@ clean:
     help \
     repo \
     repo-local \
+    dependency-chain \
+    repo-new \
     repo-check \
     $(RECIPES) \
     $(RECIPES_PUSH) \

docs/package.md

@@ -38,17 +38,24 @@ You can also declare custom variables to reduce repetition but make sure to pref
 The list of devices that are compatible with this package.
 The following values are accepted:
 
-Name        | Meaning
-------------|-------------------------------------------------------------------------
-`rmall`     | Packages which work on all reMarkable devices without modification.
-`rm1`       | Packages requiring reMarkable 1-specific resources or compilation flags.
-`rm2`       | Packages requiring reMarkable 2-specific resources or compilation flags.
-`rmallos2` | Packages which work on all reMarkable devices without modification, but only on the 2.x series of operating system.
-`rm1os2`   | Packages requiring reMarkable 1-specific resources or compilation flags, but only on the 2.x series of operating system.
-`rm2os2`   | Packages requiring reMarkable 2-specific resources or compilation flags, but only on the 2.x series of operating system.
-`rmallos3` | Packages which work on all reMarkable devices without modification, but only on the 3.x series of operating system.
-`rm1os3`   | Packages requiring reMarkable 1-specific resources or compilation flags, but only on the 3.x series of operating system.
-`rm2os3`   | Packages requiring reMarkable 2-specific resources or compilation flags, but only on the 3.x series of operating system.
+Name          | Meaning
+--------------|-------------------------------------------------------------------------
+`rmall`       | Packages which work on all reMarkable devices without modification.
+`rm1`         | Packages requiring reMarkable 1 specific resources or compilation flags.
+`rm2`         | Packages requiring reMarkable 2 specific resources or compilation flags.
+`rmpp`        | Packages requiring reMarkable Paper Pro specific resources or compilation flags.
+`rmppm`       | Packages requiring reMarkable Paper Pro Move specific resources or compilation flags.
+`rmallos2`    | Packages which work on all reMarkable devices without modification, but only on the 2.x series of operating system.
+`rm1os2`      | Packages requiring reMarkable 1 specific resources or compilation flags, but only on the 2.x series of operating system.
+`rm2os2`      | Packages requiring reMarkable 2 specific resources or compilation flags, but only on the 2.x series of operating system.
+`rmallos3`    | Packages which work on all reMarkable devices without modification, but only on 3.0 to 3.3.2 versions of the operating system.
+`rm1os3`      | Packages requiring reMarkable 1 specific resources or compilation flags, but only on 3.0 to 3.3.2 versions of the operating system.
+`rm2os3`      | Packages requiring reMarkable 2 specific resources or compilation flags, but only on 3.0 to 3.3.2 versions of the operating system.
+`rmallos3v22` | Packages which work on all reMarkable devices without modification, but only on 3.22.0.64 or newer operating system versions.
+`rm1os3v22`   | Packages requiring reMarkable 1-specific resources or compilation flags, but only on 3.22.0.64 or newer operating system versions.
+`rm2os3v22`   | Packages requiring reMarkable 2-specific resources or compilation flags, but only on 3.22.0.64 or newer operating system versions.
+`rmppos3v22`  | Packages requiring reMarkable Paper Pro specific resources or compilation flags, but only on 3.22.0.64 or newer operating system versions.
+`rmppmos3v22` | Packages requiring reMarkable Pape Pro Move specific resources or compilation flags, but only on 3.22.0.64 or newer operating system versions.
 
 For example, use `archs=(rm1)` for a package that only works on reMarkable 1, or `archs=(rm1 rm2)` for a package that works both on reMarkable 1 and reMarkable 2 but needs different dependencies or compilation flags for each of those.
 

package/.shellcheckrc

@@ -13,3 +13,6 @@ disable=SC2034
 # Do not warn about undeclared variables since recipes may use build variables
 # such as `srcdir` or `pkgdir`
 disable=SC2154
+
+# Do not warn about unused functions, such as package() or build()
+disable=SC2329

package/Compatibility

@@ -32,6 +32,7 @@ rm1=3.0.4.1305
 rm1=3.2.2.1581
 rm1=3.2.3.1595
 rm1=3.3.2.1666
+rm1=3.22.0.64
 
 rm2=2.6.1.71
 rm2=2.6.2.75
@@ -68,3 +69,8 @@ rm2=3.0.4.1305
 rm2=3.2.2.1581
 rm2=3.2.3.1595
 rm2=3.3.2.1666
+rm2=3.22.0.64
+
+rmpp=3.22.0.64
+
+rmppm=3.22.0.64

package/appmarkable/package

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 # Copyright (c) 2021 The Toltec Contributors
 # SPDX-License-Identifier: MIT
-
+archs=(rm1 rm2)
 pkgnames=(appmarkable)
 pkgdesc="Front-end for apps that do not have a graphical user interface"
 url="https://github.com/LinusCDE/appmarkable"
-pkgver=0.1.3-1
+pkgver=0.1.3-2
 timestamp=2024-06-01T21:00Z
 section="devel"
 maintainer="Linus K. <linus@cosmos-ink.net>"