diff --git a/cross/musl-aarch64/APKBUILD b/cross/musl-aarch64/APKBUILD
index 1b9bdfb6e..4432341d7 100644
--- a/cross/musl-aarch64/APKBUILD
+++ b/cross/musl-aarch64/APKBUILD
@@ -1,9 +1,14 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen musl-aarch64
 
-pkgname="musl-aarch64"
-pkgver="1.1.24"
-pkgrel=8
+# Stub for apkbuild-lint
+if [ -z "$(type -t arch_to_hostspec)" ]; then
+	arch_to_hostspec() { :; }
+fi
+
+pkgname=musl-aarch64
+pkgver=1.1.24
+pkgrel=9
 arch="armhf armv7 x86_64 x86"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -18,37 +23,37 @@ pkgdesc="the musl library (lib c) implementation for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-    musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk
-    musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk
+	musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk
+	musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk
 "
 
 package() {
-    mkdir -p "$pkgdir/usr/$_target"
-    cd "$pkgdir/usr/$_target"
-    # Use 'busybox tar' to avoid 'tar: Child returned status 141'
-    # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-    busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk
-    rm .PKGINFO .SIGN.*
+	mkdir -p "$pkgdir/usr/$_target"
+	cd "$pkgdir/usr/$_target"
+	# Use 'busybox tar' to avoid 'tar: Child returned status 141'
+	# on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
+	busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk
+	rm .PKGINFO .SIGN.*
 }
 package_dev() {
-    mkdir -p "$subpkgdir/usr/$_target"
-    cd "$subpkgdir/usr/$_target"
-    # Use 'busybox tar' to avoid 'tar: Child returned status 141'
-    # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-    busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk
-    rm .PKGINFO .SIGN.*
+	mkdir -p "$subpkgdir/usr/$_target"
+	cd "$subpkgdir/usr/$_target"
+	# Use 'busybox tar' to avoid 'tar: Child returned status 141'
+	# on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
+	busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk
+	rm .PKGINFO .SIGN.*
 
-    # symlink everything from /usr/$_target/usr/* to /usr/$_target/*
-    # so the cross-compiler gcc does not fail to build.
-    for _dir in include lib; do
-        mkdir -p "$subpkgdir/usr/$_target/$_dir"
-        cd "$subpkgdir/usr/$_target/usr/$_dir"
-        for i in *; do
-            cd "$subpkgdir/usr/$_target/$_dir"
-            ln -s /usr/$_target/usr/$_dir/$i $i
-        done
-    done
+	# symlink everything from /usr/$_target/usr/* to /usr/$_target/*
+	# so the cross-compiler gcc does not fail to build.
+	for _dir in include lib; do
+		mkdir -p "$subpkgdir/usr/$_target/$_dir"
+		cd "$subpkgdir/usr/$_target/usr/$_dir"
+		for i in *; do
+			cd "$subpkgdir/usr/$_target/$_dir"
+			ln -s /usr/$_target/usr/$_dir/$i $i
+		done
+	done
 }
 
-sha512sums="86fd2835dbb0ae3bce9104945cd1e3278e4326917a75dd368bcd4c15bbd60bb96edc705787a0186b3772669ecb32d78c54f8a0eafdda7a8c0fcc9fde306805be  musl-1.1.24-r8-aarch64.apk
-d1f2a942bac0dc18df91381a30c779a4a9697b1747c46e696220e8be78d9e8b6c4e5337c7b5799079dbe3623b3ec1ab97150b001a07a288a22ffce08598821b3  musl-dev-1.1.24-r8-aarch64.apk"
+sha512sums="0aa5ddaea60c3d2bceb4a0f08c02354a5bcddde59f2a6041be5270ab194d698fb5ac4a73f7bd2e28ec4b9ff1d29a4826ae2cfc7ee106ae77e81e271873ef9b2e  musl-1.1.24-r9-aarch64.apk
+b11d9414ab16477b6b1fbc97cd7dd222ec8a6d60fd85200d1d8159dfa70c8b5ea2875a7f138eb29b3923f9a6c1b2e02008533d83bd9855783a5f53d5649e6723  musl-dev-1.1.24-r9-aarch64.apk"
diff --git a/cross/musl-armhf/APKBUILD b/cross/musl-armhf/APKBUILD
index 405b10063..75d1ef187 100644
--- a/cross/musl-armhf/APKBUILD
+++ b/cross/musl-armhf/APKBUILD
@@ -1,9 +1,14 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen musl-armhf
 
-pkgname="musl-armhf"
-pkgver="1.1.24"
-pkgrel=8
+# Stub for apkbuild-lint
+if [ -z "$(type -t arch_to_hostspec)" ]; then
+	arch_to_hostspec() { :; }
+fi
+
+pkgname=musl-armhf
+pkgver=1.1.24
+pkgrel=9
 arch="armv7 aarch64 x86_64 x86"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -18,37 +23,37 @@ pkgdesc="the musl library (lib c) implementation for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-    musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk
-    musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk
+	musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk
+	musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk
 "
 
 package() {
-    mkdir -p "$pkgdir/usr/$_target"
-    cd "$pkgdir/usr/$_target"
-    # Use 'busybox tar' to avoid 'tar: Child returned status 141'
-    # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-    busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk
-    rm .PKGINFO .SIGN.*
+	mkdir -p "$pkgdir/usr/$_target"
+	cd "$pkgdir/usr/$_target"
+	# Use 'busybox tar' to avoid 'tar: Child returned status 141'
+	# on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
+	busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk
+	rm .PKGINFO .SIGN.*
 }
 package_dev() {
-    mkdir -p "$subpkgdir/usr/$_target"
-    cd "$subpkgdir/usr/$_target"
-    # Use 'busybox tar' to avoid 'tar: Child returned status 141'
-    # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-    busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk
-    rm .PKGINFO .SIGN.*
+	mkdir -p "$subpkgdir/usr/$_target"
+	cd "$subpkgdir/usr/$_target"
+	# Use 'busybox tar' to avoid 'tar: Child returned status 141'
+	# on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
+	busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk
+	rm .PKGINFO .SIGN.*
 
-    # symlink everything from /usr/$_target/usr/* to /usr/$_target/*
-    # so the cross-compiler gcc does not fail to build.
-    for _dir in include lib; do
-        mkdir -p "$subpkgdir/usr/$_target/$_dir"
-        cd "$subpkgdir/usr/$_target/usr/$_dir"
-        for i in *; do
-            cd "$subpkgdir/usr/$_target/$_dir"
-            ln -s /usr/$_target/usr/$_dir/$i $i
-        done
-    done
+	# symlink everything from /usr/$_target/usr/* to /usr/$_target/*
+	# so the cross-compiler gcc does not fail to build.
+	for _dir in include lib; do
+		mkdir -p "$subpkgdir/usr/$_target/$_dir"
+		cd "$subpkgdir/usr/$_target/usr/$_dir"
+		for i in *; do
+			cd "$subpkgdir/usr/$_target/$_dir"
+			ln -s /usr/$_target/usr/$_dir/$i $i
+		done
+	done
 }
 
-sha512sums="31d00a508dc7aba314f710a596166376ff03a95bf854b55f59649d255f5bf21eaf17895925a55b87eee1c226bf6230ab71afa8d7c8a5db8a8156940eff11e85c  musl-1.1.24-r8-armhf.apk
-93653c4592f9c1d06fe0ae8db56d090653077a5c45c240b1362b3d02eb21a08e6acb62b693f3201fc831e8b3de8a1d561e86af5bad1a5bd1bf4903e4355f6880  musl-dev-1.1.24-r8-armhf.apk"
+sha512sums="7a7521bc71174b0b481f276b1a2b11067982e9f4639c14665ad9cca4cf2fe756b60096ce06a5a257a6ec91ad811946debae932118ea3dbad1002300fe7f681d3  musl-1.1.24-r9-armhf.apk
+5ffc9367b34b6ea722007f7152ea51fe242222925aa3ea9b0f0f426d437502066685443d2decbf3475e3b92add79749e6cc7de01403ddf3a9e708aedd98e516b  musl-dev-1.1.24-r9-armhf.apk"
diff --git a/cross/musl-armv7/APKBUILD b/cross/musl-armv7/APKBUILD
index 09316be6e..b00cf97a6 100644
--- a/cross/musl-armv7/APKBUILD
+++ b/cross/musl-armv7/APKBUILD
@@ -1,9 +1,14 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen musl-armv7
 
-pkgname="musl-armv7"
-pkgver="1.1.24"
-pkgrel=8
+# Stub for apkbuild-lint
+if [ -z "$(type -t arch_to_hostspec)" ]; then
+	arch_to_hostspec() { :; }
+fi
+
+pkgname=musl-armv7
+pkgver=1.1.24
+pkgrel=9
 arch="armhf aarch64 x86_64 x86"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -18,37 +23,37 @@ pkgdesc="the musl library (lib c) implementation for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-    musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk
-    musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk
+	musl-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-$pkgver-r$pkgrel.apk
+	musl-dev-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/musl-dev-$pkgver-r$pkgrel.apk
 "
 
 package() {
-    mkdir -p "$pkgdir/usr/$_target"
-    cd "$pkgdir/usr/$_target"
-    # Use 'busybox tar' to avoid 'tar: Child returned status 141'
-    # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-    busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk
-    rm .PKGINFO .SIGN.*
+	mkdir -p "$pkgdir/usr/$_target"
+	cd "$pkgdir/usr/$_target"
+	# Use 'busybox tar' to avoid 'tar: Child returned status 141'
+	# on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
+	busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch.apk
+	rm .PKGINFO .SIGN.*
 }
 package_dev() {
-    mkdir -p "$subpkgdir/usr/$_target"
-    cd "$subpkgdir/usr/$_target"
-    # Use 'busybox tar' to avoid 'tar: Child returned status 141'
-    # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-    busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk
-    rm .PKGINFO .SIGN.*
+	mkdir -p "$subpkgdir/usr/$_target"
+	cd "$subpkgdir/usr/$_target"
+	# Use 'busybox tar' to avoid 'tar: Child returned status 141'
+	# on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
+	busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch.apk
+	rm .PKGINFO .SIGN.*
 
-    # symlink everything from /usr/$_target/usr/* to /usr/$_target/*
-    # so the cross-compiler gcc does not fail to build.
-    for _dir in include lib; do
-        mkdir -p "$subpkgdir/usr/$_target/$_dir"
-        cd "$subpkgdir/usr/$_target/usr/$_dir"
-        for i in *; do
-            cd "$subpkgdir/usr/$_target/$_dir"
-            ln -s /usr/$_target/usr/$_dir/$i $i
-        done
-    done
+	# symlink everything from /usr/$_target/usr/* to /usr/$_target/*
+	# so the cross-compiler gcc does not fail to build.
+	for _dir in include lib; do
+		mkdir -p "$subpkgdir/usr/$_target/$_dir"
+		cd "$subpkgdir/usr/$_target/usr/$_dir"
+		for i in *; do
+			cd "$subpkgdir/usr/$_target/$_dir"
+			ln -s /usr/$_target/usr/$_dir/$i $i
+		done
+	done
 }
 
-sha512sums="3fb153e8f0d932c422849d1a929786aaa8579c51f53dcad38a04d2ce587d8542212d1f330472d2d57e18a5f9150377cb438bdb043c09780ccd9dcafdf243ff01  musl-1.1.24-r8-armv7.apk
-47ca8eb9b022a8b582b39b79acc77ce268f82a9f5c83b74e11efa94b614ce67e14592911c6bf78663af977b4b7ee6ae140c81ff2fec3d3aa8971f842fd328f4a  musl-dev-1.1.24-r8-armv7.apk"
+sha512sums="7cada2cbad1cb2d5e28b2b35ba72125d6f133051a6f9718640f51cd71bef8b9db3b66c0554847cdd5781bb5fd9fcab6f2e9af3cc60583fe3332086da1e8dd18a  musl-1.1.24-r9-armv7.apk
+6754eabd258c2c8ab908bd3b0b461cea79c9a01822c90fc72e23a90fda0006659f99e75c92877a42d0015d2579e10bd285126bfc02219aad07101dc6ca4e2126  musl-dev-1.1.24-r9-armv7.apk"