From 3b41ad6d8a6922d929c770b536eabe2d70fe443f Mon Sep 17 00:00:00 2001 From: Alexis Polti Date: Fri, 3 Jul 2020 17:42:02 +0200 Subject: [PATCH] Cleanup wrong location of ETC/J* --- .SRCINFO | 2 +- PKGBUILD | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c8541e8cc11d..c2b41527cf99 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = jlink-software-and-documentation pkgdesc = Segger JLink software & documentation pack for Linux pkgver = 6.80d - pkgrel = 0 + pkgrel = 2 epoch = 28 url = https://www.segger.com/jlink-software.html install = jlink-software-and-documentation.install diff --git a/PKGBUILD b/PKGBUILD index 5b825193ee62..b9b35f4160ce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=jlink-software-and-documentation pkgver=6.80d -pkgrel=1 +pkgrel=2 epoch=28 pkgdesc="Segger JLink software & documentation pack for Linux" arch=('i686' 'x86_64') @@ -38,6 +38,7 @@ package(){ "${pkgdir}/usr/share/licenses/${pkgname}" \ "${pkgdir}/usr/lib/" \ "${pkgdir}/usr/bin/" \ + "${pkgdir}/etc/" \ "${pkgdir}/usr/lib/udev/rules.d/" \ "${pkgdir}/usr/share/doc/${pkgname}/" @@ -49,6 +50,9 @@ package(){ cp --preserve=mode -r x86 "${pkgdir}/opt/SEGGER/JLink" fi + # Cleanup old copy of /etc/ + rm -f ${pkgdir}/etc/JFlash + # Create links where needed ln -s /opt/SEGGER/JLink/Doc/LicenseIncGUI.txt "${pkgdir}/usr/share/licenses/${pkgname}/" sed -i 's/0x//g' 99-jlink.rules