Update to 3.2.0

3 files changed, 60 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 173e4f861d1e..f4ea08137e43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,30 @@
 pkgbase = duetcontrolserver-bin
 	pkgdesc = Control server application for Duet 3 series
-	pkgver = 3.1.1
+	pkgver = 3.2.0
 	pkgrel = 1
-	url = https://github.com/chrishamm/DuetSoftwareFramework.git
+	url = https://github.com/Duet3D/DuetSoftwareFramework.git
+	install = duetcontrolserver-bin.install
 	arch = armv7h
 	arch = aarch64
 	license = GPL3
-	depends = duetruntime>=3.1.1
+	depends = duetsoftwareframework>=3.2.0
+	depends = duetruntime>=3.2.0
 	depends = linux>=4.8
-	provides = duetcontrolserver=3.1.1
+	provides = duetcontrolserver=3.2.0
 	conflicts = duetcontrolserver
 	options = !strip
 	options = staticlibs
 	backup = opt/dsf/conf/config.json
-	source_armv7h = https://pkg.duet3d.com/dists/stable/armv7/binary-armhf/duetcontrolserver_3.1.1_armhf.deb
-	md5sums_armv7h = 6a29a48677ef333dc1bdc72410001ce4
-	sha1sums_armv7h = 7739bbb973afa9719a0706be2c9b25511df58f0c
-	sha256sums_armv7h = 49859e49b52b9bbc9d0951ecc759a46ea22f19f25e1f255f71f2dfcd6ca51d7d
-	sha512sums_armv7h = 10ad236feb9150cc06f40730b541c5ad01cb1f49d3873886a5fe0c223216f3e2ac036d4429a16c8785b7a374967876bff52606011fee2ad20913f8e31e85d5d0
-	source_aarch64 = https://pkg.duet3d.com/dists/stable/armv7/binary-arm64/duetcontrolserver_3.1.1_arm64.deb
-	md5sums_aarch64 = f319c4e79d75c275e5805efc54c83053
-	sha1sums_aarch64 = fea14553bf58f0b34b9ab64f0e8fb06808e5e809
-	sha256sums_aarch64 = 665b3e94ec271084b371cfd60443ec6ae4392b4814e3c4307cf172b0d2c8e9a6
-	sha512sums_aarch64 = 2dac806888e273ec769b1613522d20aa36e1efb71143c908da06aa7c9ecc4e0b231e6acadbc449be490bbf9464856955a08fdf90121eb8ef19c78b77f80c9adb
+	source_armv7h = https://pkg.duet3d.com/dists/stable/armv7/binary-armhf/duetcontrolserver_3.2.0_armhf.deb
+	md5sums_armv7h = d8adeeb610a041426d4b6f12d97c82f1
+	sha1sums_armv7h = 7f2d66d8f87cb4229cf23a93687b887207c4e6f6
+	sha256sums_armv7h = 5ee3d3eeb05f9a563810cbf7eb2b551dcddea1c1003a5bff01966c419c0571b2
+	sha512sums_armv7h = 16fd9864847974000145f57a1e750744f77c44515cf23ce481d995d66bbe9f15e37c4564b9c91d50deebb003eebc4e5c1f2ebe320078be9d5790d4ff65cacd75
+	source_aarch64 = https://pkg.duet3d.com/dists/stable/armv7/binary-arm64/duetcontrolserver_3.2.0_arm64.deb
+	md5sums_aarch64 = 0f8c76de4593fad96c28a58d47126020
+	sha1sums_aarch64 = 40e450214b957563b52eeba87c3f4b35c55fe292
+	sha256sums_aarch64 = 24d7b98c9e99160def1185b0659af4b6f3e36e52ee4dc6b76445e2e344ce60a8
+	sha512sums_aarch64 = 2d00ef230181cf02340465dddfaa04bc080dd083025691ecffb13bf51f79049e783e422c5fa279d2234a67654230b7560f9ddfb194c0b07fd7e475b94e317788
 
 pkgname = duetcontrolserver-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 105837f07c20..aacfe3482195 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,51 @@
 # Maintainer: Manuel Coenen <manuel.coenen@gmail.com>
 pkgname=duetcontrolserver-bin
-pkgver=3.1.1
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Control server application for Duet 3 series"
 arch=('armv7h' 'aarch64')
-url="https://github.com/chrishamm/DuetSoftwareFramework.git"
+url="https://github.com/Duet3D/DuetSoftwareFramework.git"
 license=('GPL3')
 provides=("duetcontrolserver=${pkgver}")
 conflicts=("duetcontrolserver")
-depends=("duetruntime>=${pkgver}" 'linux>=4.8')
+depends=(
+	"duetsoftwareframework>=${pkgver}"
+	"duetruntime>=${pkgver}"
+	'linux>=4.8'
+)
 options=(!strip staticlibs)
+install="${pkgname}.install"
 backup=('opt/dsf/conf/config.json')
 source_armv7h=("https://pkg.duet3d.com/dists/stable/armv7/binary-armhf/duetcontrolserver_${pkgver}_armhf.deb")
 source_aarch64=("https://pkg.duet3d.com/dists/stable/armv7/binary-arm64/duetcontrolserver_${pkgver}_arm64.deb")
-md5sums_armv7h=('6a29a48677ef333dc1bdc72410001ce4')
-md5sums_aarch64=('f319c4e79d75c275e5805efc54c83053')
-sha1sums_armv7h=('7739bbb973afa9719a0706be2c9b25511df58f0c')
-sha1sums_aarch64=('fea14553bf58f0b34b9ab64f0e8fb06808e5e809')
-sha256sums_armv7h=('49859e49b52b9bbc9d0951ecc759a46ea22f19f25e1f255f71f2dfcd6ca51d7d')
-sha256sums_aarch64=('665b3e94ec271084b371cfd60443ec6ae4392b4814e3c4307cf172b0d2c8e9a6')
-sha512sums_armv7h=('10ad236feb9150cc06f40730b541c5ad01cb1f49d3873886a5fe0c223216f3e2ac036d4429a16c8785b7a374967876bff52606011fee2ad20913f8e31e85d5d0')
-sha512sums_aarch64=('2dac806888e273ec769b1613522d20aa36e1efb71143c908da06aa7c9ecc4e0b231e6acadbc449be490bbf9464856955a08fdf90121eb8ef19c78b77f80c9adb')
+md5sums_armv7h=('d8adeeb610a041426d4b6f12d97c82f1')
+md5sums_aarch64=('0f8c76de4593fad96c28a58d47126020')
+sha1sums_armv7h=('7f2d66d8f87cb4229cf23a93687b887207c4e6f6')
+sha1sums_aarch64=('40e450214b957563b52eeba87c3f4b35c55fe292')
+sha256sums_armv7h=('5ee3d3eeb05f9a563810cbf7eb2b551dcddea1c1003a5bff01966c419c0571b2')
+sha256sums_aarch64=('24d7b98c9e99160def1185b0659af4b6f3e36e52ee4dc6b76445e2e344ce60a8')
+sha512sums_armv7h=('16fd9864847974000145f57a1e750744f77c44515cf23ce481d995d66bbe9f15e37c4564b9c91d50deebb003eebc4e5c1f2ebe320078be9d5790d4ff65cacd75')
+sha512sums_aarch64=('2d00ef230181cf02340465dddfaa04bc080dd083025691ecffb13bf51f79049e783e422c5fa279d2234a67654230b7560f9ddfb194c0b07fd7e475b94e317788')
 
 prepare() {
     tar -xf data.tar.xz
 }
 
 package() {
+	install -Dm 644 "${srcdir}/usr/lib/sysusers.d/duetcontrolserver.conf" "${pkgdir}/usr/lib/sysusers.d/duetcontrolserver.conf"
+	install -Dm 644 "${srcdir}/usr/lib/tmpfiles.d/duetcontrolserver.conf" "${pkgdir}/usr/lib/tmpfiles.d/duetcontrolserver.conf"
+	install -Dm 644 "${srcdir}/etc/udev/rules.d/99-dsf-gpio.rules" "${pkgdir}/etc/udev/rules.d/99-dsf-gpio.rules"
 
 	# DuetControlServer
-	install -dm 755 "${pkgdir}"/{opt/dsf/bin,opt/dsf/conf,usr/bin,usr/lib/systemd/system}
+	install -dm 755 "${pkgdir}"/{opt/dsf/bin,usr/bin,usr/lib/systemd/system}
+	install -dm 755 -o dsf -g dsf "${pkgdir}/opt/dsf/conf"
+	install -dm 755 -o dsf -g dsf "${pkgdir}/opt/dsf/plugins"
 	install "${srcdir}/opt/dsf/bin/"* "${pkgdir}/opt/dsf/bin"
+	install -m 644 -o dsf -g dsf "${srcdir}/opt/dsf/conf/"* "${pkgdir}/opt/dsf/conf"
+
+	# systemd unit file
 	install "${srcdir}/usr/lib/systemd/system/"* "${pkgdir}/usr/lib/systemd/system"
-	install "${srcdir}/opt/dsf/conf/"* "${pkgdir}/opt/dsf/conf"
 
+	# Link to /usr/bin
 	ln -s "/opt/dsf/bin/DuetControlServer" "${pkgdir}/usr/bin/"
 }
diff --git a/duetcontrolserver-bin.install b/duetcontrolserver-bin.install
new file mode 100644
index 000000000000..bcf73e5a320a
--- /dev/null
+++ b/duetcontrolserver-bin.install
@@ -0,0 +1,18 @@
+post_install() {
+	# Create gpio group and add dsf to it
+	systemd-sysusers duetcontrolserver.conf
+
+	# Create /var/run/dsf now
+	systemd-tmpfiles --create duetcontrolserver.conf
+
+	# Trigger assignment of gpio group to the existing devices
+	udevadm trigger
+}
+
+pre_remove() {
+	systemctl disable --now duetcontrolserver.service
+}
+
+post_remove() {
+	echo "==> to delete \"gpio\" group run as root: groupdel gpio"
+}