aboutsummaryrefslogtreecommitdiffstats
path: root/testing/openocd-riscv/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'testing/openocd-riscv/APKBUILD')
-rw-r--r--testing/openocd-riscv/APKBUILD49
1 files changed, 35 insertions, 14 deletions
diff --git a/testing/openocd-riscv/APKBUILD b/testing/openocd-riscv/APKBUILD
index 6e15be84ba9..e1149896bf5 100644
--- a/testing/openocd-riscv/APKBUILD
+++ b/testing/openocd-riscv/APKBUILD
@@ -1,19 +1,26 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=openocd-riscv
-pkgver=0_git20210914
-_commit=41ffb2dee645834c71b8ebda4cacf9187b3fe686
-pkgrel=3
+pkgver=0_git20230104
+_commit=43ea20dfbb6c815004a51106a3b2009d7f6c4940
+pkgrel=1
pkgdesc="Fork of OpenOCD with RISC-V support"
url="https://github.com/riscv/riscv-openocd"
arch="all"
license="GPL-2.0-only,GPL-2.0-or-later,GPL-3.0-only"
-depends="!openocd-git !openocd"
-makedepends="libftdi1-dev libusb-dev hidapi-dev libtool automake autoconf jimtcl-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+makedepends="
+ autoconf
+ automake
+ hidapi-dev
+ jimtcl-dev
+ libftdi1-dev
+ libjaylink-dev
+ libtool
+ libusb-dev
+ "
+subpackages="$pkgname-dev $pkgname-doc $pkgname-udev-rules:udev_rules"
source="$pkgname-$pkgver.tar.gz::https://github.com/riscv/riscv-openocd/archive/$_commit.tar.gz
- fix-jimtcl-link.patch
- fix-dynamic-linking.patch"
+ fix-jimtcl-link.patch"
builddir="$srcdir/riscv-openocd-$_commit"
##
@@ -26,18 +33,19 @@ prepare() {
}
build() {
- # XXX: This fork uses a modified version of libjaylink which is
- # not fully compatible with our packaged version of libjaylink.
- # As such, we can't pass --disable-internal-libjaylink here.
+ # --datadir:
+ # avoid conflicts with upstream openocd to allow parallel installations
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
+ --datadir=/usr/share/$pkgname \
--localstatedir=/var \
--disable-werror \
- --disable-internal-jimtcl
+ --disable-internal-jimtcl \
+ --disable-internal-libjaylink
make
}
@@ -47,10 +55,23 @@ check() {
package() {
make DESTDIR="$pkgdir" install
+ install -Dm644 contrib/60-openocd.rules \
+ "$pkgdir"/lib/udev/rules.d/60-$pkgname.rules
+ # allow parallel install with upstream openocd
+ mv "$pkgdir"/usr/bin/openocd "$pkgdir"/usr/bin/$pkgname
+ mv "$pkgdir"/usr/share/man/man1/openocd.1 \
+ "$pkgdir"/usr/share/man/man1/openocd-riscv.1
+ sed -e 's/openocd/openocd-riscv/g' -i \
+ "$pkgdir"/usr/share/man/man1/openocd-riscv.1
+}
+
+udev_rules() {
+ pkgdesc="udev rules for $pkgname"
+ depends="!openocd-udev-rules"
+ amove lib/udev/rules.d/60-$pkgname.rules
}
sha512sums="
-272f2c141d04c44e23ff743160148e7a08fcc74647fde63c719c003836b8ea65f4455fb7b5c35b48068b1e44670aab748f7ad1e7bc082f242e12566521e8e02b openocd-riscv-0_git20210914.tar.gz
+2ffe4047d4c3afa8dd7be581362f36b88d250a46c4ed3f9b396a15163bd6d131984a9b0d27c47bfbda9f195443010ddfb267e7401b6b334a466a1dcad4ebc9b8 openocd-riscv-0_git20230104.tar.gz
6fd2fbe11917bb7f181ba67812f63e75d51bcd19e4df6a7e22e1abb8f36a4f4bdc9202e815f560476ec184d54d84df8ae4dceb17f2429b9dc1d9503804dacb03 fix-jimtcl-link.patch
-a0980806af54bafd759c2e329cd11eabf0eb352f7f823966ab0f4a60508559fb7abd41072c0a882da0906ddf086ee139115deca04bb1a70ab915b50a1d3fc2e7 fix-dynamic-linking.patch
"