summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpzl2016-01-22 09:11:05 -0500
committerpzl2016-01-22 09:11:05 -0500
commit4fb1ffa1dff1115329c2492d352a4de9d6d5e9ba (patch)
treed166c3e9eacc015e14fe98812db4a900bd73884c
parent1331d0360754ba2898d2cbd175c9780e385216ce (diff)
downloadaur-4fb1ffa1dff1115329c2492d352a4de9d6d5e9ba.tar.gz
switch to meta package
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD70
-rw-r--r--udev_fix.patch11
3 files changed, 11 insertions, 84 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e886122b5c..2e1388c8718 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
# Generated by mksrcinfo v8
-# Thu Jan 14 19:54:03 UTC 2016
+# Fri Jan 22 14:08:56 UTC 2016
pkgbase = jlink
- pkgdesc = ARM Embedded debugger and flashing software from Segger
- pkgver = 5.10g
- pkgrel = 2
+ pkgdesc = meta package for JLink ARM embedded tools from Segger
+ pkgver = 20160122
+ pkgrel = 1
url = https://www.segger.com/jlink-software.html
arch = i686
arch = x86_64
license = custom
- depends = glibc
- source = udev_fix.patch
- md5sums = 8134047402c9ac6dc7c3bc24dfcf51b5
+ depends = jlink-software-and-documentation
+ depends = jlink-debugger
+ depends = jlink-systemview
pkgname = jlink
diff --git a/PKGBUILD b/PKGBUILD
index e0eef558c02..0fb7194181a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,10 @@
# Maintainer: pzl <alsoelp@gmail.com>
pkgname=jlink
-_pkgver="510g"
-pkgver="5.10g"
-pkgrel=2
-pkgdesc="ARM Embedded debugger and flashing software from Segger"
+pkgver=20160122
+pkgrel=1
+pkgdesc="meta package for JLink ARM embedded tools from Segger"
arch=('i686' 'x86_64')
url="https://www.segger.com/jlink-software.html"
license=('custom') #https://www.segger.com/cms/admin/uploads/userfiles/file/J-Link/license_agreement.txt
-depends=('glibc')
-source=('udev_fix.patch') #fetching the pkg source requires a POST request, so we must do this in prepare()
-md5sums=('8134047402c9ac6dc7c3bc24dfcf51b5')
-_md5sums_64=("387771245e86d8e5462c993c2065948e") #underscored because real md5sums must match source array length, ours is missing package URL
-_md5sums_32=("5969ff903263c2efbc43cae11a1bd8e7")
-
-
-prepare() {
- cd "$srcdir"
- if [ "$CARCH" = "x86_64" ]; then
- _ARCH="64"
- _MD5="${_md5sums_64}"
- else
- _ARCH="32"
- _MD5="${_md5sums_32}"
- fi
-
- #fetch source
- wget -O "${pkgname}.tgz" --post-data="agree=1&confirm=yes" "https://www.segger.com/jlink-software.html?step=1&file=JLinkLinuxTGZ${_ARCH}_${_pkgver}"
-
- #verify
- if [ "$(md5sum "${pkgname}.tgz" | cut -d' ' -f1)" != "${_MD5}" ]; then
- echo "md5 source verification failed" >&2
- exit 1
- fi
-
- #extract
- tar -xzvf "${pkgname}.tgz"
-}
-
-build() {
- #remove `BUS!="usb"` from udev rules. BUS isn't valid anymore
- cd "${srcdir}"/JLink_Linux_V*
- patch -uN 99-jlink.rules ../udev_fix.patch
-}
-
-package() {
- cd "${srcdir}"/JLink_Linux_V*
-
- # Match package placement from their .deb, in /opt
- install -dm755 "${pkgdir}/opt/SEGGER/JLink" \
- "${pkgdir}/usr/share/licenses/${pkgname}" \
- "${pkgdir}/usr/share/doc/${pkgname}" \
- "${pkgdir}/usr/bin" \
- "${pkgdir}/etc/udev/rules.d" \
- "${pkgdir}/usr/lib"
- cp --preserve=mode -r "." "${pkgdir}/opt/SEGGER/JLink"
-
-
-
- ln -s /opt/SEGGER/JLink/Doc/License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- ln -s /opt/SEGGER/JLink/Doc "${pkgdir}/usr/share/doc/${pkgname}"
- ln -s /opt/SEGGER/JLink/99-jlink.rules "${pkgdir}/etc/udev/rules.d/99-jlink.rules"
-
- for f in JLink*; do
- ln -s /opt/SEGGER/JLink/"$f" "${pkgdir}/usr/bin"
- done
-
- for f in libjlinkarm*; do
- ln -s /opt/SEGGER/JLink/"$f" "${pkgdir}/usr/lib"
- done
-}
+depends=('jlink-software-and-documentation' 'jlink-debugger' 'jlink-systemview')
diff --git a/udev_fix.patch b/udev_fix.patch
deleted file mode 100644
index 18180b2fb11..00000000000
--- a/udev_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 99-jlink.rules 2015-10-26 14:00:18.000000000 -0400
-+++ 99-jlink.rules 2015-10-27 12:30:01.558625648 -0400
-@@ -6,7 +6,7 @@
- # Matches are AND combined, meaning: a==b,c==d,do stuff
- # results in: if (a == b) && (c == d) -> do stuff
- #
--BUS!="usb", ACTION!="add", SUBSYSTEM!=="usb_device", GOTO="jlink_rules_end"
-+ACTION!="add", SUBSYSTEM!=="usb_device", GOTO="jlink_rules_end"
- #
- # Give all users read and write access.
- # Note: NOT all combinations are supported by J-Link right now. Some are reserved for future use, but already added here