From 102a77d3e0e4670787ef8b28271e25e7762a7f59 Mon Sep 17 00:00:00 2001
From: Miles Alan <m@milesalan.com>
Date: Sun, 22 Nov 2020 18:57:16 -0600
Subject: [PATCH] Attempt to fix nightly build image; work around patching in
 upstream

---
 .build.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.build.yml b/.build.yml
index 19f4ce5..32010a5 100644
--- a/.build.yml
+++ b/.build.yml
@@ -1,5 +1,5 @@
 image: alpine/3.12
-packages: [coreutils, procps, py3-requests, xz]
+packages: [alpine-sdk coreutils, procps, py3-requests, xz]
 
 environment:
   #DEVICE: pinebookpro
@@ -26,6 +26,20 @@ tasks:
       mkdir -p ~/.config && cp sxmo-image-builder-nightly/pmbootstrap.cfg ~/.config/
       yes "" | ./pmbootstrap/pmbootstrap.py  --aports=$PWD/pmaports -q init   
 
+  - build_sxmo-utils: |
+      PKG=sxmo-utils
+      cd pmaports/sxmo/$PKG
+      git clone "http://git.sr.ht/~mil/$PKG" --depth 1 $PKG-999
+      tar -czvf $PKG-999.tar.gz $PKG-999/
+      sed -i -E 's#^pkgver=.+#pkgver=999#' APKBUILD
+      sed -i -E "s#^pkgrel=.+#pkgrel=$(date +%s)#" APKBUILD
+      sed -i -E '/^sha512sums=/ d' APKBUILD
+      sed -i -E 's#^source="[^"]+#source=\"$PKG-999.tar.gz\"#' APKBUILD
+      sed -i -E '/.patch$/d' APKBUILD
+      abuild checksum
+      cd
+      ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
+
   # Lisgd is a little bit different because its in alpine
   - build_lisgd: |
       PKG=lisgd
@@ -95,18 +109,6 @@ tasks:
       cd
       ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
 
-  - build_sxmo-utils: |
-      PKG=sxmo-utils
-      cd pmaports/sxmo/$PKG
-      git clone "http://git.sr.ht/~mil/$PKG" --depth 1 $PKG-999
-      tar -czvf $PKG-999.tar.gz $PKG-999/
-      sed -i -E 's#^pkgver=.+#pkgver=999#' APKBUILD
-      sed -i -E "s#^pkgrel=.+#pkgrel=$(date +%s)#" APKBUILD
-      sed -i -E '/^sha512sums=/ d' APKBUILD
-      sed -i -E "s#^source=.+#source=\"$PKG-999.tar.gz\"#" APKBUILD
-      sha512sum $PKG-999.tar.gz | xargs -ISUM echo 'sha512sums="SUM"' >> APKBUILD
-      cd
-      ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
 
 
   - build_image: |
-- 
2.38.5