summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorloredan132020-01-21 22:34:09 +0300
committerloredan132020-01-21 22:34:09 +0300
commit7d6fb6e5a0290f74ac708f1c90c6d30a77e42327 (patch)
treec97b845ef8e7683876b68feae27b5f21c80abb96
parent93900ea8dceeb8ee216eb4d8f62098a80b9dc76c (diff)
downloadaur-7d6fb6e5a0290f74ac708f1c90c6d30a77e42327.tar.gz
Log file added back, various changes to package script
-rw-r--r--PKGBUILD10
-rw-r--r--klipper.service2
-rw-r--r--tmpfiles.conf4
3 files changed, 10 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 637424f0fdd8..4275cc3e486d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: loredan13
# Contributor: lf <packages at lfcode dot ca>
pkgname=klipper-git
-pkgver=r2730.ac863a95
+pkgver=r2761.b3c3b613
pkgrel=1
pkgdesc="3D printer firmware with motion planning on the host"
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -35,9 +35,9 @@ install=
source=('git+https://github.com/KevinOConnor/klipper#branch=master' 'klipper.service' 'sysusers.conf' 'tmpfiles.conf')
noextract=()
md5sums=('SKIP'
- '4bb29bd138c4b01e15a09d2c1a0d0f66'
+ 'f2f72237af98e80fe8fdb6332f089261'
'61912d101dc7c68c7314882b80621454'
- '1a71747e1579e5d5503b95c3a6aa681f')
+ '28328bfd930a928c0fb8602d0e02a704')
pkgver() {
cd "$srcdir/${pkgname%-git}"
@@ -51,6 +51,8 @@ package() {
install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/klipper.conf"
install -dm755 "$pkgdir/opt/klipper"
install -dm775 "$pkgdir/etc/klipper"
+ python2 scripts/make_version.py ARCHLINUX > klippy/.version
+ python2 -m compileall klippy
+ python2 klippy/chelper/__init__.py
GLOBIGNORE=.git cp -r * "$pkgdir/opt/klipper"
- chown -R klipper:klipper "$pkgdir/opt/klipper"
}
diff --git a/klipper.service b/klipper.service
index 8c6ffe871751..e5bb52d916da 100644
--- a/klipper.service
+++ b/klipper.service
@@ -8,6 +8,6 @@ WantedBy=multi-user.target
Type=simple
User=klipper
RemainAfterExit=yes
-ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/klipper/klipper.cfg -I /run/klipper/sock
+ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/klipper/klipper.cfg -l /var/log/klipper/klippy.log -I /run/klipper/sock
Restart=always
RestartSec=10
diff --git a/tmpfiles.conf b/tmpfiles.conf
index 162b2dd76b1a..f58ed8db6a93 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -1,2 +1,4 @@
-d /etc/klipper 0775 klipper klipper - -
+d /etc/klipper 0755 klipper klipper - -
+z /etc/klipper/klipper.cfg 0644 klipper klipper - -
d /run/klipper 0755 klipper tty - -
+Z /opt/klipper - klipper klipper - - \ No newline at end of file