summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlf-2018-10-21 23:09:58 -0600
committerlf-2018-10-21 23:09:58 -0600
commitb2c194e97c8af3d912248ca114a03de2b4b48735 (patch)
tree2bd53b7420bba5e160500f16280d1f19e9324b16
parent659af5cb1f36247c9121df00c32133db3c66748e (diff)
downloadaur-b2c194e97c8af3d912248ca114a03de2b4b48735.tar.gz
Fix socket, fix groups, fix version
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--klipper.service2
-rw-r--r--sysusers.conf6
-rw-r--r--tmpfiles.conf3
5 files changed, 15 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d5d7d6472d4..1750d9f2507 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = klipper-git
pkgdesc = 3D printer firmware with motion planning on the host
- pkgver = r1489.29e0996
+ pkgver = r1495.83d83ce
pkgrel = 1
url = https://github.com/KevinOConnor/klipper
arch = x86_64
@@ -24,9 +24,9 @@ pkgbase = klipper-git
source = sysusers.conf
source = tmpfiles.conf
md5sums = SKIP
- md5sums = b5dad61c9872b9682867b6b3e3a67da8
- md5sums = 80229d1797c904ef046acfcc3b26e593
- md5sums = 18f0e2664394a5042ff21737e1796db7
+ md5sums = e39ca376373d4e23799806b916d39f14
+ md5sums = 61912d101dc7c68c7314882b80621454
+ md5sums = 2b79f4e00b2a74cef083fba81c89a13d
pkgname = klipper-git
diff --git a/PKGBUILD b/PKGBUILD
index 5e49ac2161f..bbe8c4afd9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: lf <packages at lfcode dot ca>
pkgname=klipper-git
-pkgver=r1489.29e0996
+pkgver=r1495.83d83ce
pkgrel=1
pkgdesc="3D printer firmware with motion planning on the host"
arch=('x86_64' 'i686' 'armv7h')
@@ -28,9 +28,9 @@ install=
source=('git+https://github.com/KevinOConnor/klipper#branch=master' 'klipper.service' 'sysusers.conf' 'tmpfiles.conf')
noextract=()
md5sums=('SKIP'
- 'b5dad61c9872b9682867b6b3e3a67da8'
- '80229d1797c904ef046acfcc3b26e593'
- '18f0e2664394a5042ff21737e1796db7')
+ 'e39ca376373d4e23799806b916d39f14'
+ '61912d101dc7c68c7314882b80621454'
+ '2b79f4e00b2a74cef083fba81c89a13d')
pkgver() {
cd "$srcdir/${pkgname%-git}"
@@ -62,4 +62,5 @@ package() {
install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/klipper.conf"
install -dm755 "$pkgdir/opt/klipper"
GLOBIGNORE=.git cp -r * "$pkgdir/opt/klipper"
+ git describe --always --tags --long --dirty > "$pkgdir/opt/klipper/klippy/version"
}
diff --git a/klipper.service b/klipper.service
index 4ac0188324f..d7b467d72c5 100644
--- a/klipper.service
+++ b/klipper.service
@@ -2,7 +2,7 @@
Description=3D printer firmware with motion planning on the host
[Service]
-ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/klipper.cfg -l /var/log/klipper/klippy.log
+ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/klipper.cfg -l /var/log/klipper/klippy.log -I /run/klipper/sock
Type=simple
User=klipper
diff --git a/sysusers.conf b/sysusers.conf
index 64079c4b1e8..d74f60125df 100644
--- a/sysusers.conf
+++ b/sysusers.conf
@@ -1,4 +1,4 @@
u klipper - "Klipper 3D Print Server User" /opt/klipper
-m octoprint uucp
-m octoprint network
-m octoprint tty
+m klipper uucp
+m klipper network
+m klipper tty
diff --git a/tmpfiles.conf b/tmpfiles.conf
index 1a2377f6240..7d4bf726073 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -1,2 +1,3 @@
-d /var/log/klipper 0755 klipper klipper - -
+d /var/log/klipper 0775 klipper klipper - -
+d /run/klipper 0755 klipper tty - -
f /etc/klipper.cfg 0644 klipper klipper - -