use signed commit

2 files changed, 29 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e1a10b647f1..be8e14e2cfd2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = system76-io-dkms
 	pkgdesc = DKMS module for controlling System76 Io board
 	pkgver = 1.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pop-os/system76-io-dkms
 	arch = x86_64
 	license = GPL3
+	makedepends = git
 	depends = dkms
-	source = system76-io-dkms-1.0.1.tar.gz::https://github.com/pop-os/system76-io-dkms/archive/1.0.1.tar.gz
-	sha256sums = 492b334c0861af0e3627eb8f9f25690ba1dc617ba743a4f25ca02740de26db26
+	source = git+https://github.com/pop-os/system76-io-dkms.git#commit=ea5f61a2e0b2749f3f9f7add7b1d8a37085b1ff9?signed
+	validpgpkeys = DA0878FCF806089ED4FDDF58E988B49EE78A7FB1
+	sha256sums = SKIP
 
 pkgname = system76-io-dkms
-
diff --git a/PKGBUILD b/PKGBUILD
index ac9cd8e365f2..efeb5b45f544 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,39 @@
 pkgname=system76-io-dkms
 _modname=system76-io
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="DKMS module for controlling System76 Io board"
 arch=('x86_64')
 url="https://github.com/pop-os/system76-io-dkms"
 license=('GPL3')
 depends=('dkms')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-sha256sums=('492b334c0861af0e3627eb8f9f25690ba1dc617ba743a4f25ca02740de26db26')
+makedepends=('git')
+_commit=ea5f61a2e0b2749f3f9f7add7b1d8a37085b1ff9
+source=("git+https://github.com/pop-os/system76-io-dkms.git#commit=$_commit?signed")
+sha256sums=('SKIP')
+validpgpkeys=('DA0878FCF806089ED4FDDF58E988B49EE78A7FB1') # Jeremy Soller <jeremy@system76.com>
+
+pkgver() {
+  cd "$srcdir/$pkgname"
+  git describe --tags | sed 's/-/+/g'
+}
 
 package() {
-	# Installation directory
-	local install_dir="$pkgdir/usr/src/system76-io-$pkgver"
+  cd "$srcdir/$pkgname"
 
-	cd "$pkgname-$pkgver"
+  # Installation directory
+  local install_dir="$pkgdir/usr/src/system76-io-$pkgver"
 
-	# Install source files
-	for file in {Makefile,*.c,*.h}; do
-		[ -f "$file" ] || continue
-		install -D -m644 -t "$install_dir/" "$file"
-	done
+  # Install source files
+  for file in {Makefile,*.c,*.h}; do
+    [ -f "$file" ] || continue
+    install -D -m644 -t "$install_dir/" "$file"
+  done
 
-	# Edit and install dkms configuration
-	sed "s/#MODULE_VERSION#/$pkgver/" "debian/system76-io-dkms.dkms" > "$install_dir/dkms.conf"
+  # Edit and install dkms configuration
+  sed "s/#MODULE_VERSION#/$pkgver/" "debian/system76-io-dkms.dkms" > "$install_dir/dkms.conf"
 
-	# Load the module at boot
-	install -Dm644 "usr/share/initramfs-tools/modules.d/$pkgname.conf" \
-		"$pkgdir/etc/modules-load.d/system76-io.conf"
+  # Load the module at boot
+  install -Dm644 "usr/share/initramfs-tools/modules.d/$pkgname.conf" \
+    "$pkgdir/etc/modules-load.d/system76-io.conf"
 }