Bump to 0.2.6

Also adopt new GH repo naming, and adjust installation to be inline with
the go guidelines on the arch wiki

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29affccfbd04..dd4382d2390d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = packer-builder-arm-image
 	pkgdesc = Packer plugin for ARM images
-	pkgver = 0.1.6
-	pkgrel = 2
-	url = https://github.com/solo-io/packer-builder-arm-image
-	arch = i686
+	pkgver = 0.2.6
+	pkgrel = 1
+	url = https://github.com/solo-io/packer-plugin-arm-image
 	arch = x86_64
-	arch = armv7h
-	arch = armv6h
-	arch = aarch64
 	license = APACHE
 	makedepends = go
 	depends = glibc
 	depends = multipath-tools
 	depends = qemu-user-static
-	source = packer-builder-arm-image-0.1.6.tar.gz::https://github.com/solo-io/packer-builder-arm-image/archive/v0.1.6.tar.gz
-	b2sums = e563eb298286bc990bbb26e58944c37aec688eded6ea84300156e6e663888de8b29bdd7bb867ac0acc3f7d8dd6733d6cceded777d42ffa0767885aca157a0313
+	source = packer-builder-arm-image-0.2.6.tar.gz::https://github.com/solo-io/packer-plugin-arm-image/archive/v0.2.6.tar.gz
+	b2sums = d34a7cdb00263ebcbfc78fcf32cf47d7d4880f525747feef6177ceb320c93c9745dcb8e443d406b141bfc3389f52fc60cb14e616c6b02b8d38ebc1b2c3d40c1c
 
 pkgname = packer-builder-arm-image
-
diff --git a/PKGBUILD b/PKGBUILD
index b6e2db0c7c55..a86615cf32c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,33 @@
-# Maintainer: Jamie Magee <jamie dot magee at gmail dot com>
+# Maintainer: Laura Demkowicz-Duffy <laura@demkowiczduffy.co.uk>
 pkgname=packer-builder-arm-image
-pkgver=0.1.6
-pkgrel=2
+_pkgname=packer-plugin-arm-image
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Packer plugin for ARM images"
-url="https://github.com/solo-io/${pkgname}"
-arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
+url="https://github.com/solo-io/${_pkgname}"
+arch=('x86_64')
 license=('APACHE')
 depends=('glibc' 'multipath-tools' 'qemu-user-static')
 makedepends=('go')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/solo-io/${pkgname}/archive/v${pkgver}.tar.gz")
-b2sums=('e563eb298286bc990bbb26e58944c37aec688eded6ea84300156e6e663888de8b29bdd7bb867ac0acc3f7d8dd6733d6cceded777d42ffa0767885aca157a0313')
-
-prepare() {
-  mkdir -p src/github.com/solo-io/
-  ln -rTsf "${pkgname}-${pkgver}" "src/github.com/solo-io/${pkgname}"
-}
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/solo-io/${_pkgname}/archive/v${pkgver}.tar.gz")
+b2sums=('d34a7cdb00263ebcbfc78fcf32cf47d7d4880f525747feef6177ceb320c93c9745dcb8e443d406b141bfc3389f52fc60cb14e616c6b02b8d38ebc1b2c3d40c1c')
 
 build() {
-  export GOPATH="${srcdir}"
-  cd "src/github.com/solo-io/${pkgname}"
-  go install \
-    -gcflags "all=-trimpath=${PWD}" \
-    -asmflags "all=-trimpath=${PWD}" \
-    -ldflags "-extldflags ${LDFLAGS}" \
-    ./...
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  # From https://wiki.archlinux.org/title/Go_package_guidelines#Flags_and_build_options
+  go mod download
+  go build \
+    -buildmode=pie \
+    -trimpath \
+    -ldflags "-linkmode=external -extldflags \"${LDFLAGS}\"" \
+    -mod=readonly \
+    -modcacherw \
+    -o ${_pkgname} \
+    .
 }
 
 package() {
-  install -Dm755 "bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/src/github.com/solo-io/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  install -Dm755 "${_pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }