update 1.0.30

2 files changed, 15 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47c41800a6f2..338b9195864a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = mounriver-studio-toolchain-bin
-	pkgver = 1.20
+	pkgver = 1.30
 	pkgrel = 1
 	url = http://www.mounriver.com/
 	arch = x86_64
@@ -14,9 +14,10 @@ pkgbase = mounriver-studio-toolchain-bin
 	optdepends = ch341prog-git: A simple command line tool (programmer) interfacing with ch341a
 	optdepends = ch341eeprom-git: A libusb based programming tool for 24xx I²C EEPROMs using the WCH CH341A
 	provides = MRS-Toolchain
+	noextract = mounriver-studio-toolchain-bin-1.30.tar.xz
 	options = !strip
-	source = mounriver-studio-toolchain-bin-1.20.tar.xz::http://file.mounriver.com/tools/MRS_Toolchain_Linux_x64_V1.20.tar.xz
-	sha256sums = f70344379c586d93c5405ed7c75a2b71ef952c5747ad587cab5fc641b65276eb
+	source = mounriver-studio-toolchain-bin-1.30.tar.xz::http://file.mounriver.com/tools/MRS_Toolchain_Linux_x64_V1.30.tar.xz
+	sha256sums = 8b03bab58ab6754a26736004d9a2a66f5753f55f70f488c7f59fd703ec674753
 
 pkgname = mounriver-studio-toolchain-bin
 	pkgdesc = This MRS Toolchain includes the tool chain for RISC-V kernel chip under Linux x64 and the debug download tool OpenOCD.
diff --git a/PKGBUILD b/PKGBUILD
index 9d3c9594366b..8d1443740c76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=mounriver-studio-toolchain-bin
 pkgname=($pkgbase mounriver-studio-toolchain-openocd-bin mounriver-studio-toolchain-riscv-bin)
-pkgver=1.20
+pkgver=1.30
 pkgrel=1
 arch=('x86_64')
 url='http://www.mounriver.com/'
@@ -20,16 +20,20 @@ optdepends=('ch34x-dkms-git: CH341SER driver with fixed bug'
 source=("${pkgbase}-${pkgver}.tar.xz::http://file.mounriver.com/tools/MRS_Toolchain_Linux_x64_V${pkgver}.tar.xz"
         )
 
-sha256sums=('f70344379c586d93c5405ed7c75a2b71ef952c5747ad587cab5fc641b65276eb')
+sha256sums=('8b03bab58ab6754a26736004d9a2a66f5753f55f70f488c7f59fd703ec674753')
 
 options=('!strip')
 
-noextract=()
+noextract=(${pkgbase}-${pkgver}.tar.xz)
 
 _install(){
      find ${@: 2} -type f -exec install -Dm$1 {}  ${pkgdir}/opt/wch/${pkgname%-bin}/{} \;
 } 
 
+prepare() {
+    tar -xf "${srcdir}/${pkgbase}-${pkgver}.tar.xz" --strip-components=1 -C "${srcdir}/"
+}
+
 package_mounriver-studio-toolchain-bin() {
     pkgdesc="This MRS Toolchain includes the tool chain for RISC-V kernel chip under Linux x64 and the debug download tool OpenOCD."
     depends=(mounriver-studio-toolchain-openocd-bin mounriver-studio-toolchain-riscv-bin)
@@ -50,11 +54,15 @@ package_mounriver-studio-toolchain-openocd-bin() {
     _install 755 bin -name "openocd"
     _install 644 share
 
+    install -Dm0644 "${srcdir}/beforeinstall/50-wch.rules" "${pkgdir}/usr/lib/udev/rules.d/50-wch.rules"
+    install -Dm0644 "${srcdir}/beforeinstall/60-openocd.rules" "${pkgdir}/usr/lib/udev/rules.d/60-openocd-wch.rules"
+
     install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/openocd-wch-arm" << EOF
 #!/bin/env bash
 exec /opt/wch/${pkgname%-bin}/bin/openocd -f /opt/wch/${pkgname%-bin}/bin/wch-arm.cfg "\$@"
 
 EOF
+
     install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/openocd-wch-riscv" << EOF
 #!/bin/env bash
 exec /opt/wch/${pkgname%-bin}/bin/openocd -f /opt/wch/${pkgname%-bin}/bin/wch-riscv.cfg "\$@"