diff options
author | Darrell Enns | 2023-03-21 00:02:18 -0700 |
---|---|---|
committer | Darrell Enns | 2023-03-21 00:03:17 -0700 |
commit | bd9f36fbde86c17eac76850810cd0007b03b46eb (patch) | |
tree | f1da1d094dc6eabfa2d96006f7437c7982bf3ac9 | |
parent | 6e2c7bdaafb18349035d7f8dcb69cc2df7e8db3a (diff) | |
download | aur-bd9f36fbde86c17eac76850810cd0007b03b46eb.tar.gz |
update to match klipper-py3-git
-rw-r--r-- | .SRCINFO | 35 | ||||
-rw-r--r-- | PKGBUILD | 98 | ||||
-rw-r--r-- | klipper.install | 13 | ||||
-rw-r--r-- | klipper.service | 5 | ||||
-rw-r--r-- | sysusers.conf | 2 | ||||
-rw-r--r-- | tmpfiles.conf | 9 |
6 files changed, 106 insertions, 56 deletions
@@ -1,8 +1,9 @@ pkgbase = klipper-git pkgdesc = 3D printer firmware with motion planning on the host - pkgver = r3853.338bc82d0 + pkgver = r4940.e2d7c5981 pkgrel = 1 - url = https://github.com/KevinOConnor/klipper + url = https://www.klipper3d.org/ + install = klipper.install arch = x86_64 arch = i686 arch = arm @@ -11,11 +12,11 @@ pkgbase = klipper-git arch = aarch64 license = GPL3 makedepends = git - depends = python2-cffi - depends = python2-pyserial - depends = python2-greenlet - depends = python2-jinja - depends = python2-can + depends = python-cffi + depends = python-pyserial + depends = python-greenlet + depends = python-jinja + depends = python-can depends = libusb optdepends = ncurses: for choosing compilation config optdepends = avrdude: for flashing firmware on AVR MCU @@ -23,21 +24,23 @@ pkgbase = klipper-git optdepends = avr-gcc: for AVR MCU firmware compilation optdepends = avr-binutils: for AVR MCU firmware compilation optdepends = avr-libc: for AVR MCU firmware compilation - optdepends = python2-numpy: for resonance measurement - optdepends = python2-matplotlib: for resonance measurement + optdepends = python-numpy: for resonance measurement + optdepends = python-matplotlib: for resonance measurement + optdepends = dfu-util: for flashing firmware on STM32 MCUs provides = klipper conflicts = klipper - source = git+https://github.com/KevinOConnor/klipper#branch=master + backup = etc/klipper/klipper.cfg + backup = usr/lib/klipper/.config + source = klipper::git+https://github.com/Klipper3d/klipper source = klipper.service source = sysusers.conf source = tmpfiles.conf md5sums = SKIP - md5sums = ab5efd8e525d971b482a0fee94a7e7ff - md5sums = 61912d101dc7c68c7314882b80621454 - md5sums = dd799b9d55045d950d407740d4a9a5c5 - optdepends_x86_64 = arm-none-eabi-gcc: for ARM MCU firmware compilation - optdepends_x86_64 = arm-none-eabi-binutils + md5sums = 4ccfb9669d304b99146b92a4912ae1fd + md5sums = cf3715af9f53cc1660e412abe3697342 + md5sums = d707e8986ed6cf189461f03bdaf365aa optdepends_x86_64 = arm-none-eabi-newlib: for ARM MCU firmware compilation + optdepends_x86_64 = arm-none-eabi-gcc: for ARM MCU firmware compilation + optdepends_x86_64 = arm-none-eabi-binutils: for ARM MCU firmware compilation pkgname = klipper-git - @@ -1,19 +1,22 @@ -# Maintainer: loredan13 +# Maintainer: Darrell Enns <darrell at darrellenns dot com> +# Contributor: qubidt <qubidt at gmail dot com> +# Contributor: loredan13 # Contributor: lf <packages at lfcode dot ca> pkgname=klipper-git -pkgver=r3853.338bc82d0 +_pkgname=klipper +pkgver=r4940.e2d7c5981 pkgrel=1 pkgdesc="3D printer firmware with motion planning on the host" arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') -url="https://github.com/KevinOConnor/klipper" +url="https://www.klipper3d.org/" license=('GPL3') groups=() depends=( - python2-cffi - python2-pyserial - python2-greenlet - python2-jinja - python2-can + python-cffi + python-pyserial + python-greenlet + python-jinja + python-can libusb ) optdepends=( @@ -23,45 +26,74 @@ optdepends=( 'avr-gcc: for AVR MCU firmware compilation' 'avr-binutils: for AVR MCU firmware compilation' 'avr-libc: for AVR MCU firmware compilation' - 'python2-numpy: for resonance measurement' - 'python2-matplotlib: for resonance measurement' + 'python-numpy: for resonance measurement' + 'python-matplotlib: for resonance measurement' + 'dfu-util: for flashing firmware on STM32 MCUs' ) optdepends_x86_64=( - 'arm-none-eabi-gcc: for ARM MCU firmware compilation' - 'arm-none-eabi-binutils' 'arm-none-eabi-newlib: for ARM MCU firmware compilation' + 'arm-none-eabi-gcc: for ARM MCU firmware compilation' + 'arm-none-eabi-binutils: for ARM MCU firmware compilation' ) makedepends=('git') -provides=("${pkgname%-git}") -conflicts=("${pkgname%-git}") +provides=("$_pkgname") +conflicts=("$_pkgname") replaces=() -backup=() +backup=("etc/${_pkgname}/klipper.cfg" + "usr/lib/klipper/.config") options=() -install= -source=('git+https://github.com/KevinOConnor/klipper#branch=master' 'klipper.service' 'sysusers.conf' 'tmpfiles.conf') +install='klipper.install' +source=("${_pkgname}::git+https://github.com/Klipper3d/klipper" + 'klipper.service' + 'sysusers.conf' + 'tmpfiles.conf') noextract=() md5sums=('SKIP' - 'ab5efd8e525d971b482a0fee94a7e7ff' - '61912d101dc7c68c7314882b80621454' - 'dd799b9d55045d950d407740d4a9a5c5') + '4ccfb9669d304b99146b92a4912ae1fd' + 'cf3715af9f53cc1660e412abe3697342' + 'd707e8986ed6cf189461f03bdaf365aa') pkgver() { - cd "$srcdir/${pkgname%-git}" + cd "$srcdir/$_pkgname" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +build() { + cd "$srcdir/$_pkgname" + python -m compileall klippy + python klippy/chelper/__init__.py +} + 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" - 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" + cd "$srcdir/$_pkgname" + install -Dm644 "$srcdir/klipper.service" "$pkgdir/usr/lib/systemd/system/${_pkgname}.service" + install -Dm644 "$srcdir/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/${_pkgname}.conf" + install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/${_pkgname}.conf" + + install -m775 -d "$pkgdir/usr/lib/${_pkgname}" + install -m755 -d "$pkgdir/usr/lib/${_pkgname}/docs" + install -m755 -d "$pkgdir/usr/lib/${_pkgname}/config" + install -m775 -d "$pkgdir/usr/lib/${_pkgname}/klippy" + install -m755 -d "$pkgdir/usr/lib/${_pkgname}/lib" + install -m755 -d "$pkgdir/usr/lib/${_pkgname}/src" + install -m755 -d "$pkgdir/usr/lib/${_pkgname}/scripts" + install -m2775 -d "$pkgdir/etc/${_pkgname}" + install -m2775 -d "$pkgdir/usr/lib/${_pkgname}/out" + install -m2775 -d "$pkgdir/var/lib/${_pkgname}" + + cp -ra "$srcdir/${_pkgname}/docs"/* "$pkgdir/usr/lib/${_pkgname}/docs"/ + cp -ra "$srcdir/${_pkgname}/config/"* "$pkgdir/usr/lib/${_pkgname}/config"/ + cp -ra "$srcdir/${_pkgname}/klippy/"* "$pkgdir/usr/lib/${_pkgname}/klippy"/ + cp -ra "$srcdir/${_pkgname}/scripts/"* "$pkgdir/usr/lib/${_pkgname}/scripts"/ + cp -ra "$srcdir/${_pkgname}/lib/"* "$pkgdir/usr/lib/${_pkgname}/lib"/ + cp -ra "$srcdir/${_pkgname}/Makefile" "$pkgdir/usr/lib/${_pkgname}"/ + cp -ra "$srcdir/${_pkgname}/src/"* "$pkgdir/usr/lib/${_pkgname}/src"/ + + mkdir -p "$pkgdir//usr/share/doc" + ln -s "/usr/lib/${_pkgname}/docs" "$pkgdir/usr/share/doc/${_pkgname}" + + touch "$srcdir/${_pkgname}/.config" + install -m664 "$srcdir/${_pkgname}/.config" "$pkgdir/usr/lib/${_pkgname}/.config" - echo - echo "Before launching, copy one of example configs in /opt/klipper/config/ to /etc/klipper/klipper.cfg and adjust it to suit your printer" + python scripts/make_version.py ARCHLINUX > "$pkgdir/usr/lib/${_pkgname}/klippy/.version" } diff --git a/klipper.install b/klipper.install new file mode 100644 index 000000000000..a912116ec24f --- /dev/null +++ b/klipper.install @@ -0,0 +1,13 @@ +post_install() { + echo "Before launching, copy one of example configs in /usr/lib/klipper/config/ to /etc/klipper/klipper.cfg and adjust it to suit your printer" +} + +post_upgrade() { + post_install +} + +post_remove() { + echo "Removing generated files" + [ -e /usr/local/bin/klipper_mcu ] && rm -v /usr/local/bin/klipper_mcu + [ -e /usr/lib/klipper/out ] && rm -rv /usr/lib/klipper/out +} diff --git a/klipper.service b/klipper.service index 4e9817af60e0..65b1351ac982 100644 --- a/klipper.service +++ b/klipper.service @@ -8,7 +8,8 @@ WantedBy=multi-user.target [Service] Type=simple User=klipper -RemainAfterExit=yes -ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/klipper/klipper.cfg -l /var/log/klipper/klippy.log -I /run/klipper/sock +RemainAfterExit=no +Environment=PYTHONUNBUFFERED=1 +ExecStart=/usr/bin/python /usr/lib/klipper/klippy/klippy.py /etc/klipper/klipper.cfg -I /run/klipper/sock -a /run/klipper/ud_sock Restart=always RestartSec=10 diff --git a/sysusers.conf b/sysusers.conf index d74f60125dfa..52d450c4d8c0 100644 --- a/sysusers.conf +++ b/sysusers.conf @@ -1,4 +1,4 @@ -u klipper - "Klipper 3D Print Server User" /opt/klipper +u klipper - "Klipper 3D Print Server User" /var/lib/klipper m klipper uucp m klipper network m klipper tty diff --git a/tmpfiles.conf b/tmpfiles.conf index a7113de9af35..d5a8724d574f 100644 --- a/tmpfiles.conf +++ b/tmpfiles.conf @@ -1,5 +1,6 @@ -d /var/log/klipper 0775 klipper klipper - - -d /etc/klipper 0755 klipper klipper - - -z /etc/klipper/klipper.cfg 0644 klipper klipper - - +d /var/log/klipper 2775 klipper klipper - - +d /etc/klipper 2775 klipper klipper - - +d /var/lib/klipper 2775 klipper klipper - - +z /etc/klipper/klipper.cfg 0664 klipper klipper - - d /run/klipper 0755 klipper tty - - -Z /opt/klipper - klipper klipper - -
\ No newline at end of file +Z /usr/lib/klipper - klipper klipper - - |