diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index cca8144..09e7151 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -30,7 +30,7 @@ jobs: git clone https://github.com/QubesOS/qubes-linux-template-builder qubes-builder/qubes-src/linux-template-builder patch -d qubes-builder/qubes-src/linux-template-builder -p1 -i $GITHUB_WORKSPACE/.forgejo/patches/linux-template-builder_use-fuse.patch echo "%define _arch x86_64" >> qubes-builder/qubes-src/linux-template-builder/templates.spec - echo "4.3.0" > qubes-builder/qubes-src/linux-template-builder/version + echo "4.2.0" > qubes-builder/qubes-src/linux-template-builder/version sed "s|DISTS_VM :.*|DISTS_VM := $DIST|" -i ./qubes-builder/builder.conf cd qubes-builder make linux-template-builder diff --git a/README.md b/README.md index df1818b..5df3404 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ cp /home/user/.abuild/*.pub /etc/apk/keys ``` mkdir work cd work -git clone https://ayakael.net/forge/qports -b +git clone https://ayakael.net/forge/qports -b ``` **3) Build all packages using `buildrepo`** @@ -123,7 +123,7 @@ export QUBESALPINE_KEYFILE= ``` mkdir work cd work -git clone https://ayakael.net/forge/qubes-builder-alpine -b +git clone https://ayakael.net/forge/qubes-builder-alpine -b ``` **2) Set-up build environment for QubesOS template build** @@ -140,9 +140,9 @@ git clone https://github.com/QubesOS/qubes-linux-template-builder qubes-builder/ ``` echo "%define _arch x86_64" >> qubes-builder/qubes-src/linux-template-builder/templates.spec -echo "4.3.0" > qubes-builder/qubes-src/linux-template-builder/version +echo "4.2.0" > qubes-builder/qubes-src/linux-template-builder/version ``` -If you want to build a different Alpine version than default, you can modify `qubes-builder/builder.conf` on line `DIST_VM` to alpine (i.e alpine322). +If you want to build a different Alpine version than default, you can modify `qubes-builder/builder.conf` on line `DIST_VM` to alpine (i.e alpine320). **4) Build template** diff --git a/scripts/04_install_qubes.sh b/scripts/04_install_qubes.sh index b9a12be..90806cd 100755 --- a/scripts/04_install_qubes.sh +++ b/scripts/04_install_qubes.sh @@ -19,7 +19,7 @@ APKTOOLS_CACHE_DIR="${CACHEDIR}/apk_cache" ALPINELINUX_VERSION=${DIST_VER:-latest-stable} QUBESALPINE_MIRROR="${QUBESALPINE_MIRROR:-https://ayakael.net/api/packages/forge/alpine}" QUBESALPINE_KEYFILE="${QUBESALPINE_KEYFILE:-https://ayakael.net/api/packages/forge/alpine/key}" -QUBES_REL="${QUBES_REL:-r4.3}" +QUBES_REL="${QUBES_REL:-r4.2}" export APK_CACHE_DIR set -e