diff options
author | loredan13 | 2020-01-07 22:24:10 +0300 |
---|---|---|
committer | loredan13 | 2020-01-07 22:24:10 +0300 |
commit | cf7284e57805e7936ba27df888d958fc92a8a19c (patch) | |
tree | e1dca43f1a4bbc4476172ee5d7f55b817d18e5c7 | |
parent | ef8f4d80fe5dd196fee3ed45a8e07e1be152d6a8 (diff) | |
download | aur-cf7284e57805e7936ba27df888d958fc92a8a19c.tar.gz |
Fixed dependencies, changed service similar to example, moved socket to default /tmp/printer
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 38 | ||||
-rw-r--r-- | klipper.service | 11 | ||||
-rw-r--r-- | tmpfiles.conf | 2 |
4 files changed, 27 insertions, 34 deletions
@@ -1,6 +1,6 @@ pkgbase = klipper-git pkgdesc = 3D printer firmware with motion planning on the host - pkgver = r1517.4f89251f + pkgver = r2730.ac863a95 pkgrel = 1 url = https://github.com/KevinOConnor/klipper arch = x86_64 @@ -11,6 +11,7 @@ pkgbase = klipper-git depends = python2-cffi depends = python2-pyserial depends = python2-greenlet + depends = python2-jinja depends = ncurses depends = libusb depends = avrdude @@ -24,9 +25,12 @@ pkgbase = klipper-git source = sysusers.conf source = tmpfiles.conf md5sums = SKIP - md5sums = a8e8aee6f576ebd9e335c20e225c99e5 + md5sums = 4b915228f21e65dbe143ad93074d91e9 md5sums = 61912d101dc7c68c7314882b80621454 - md5sums = ac76dba668e371a0686973e5069bc95e + md5sums = 218dfe92aa1a1c2654be11cca99e6cd3 + depends_x86_64 = arm-none-eabi-gcc + depends_x86_64 = arm-none-eabi-newlib + depends_x86_64 = stm32flash pkgname = klipper-git @@ -1,9 +1,10 @@ -# Maintainer: lf <packages at lfcode dot ca> +# Maintainer: loredan13 +# Contributor: lf <packages at lfcode dot ca> pkgname=klipper-git -pkgver=r1517.4f89251f +pkgver=r2730.ac863a95 pkgrel=1 pkgdesc="3D printer firmware with motion planning on the host" -arch=('x86_64' 'i686' 'armv7h') +arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/KevinOConnor/klipper" license=('GPLv3') groups=() @@ -11,6 +12,7 @@ depends=( python2-cffi python2-pyserial python2-greenlet + python2-jinja ncurses libusb avrdude @@ -18,6 +20,11 @@ depends=( avr-binutils avr-libc ) +depends_x86_64=( + arm-none-eabi-gcc + arm-none-eabi-newlib + stm32flash +) makedepends=('git') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") @@ -28,40 +35,21 @@ install= source=('git+https://github.com/KevinOConnor/klipper#branch=master' 'klipper.service' 'sysusers.conf' 'tmpfiles.conf') noextract=() md5sums=('SKIP' - 'a8e8aee6f576ebd9e335c20e225c99e5' + '4b915228f21e65dbe143ad93074d91e9' '61912d101dc7c68c7314882b80621454' - 'ac76dba668e371a0686973e5069bc95e') + '218dfe92aa1a1c2654be11cca99e6cd3') pkgver() { cd "$srcdir/${pkgname%-git}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare() { - cd "$srcdir/${pkgname%-git}" - make clean - git clean -fx -} - -build() { - cd "$srcdir/${pkgname%-git}" - echo 'Building C module...' - python2 klippy/chelper/__init__.py - echo 'Done' - python2 -m compileall klippy -} - -check() { - cd "$srcdir/${pkgname%-git}" -} - package() { cd "$srcdir/${pkgname%-git}" install -Dm644 "$srcdir/klipper.service" "$pkgdir/usr/lib/systemd/system/klipper.service" install -Dm644 "$srcdir/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/klipper.conf" install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/klipper.conf" - install -dm755 "$pkgdir/opt/klipper/klippy" + install -dm777 "$pkgdir/opt/klipper" install -dm775 "$pkgdir/etc/klipper" - python2 "$srcdir/${pkgname%-git}/scripts/make_version.py" archlinux > "$pkgdir/opt/klipper/klippy/.version" GLOBIGNORE=.git cp -r * "$pkgdir/opt/klipper" } diff --git a/klipper.service b/klipper.service index fd960d5664fb..99b4a0a98408 100644 --- a/klipper.service +++ b/klipper.service @@ -1,10 +1,13 @@ [Unit] Description=3D printer firmware with motion planning on the host +[Install] +WantedBy=multi-user.target + [Service] -ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/klipper/klipper.cfg -l /var/log/klipper/klippy.log -I /run/klipper/sock Type=simple User=klipper - -[Install] -WantedBy=multi-user.target +RemainAfterExit=yes +ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/klipper/klipper.cfg +Restart=always +RestartSec=10 diff --git a/tmpfiles.conf b/tmpfiles.conf index dab6d887b18e..b0f35dd9633e 100644 --- a/tmpfiles.conf +++ b/tmpfiles.conf @@ -1,3 +1 @@ -d /var/log/klipper 0775 klipper klipper - - -d /run/klipper 0755 klipper tty - - d /etc/klipper 0775 klipper klipper - - |