v0.0.7

2 files changed, 44 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1083d56535b..f087b3d0c292 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 pkgbase = tkey-ssh-agent
 	pkgdesc = A ssh-agent for the Tillitis TKey
-	pkgver = 0.0.6
-	pkgrel = 2
+	pkgver = 0.0.7
+	pkgrel = 1
 	url = https://github.com/tillitis/tillitis-key1-apps
-	arch = i686
-	arch = x86_64
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
+	arch = ay
 	license = GPL2
 	makedepends = clang
 	makedepends = llvm
 	makedepends = lld
 	makedepends = go
-	source = https://github.com/tillitis/tillitis-key1-apps/archive/refs/tags/v0.0.6.tar.gz
-	sha256sums = d15fc7f556548951989abf6973374f71e039028202e8cad4b70f79539da00aff
+	provides = tkey-ssh-agent
+	conflicts = tkey-ssh-agent2
+	source = git+https://github.com/tillitis/tillitis-key1-apps.git#commit=7e18bcb
+	source = git+https://github.com/tillitis/tkey-libs.git#commit=d589e5e
+	source = git+https://github.com/tillitis/tkey-device-signer#commit=92a091c
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
 
 pkgname = tkey-ssh-agent
diff --git a/PKGBUILD b/PKGBUILD
index 0c612c4bbc04..a206eae880ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,48 @@
 
 pkgname=tkey-ssh-agent
 _pkgname=tillitis-key1-apps
-pkgver=0.0.6
-pkgrel=2
+_libname=tkey-libs
+_appname=tkey-device-signer
+pkgver=0.0.7
+pkgrel=1
 pkgdesc="A ssh-agent for the Tillitis TKey"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/tillitis/tillitis-key1-apps"
 license=('GPL2')
 makedepends=('clang' 'llvm' 'lld' 'go')
-source=("https://github.com/tillitis/tillitis-key1-apps/archive/refs/tags/v${pkgver}.tar.gz")
-sha256sums=('d15fc7f556548951989abf6973374f71e039028202e8cad4b70f79539da00aff')
+conflicts=("${pkgname}2")
+provides=("${pkgname}")
+source=("git+https://github.com/tillitis/tillitis-key1-apps.git#commit=7e18bcb"
+        "git+https://github.com/tillitis/tkey-libs.git#commit=d589e5e"
+        "git+https://github.com/tillitis/tkey-device-signer#commit=92a091c")
+b2sums=('SKIP'
+        'SKIP'
+        'SKIP')
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make OBJCOPY="llvm-objcopy" apps tkey-ssh-agent
+  cd "${srcdir}/${_libname}"
+  make OBJCOPY="llvm-objcopy"
+
+  cd "${srcdir}/${_appname}"
+  make OBJCOPY="llvm-objcopy"
+
+  cd "${srcdir}/${_pkgname}"
+  cp "${srcdir}/${_appname}/signer/app.bin" ./cmd/tkey-ssh-agent/app.bin
+  make OBJCOPY="llvm-objcopy"
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" PREFIX=/usr install
+  destbin="${pkgdir}/usr/bin"
+  destman1="${pkgdir}/usr/share/man/man1"
+  destunit="${pkgdir}/usr/lib/systemd/user"
+  destrules="${pkgdir}/etc/udev/rules.d"
+  cd "${srcdir}/${_pkgname}"
+	install -Dm755 tkey-ssh-agent "${destbin}/tkey-ssh-agent"
+	strip "${destbin}"/tkey-ssh-agent
+	install -Dm644 system/tkey-ssh-agent.1 "${destman1}"/tkey-ssh-agent.1
+	gzip -n9f "${destman1}"/tkey-ssh-agent.1
+	install -Dm644 system/tkey-ssh-agent.service.tmpl "${destunit}"/tkey-ssh-agent.service
+	sed -i -e "s,##BINDIR##,/usr/bin," "${destunit}"/tkey-ssh-agent.service
+	install -Dm644 system/60-tkey.rules "${destrules}"/60-tkey.rules
 }