4 files changed, 30 insertions(+), 20 deletions(-)

M Makefile
M src/git.sr.ht/APKBUILD
M src/meta.sr.ht/APKBUILD
M src/todo.sr.ht/APKBUILD

@@ 1,31 1,41 @@
-REPO=admin-arch4:/tank/data/pkg/alpine/v3.20
-
-ls:
-	simple-builder -repository $(REPO)/x86_64
-	simple-builder -repository $(REPO)/aarch64
-
 clean:
 	rm -rf pkg
 
 pkg:
-	mkdir -p pkg/x86_64
-	rsync --recursive --update --times --verbose $(REPO)/x86_64 ./pkg/x86_64
-	mkdir -p pkg/aarch64
-	rsync --recursive --update --times --verbose $(REPO)/aarch64 ./pkg/aarch64
+	mkdir pkg
+
+pkg/x86_64:
+	mkdir pkg/x86_64
+	rsync --recursive --update --times --verbose admin-arch4:/tank/data/pkg/alpine/v3.20/x86_64 ./pkg/x86_64
+
+pkg/aarch64:
+	mkdir pkg/aarch64
+	rsync --recursive --update --times --verbose admin-arch4:/tank/data/pkg/alpine/v3.20/aarch64 ./pkg/aarch64
 
 PWD=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
 shell:
-	docker run --rm --interactive --tty --entrypoint sh \
+	docker run --platform linux/arm64 --rm --interactive --tty --entrypoint sh \
 		--mount type=bind,src=$(PWD)src,dst=/home/builder/src \
 		--mount type=bind,src=$(PWD)pkg,dst=/home/builder/packages/src \
 		$(MOUNTS) registry.intra.dominic-ricottone.com/apkbuilder:latest
 
-build: pkg
+ls-native:
+	simple-builder -repository admin-arch4:/tank/data/pkg/alpine/v3.20/x86_64
+
+build-native: pkg pkg/x86_64
 	docker pull --platform linux/amd64 registry.intra.dominic-ricottone.com/apkbuilder:latest
-	simple-builder -repository $(REPO)/x86_64 -build
+	simple-builder -repository admin-arch4:/tank/data/pkg/alpine/v3.20/x86_64 -build
 	docker image rm registry.intra.dominic-ricottone.com/apkbuilder:latest
+
+ls-arm:
+	simple-builder -repository admin-arch4:/tank/data/pkg/alpine/v3.20/aarch64
+
+crossbuild-arm: pkg pkg/aarch64
 	docker pull --platform linux/arm64 registry.intra.dominic-ricottone.com/apkbuilder:latest
-	simple-builder -repository $(REPO)/aarch64 -build
+	simple-builder -repository admin-arch4:/tank/data/pkg/alpine/v3.20/aarch64 -build
 	docker image rm registry.intra.dominic-ricottone.com/apkbuilder:latest
 
-.PHONY: clean ls shell build
+build: build-native crossbuild-arm
+
+.PHONY: clean ls-native ls-arm shell build build-native crossbuild-arm

@@ 13,7 13,7 @@ depends="
 	py3-redis
 	py3-scmsrht
 "
-makedepends="py-setuptools sassc go minify"
+makedepends="py-setuptools sassc gcc go minify"
 subpackages="$pkgname-openrc $pkgname-nginx:_nginx:noarch"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz


@@ 27,7 27,7 @@ source="
 	git.sr.ht.gunicorn.conf.py
 "
 export PKGVER=$pkgver
-options="$options !check"
+options="$options net !check"
 install="$pkgname.post-install $pkgname.post-upgrade"
 
 build() {

@@ 15,7 15,7 @@ depends="
 	py3-srht
 	py3-zxcvbn
 "
-makedepends="py-setuptools sassc go minify"
+makedepends="py-setuptools sassc gcc go minify"
 subpackages="$pkgname-openrc $pkgname-billing:_billing:noarch $pkgname-nginx:_nginx:noarch"
 # XXX: Is this sr.ht-nginx URL acceptable? I'm not sure how to version it
 source="


@@ 31,7 31,7 @@ source="
 "
 builddir="$srcdir/$pkgname-$pkgver"
 export PKGVER=$pkgver
-options="$options !check"
+options="$options net !check"
 install="$pkgname.post-install $pkgname.post-upgrade"
 
 build() {

@@ 27,7 27,7 @@ source="
 	todo.sr.ht.gunicorn.conf.py
 "
 export PKGVER=$pkgver
-options="$options !check"
+options="$options net !check"
 install="$pkgname.post-install $pkgname.post-upgrade"
 
 build() {