1 files changed, 23 insertions(+), 29 deletions(-)

M .build.yml

@@ 26,19 26,6 @@ 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 "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
-      sed -i -E 's#[^.]+.patch##' 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


@@ 50,9 37,8 @@ tasks:
       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
+      sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
+      abuild checksum
       cd
       ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
 


@@ 63,9 49,8 @@ tasks:
       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
+      sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
+      abuild checksum
       cd
       ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
 


@@ 76,9 61,8 @@ tasks:
       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
+      sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
+      abuild checksum
       cd
       ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
 


@@ 89,9 73,8 @@ tasks:
       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
+      sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
+      abuild checksum
       cd
       ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
 


@@ 102,13 85,24 @@ tasks:
       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
+      sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
+      abuild checksum
       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 "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
+      # pmaports patches sxmo-utils so here we undo that.., yes its a hack andll be reversed eventually
+      sed -i -E 's#[^.]+.patch##' APKBUILD
+      abuild checksum
+      cd
+      ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
 
   - build_image: |
       ./pmbootstrap/pmbootstrap.py chroot -b aarch64 ls