summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD25
3 files changed, 25 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 83462422b803..cd8093c29be1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = python-usbtmc
pkgdesc = A Python USBTMC driver for controlling instruments over USB.
pkgver = 0.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/python-ivi/python-usbtmc
install = python-usbtmc.install
arch = x86_64
@@ -9,10 +9,11 @@ pkgbase = python-usbtmc
makedepends = python-build
makedepends = python-installer
makedepends = python-wheel
+ makedepends = git
depends = python-pyusb
- source = python-usbtmc-0.8.tar.gz::https://github.com/python-ivi/python-usbtmc/archive/v0.8.tar.gz
+ source = git+https://github.com/python-ivi/python-usbtmc#tag=v0.8
source = python-usbtmc.sysusers
- sha256sums = dc13aa4ae0c0e4545e2ef83ae181d08528de176ee1522e6d66856449cf91c491
+ sha256sums = SKIP
sha256sums = 3813bed7349a402231d291fe747cbe4b535081b8d39c33427701983a6bf08074
pkgname = python-usbtmc
diff --git a/.gitignore b/.gitignore
index 27fd112126d4..1c0170a3a248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
src/
pkg/
*.tar.gz
+python-usbtmc/
diff --git a/PKGBUILD b/PKGBUILD
index 2f6ab75f3abc..cd2b6cddf9af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=python-usbtmc
pkgver=0.8
-pkgrel=2
+pkgrel=3
pkgdesc="A Python USBTMC driver for controlling instruments over USB."
arch=('x86_64')
url="https://github.com/python-ivi/python-usbtmc"
@@ -12,24 +12,39 @@ makedepends=(
python-build
python-installer
python-wheel
+git
)
install=python-usbtmc.install
source=(
-"python-usbtmc-${pkgver}.tar.gz::https://github.com/python-ivi/python-usbtmc/archive/v${pkgver}.tar.gz"
+"git+https://github.com/python-ivi/python-usbtmc#tag=v${pkgver}"
python-usbtmc.sysusers
)
-sha256sums=('dc13aa4ae0c0e4545e2ef83ae181d08528de176ee1522e6d66856449cf91c491'
+sha256sums=('SKIP'
'3813bed7349a402231d291fe747cbe4b535081b8d39c33427701983a6bf08074')
+prepare(){
+ cd python-usbtmc
+
+ # RIGOL stuff is often f'd, see https://web.archive.org/web/20240122010650/https://www.teuniz.net/DSRemote/
+ # but the below are some attempts to make them work
+
+ # rigol scope init hack
+ curl https://patch-diff.githubusercontent.com/raw/python-ivi/python-usbtmc/pull/62.patch | patch -p1
+
+ # add RIGOL DS1104z to udev rules
+ echo '# rigol DS1104z' >> usbtmc.rules
+ echo 'SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="04ce", GROUP="usbtmc", MODE="0660"' >> usbtmc.rules
+}
+
build(){
- cd python-usbtmc-${pkgver}
+ cd python-usbtmc
python -m build --wheel --no-isolation
}
package(){
- cd python-usbtmc-${pkgver}
+ cd python-usbtmc
python -m installer --destdir="${pkgdir}" dist/*.whl