From 5ff31d7d8b8eda21faa426c1e4c256b32cff66c5 Mon Sep 17 00:00:00 2001
From: Dominic Ricottone <me@dominic-ricottone.com>
Date: Mon, 7 Oct 2024 23:09:29 -0500
Subject: [PATCH] Some further massaging for Alpine v3.20

---
 Makefile                | 40 +++++++++++++++++++++++++---------------
 src/git.sr.ht/APKBUILD  |  4 ++--
 src/meta.sr.ht/APKBUILD |  4 ++--
 src/todo.sr.ht/APKBUILD |  2 +-
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index dc7fe8d..f02af7a 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/src/git.sr.ht/APKBUILD b/src/git.sr.ht/APKBUILD
index 0b8fd4b..ab8bc3c 100644
--- a/src/git.sr.ht/APKBUILD
+++ b/src/git.sr.ht/APKBUILD
@@ -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() {
diff --git a/src/meta.sr.ht/APKBUILD b/src/meta.sr.ht/APKBUILD
index 076cfb5..ffebbb1 100644
--- a/src/meta.sr.ht/APKBUILD
+++ b/src/meta.sr.ht/APKBUILD
@@ -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() {
diff --git a/src/todo.sr.ht/APKBUILD b/src/todo.sr.ht/APKBUILD
index 14c4253..08a55c1 100644
--- a/src/todo.sr.ht/APKBUILD
+++ b/src/todo.sr.ht/APKBUILD
@@ -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() {
-- 
2.45.2