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

[Jan Steffens]

    Date: Tuesday, August 23, 2022 @ 22:24:20
  Author: heftig
Revision: 454462

2.2.1-1

Modified:
  sof-bin/trunk/PKGBUILD

----------+
 PKGBUILD |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-23 22:20:57 UTC (rev 454461)
+++ PKGBUILD	2022-08-23 22:24:20 UTC (rev 454462)
@@ -2,30 +2,34 @@
 
 pkgbase=sof-bin
 pkgname=(sof-firmware sof-tools)
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="Sound Open Firmware"
 url="https://www.sofproject.org/"
 arch=(x86_64)
 license=(custom:BSD custom:ISC)
-makedepends=(rsync)
-_binver=v$pkgver
-source=(https://github.com/thesofproject/sof-bin/releases/download/$_binver/sof-bin-$_binver.tar.gz)
-sha256sums=('f0a22018aa02266e3713f1551b698847ca303859be4be8c711dd3685de55ad15')
+options=(debug)
+_binver=v${pkgver%.*}
+_tplgver=v${pkgver}
+source=(https://github.com/thesofproject/sof-bin/releases/download/$_binver/sof-bin-$_binver.tar.gz 
+        https://github.com/thesofproject/sof-bin/releases/download/$_tplgver/sof-tplg-$_tplgver.tar.gz)
+sha256sums=('f0a22018aa02266e3713f1551b698847ca303859be4be8c711dd3685de55ad15'
+            'ccdda55f89a63f421ae9a019cc9c8f8f0f8668a0e8c35e384da09ea6be411bb7')
 
 package_sof-firmware() {
-  options=(!strip)
+  options+=(!strip)
 
+  local fwdir="$pkgdir/usr/lib/firmware/intel"
+  mkdir -p "$fwdir"
+
+  cp -at "$fwdir" sof-tplg-$_tplgver
+  ln -sr "$fwdir"/{sof-tplg-$_tplgver,sof-tplg}
+
   cd sof-bin-$_binver
 
-  (
-    export FW_DEST="$pkgdir/usr/lib/firmware/intel"
-    export TOOLS_DEST="$srcdir/tools/usr/bin"
+  cp -at "$fwdir" sof-$_binver
+  ln -sr "$fwdir"/{sof-$_binver,sof}
 
-    mkdir -p "$FW_DEST" "$TOOLS_DEST"
-    ./install.sh $_binver
-  )
-
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENCE* Notice*
 }
 
@@ -35,8 +39,7 @@
 
   cd sof-bin-$_binver
 
-  mv "$srcdir"/tools/* "$pkgdir"
-
+  install -Dt "$pkgdir/usr/bin" tools-$_binver/*
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENCE* Notice*
 }