[arch-commits] Commit in bladerf/trunk (PKGBUILD)

[Kyle Keen]

    Date: Tuesday, June 4, 2019 @ 23:04:54
  Author: kkeen
Revision: 476918

upgpkg: bladerf 2.2.0-1

Modified:
  bladerf/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-04 22:12:29 UTC (rev 476917)
+++ PKGBUILD	2019-06-04 23:04:54 UTC (rev 476918)
@@ -5,10 +5,11 @@
 # keeping it more modular for now though
 
 pkgname=bladerf
-_libver=2.0.2
-_CLIver=1.5.1
+_libver=2.2.0
+_CLIver=1.7.1
 _FPGAver=0.10.2
 _firmver=2.3.2
+_noOScommit=0bba46e  # upstream has pinned a submodule to this
 pkgver=$_libver
 pkgrel=1
 pkgdesc="Driver, userspace, fpga & firmware for the bladeRF SDR."
@@ -22,11 +23,13 @@
 
 source=(
     "https://github.com/Nuand/bladeRF/archive/libbladeRF_v$_libver.tar.gz"
+    "noOS-$_noOScommit.tgz::https://github.com/analogdevicesinc/no-OS/archive/$_noOScommit.tar.gz"
     "https://nuand.com/fpga/v$_FPGAver/hostedx40.rbf"
     "https://nuand.com/fpga/v$_FPGAver/hostedx115.rbf"
     "https://www.nuand.com/fx3/bladeRF_fw_v$_firmver.img")
 
-md5sums=('ac1ace151d1039c5a88d59b155e17e02'
+md5sums=('19e62a3eeca1aaad5b6a67c70ceb9ce8'
+         '2c06ff9297d8beb0482a1b0b5e4d3128'
          '4aabf1617901423569f425db93598884'
          '33641f8a126bef1c0b7e6ba8bedda93f'
          'c823ea5aa2c25c26bbaf4ab395ac559d')
@@ -37,7 +40,7 @@
 prepare() {
   cd "$srcdir/bladeRF-libbladeRF_v$_libver"
   # FS#47168
-  sed -i 's|MODE.*$|TAG+="uaccess"|' host/misc/udev/88-nuand.rules.in
+  sed -i 's|MODE.*$|TAG+="uaccess"|' host/misc/udev/*.rules.in
 
   # todo, report warning
   sed -i '94i add_definitions(-Wno-error=format-truncation)' host/CMakeLists.txt
@@ -44,6 +47,11 @@
 
   # FS#55326
   sed -i '44s/^else/#&/' host/misc/udev/CMakeLists.txt
+
+  # manually replace the submodules
+  # because "git submodule init/update" doesn't work with a release tarball
+  rmdir --ignore-fail-on-non-empty thirdparty/analogdevicesinc/no-OS
+  ln -s "$srcdir/no-OS-$_noOSver"* thirdparty/analogdevicesinc/no-OS
 }
 
 build() {
@@ -72,5 +80,7 @@
 
   # FS#54105
   cd "$pkgdir/etc/udev/rules.d/"
-  mv 88-nuand.rules 70-nuand.rules
+  mv 88-nuand-bladerf1.rules   70-nuand-bladerf1.rules
+  mv 88-nuand-bladerf2.rules   70-nuand-bladerf2.rules
+  mv 88-nuand-bootloader.rules 70-nuand-bootloader.rules
 }