Update to 2.4.2. Use debian source package. Add aarch64 support.

2 files changed, 18 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 582ef41a7b28..dbc2906214d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = brickd
 	pkgdesc = a brick daemon for tinkerforge brick(let)s
-	pkgver = 2.4.1
+	pkgver = 2.4.2
 	pkgrel = 2
 	url = http://www.tinkerforge.com/
 	install = brickd.install
+	arch = aarch64
 	arch = armv6h
 	arch = armv7h
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	depends = libusb
-	source = https://github.com/Tinkerforge/brickd/archive/v2.4.1.zip
-	source = https://github.com/Tinkerforge/daemonlib/archive/brickd-2.4.1.zip
+	source = https://download.tinkerforge.com/apt/debian/pool/main/t/tinkerforge-brickd/tinkerforge-brickd_2.4.2.tar.xz
 	source = brickd.install
-	sha256sums = d1d843023edf4de6e1018a5fd7196fd121776d9b07091fe66ca3b87b5bc67bbe
-	sha256sums = d90854f30d1a9a4792bfa6ee17c0450090ce2fe9d9c7cfe293e7f952e9ded04b
+	sha256sums = 3eb52eb3cde51a6130b42d5872b412c1f76af5b9a7ed97955f7255f9160a72a6
 	sha256sums = c70f47a66e5c538e255bfd93111fe1a4ea15894db9c377ed133f8a0351403589
 
 pkgname = brickd
diff --git a/PKGBUILD b/PKGBUILD
index c8a7688b495e..97f1bb571f8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,33 +3,30 @@
 # Contributor: Laurent Hofer <laurenth at laurenth dot net>
 
 pkgname=brickd
-pkgver=2.4.1
+pkgver=2.4.2
 _pkgver=${pkgver}
 pkgrel=2
 pkgdesc="a brick daemon for tinkerforge brick(let)s"
 url="http://www.tinkerforge.com/"
 license=("GPL2")
-arch=('armv6h' 'armv7h' 'i686' 'x86_64')
+arch=('aarch64' 'armv6h' 'armv7h' 'i686' 'x86_64')
 depends=('libusb')
-source=(https://github.com/Tinkerforge/${pkgname}/archive/v${_pkgver}.zip https://github.com/Tinkerforge/daemonlib/archive/${pkgname}-${_pkgver}.zip brickd.install)
-sha256sums=('d1d843023edf4de6e1018a5fd7196fd121776d9b07091fe66ca3b87b5bc67bbe'
-         'd90854f30d1a9a4792bfa6ee17c0450090ce2fe9d9c7cfe293e7f952e9ded04b'
-         'c70f47a66e5c538e255bfd93111fe1a4ea15894db9c377ed133f8a0351403589')
+source=(https://download.tinkerforge.com/apt/debian/pool/main/t/tinkerforge-${pkgname}/tinkerforge-${pkgname}_${_pkgver}.tar.xz brickd.install)
+sha256sums=('3eb52eb3cde51a6130b42d5872b412c1f76af5b9a7ed97955f7255f9160a72a6'
+            'c70f47a66e5c538e255bfd93111fe1a4ea15894db9c377ed133f8a0351403589')
 install='brickd.install'
 build() {
-  cd $srcdir
-  mv daemonlib-$pkgname-$_pkgver $pkgname-$_pkgver/src/daemonlib
-  cd $pkgname-$_pkgver/src/brickd
+  cd $srcdir/tinkerforge-$pkgname-$_pkgver/brickd
   make
 }
 
 package() {
-  install -Dm755 $srcdir/$pkgname-$_pkgver/src/brickd/brickd $pkgdir/usr/bin/brickd
-  install -Dm644 $srcdir/$pkgname-$_pkgver/src/build_data/linux/installer/etc/brickd-default.conf $pkgdir/etc/brickd.conf
-  install -Dm644 $srcdir/$pkgname-$_pkgver/src/build_data/linux/installer/etc/logrotate.d/brickd $pkgdir/etc/logrotate.d/brickd
-  install -Dm644 $srcdir/$pkgname-$_pkgver/src/build_data/linux/installer/lib/systemd/system/brickd-resume.service $pkgdir/usr/lib/systemd/system/brickd-resume.service
-  install -Dm644 $srcdir/$pkgname-$_pkgver/src/build_data/linux/installer/lib/systemd/system/brickd.service $pkgdir/usr/lib/systemd/system/brickd.service
-  install -Dm644 $srcdir/$pkgname-$_pkgver/src/build_data/linux/installer/usr/share/doc/brickd/copyright $pkgdir/usr/share/doc/brickd/copyright
-  install -Dm644 $srcdir/$pkgname-$_pkgver/src/build_data/linux/installer/usr/share/man/man5/brickd.conf.5 $pkgdir/usr/share/man/man5/brickd.conf.5
-  install -Dm644 $srcdir/$pkgname-$_pkgver/src/build_data/linux/installer/usr/share/man/man8/brickd.8 $pkgdir/usr/share/man/man8/brickd.8
+  install -Dm755 $srcdir/tinkerforge-$pkgname-$_pkgver/brickd/brickd $pkgdir/usr/bin/brickd
+  install -Dm644 $srcdir/tinkerforge-$pkgname-$_pkgver/build_data/linux/installer/etc/brickd-default.conf $pkgdir/etc/brickd.conf
+  install -Dm644 $srcdir/tinkerforge-$pkgname-$_pkgver/build_data/linux/installer/etc/logrotate.d/brickd $pkgdir/etc/logrotate.d/brickd
+  install -Dm644 $srcdir/tinkerforge-$pkgname-$_pkgver/build_data/linux/installer/lib/systemd/system/brickd-resume.service $pkgdir/usr/lib/systemd/system/brickd-resume.service
+  install -Dm644 $srcdir/tinkerforge-$pkgname-$_pkgver/build_data/linux/installer/lib/systemd/system/brickd.service $pkgdir/usr/lib/systemd/system/brickd.service
+  install -Dm644 $srcdir/tinkerforge-$pkgname-$_pkgver/debian/copyright $pkgdir/usr/share/doc/brickd/copyright
+  install -Dm644 $srcdir/tinkerforge-$pkgname-$_pkgver/build_data/linux/installer/usr/share/man/man5/brickd.conf.5 $pkgdir/usr/share/man/man5/brickd.conf.5
+  install -Dm644 $srcdir/tinkerforge-$pkgname-$_pkgver/build_data/linux/installer/usr/share/man/man8/brickd.8 $pkgdir/usr/share/man/man8/brickd.8
 }