Update to newer kernel. Strengthen dependencies.

4 files changed, 19 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e14795afa3ea..21da00758630 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Thu Jun 24 20:17:19 UTC 2021
 pkgbase = riffa-git
 	pkgdesc = RIFFA: A Reusable Integration Framework For FPGA Accelerators
 	pkgver = 2.2.2.git20210624
@@ -9,7 +7,8 @@ pkgbase = riffa-git
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-headers
+	makedepends = linux-headers=5.16.8.arch1-1
+	depends = linux=5.16.8.arch1-1
 	source = git://github.com/marzoul/riffa.git
 	source = riffa.install
 	source = patch-subdirs.patch
@@ -20,4 +19,3 @@ pkgbase = riffa-git
 	sha256sums = 6dd2aee2ba41d68419004f7a80b87fbd6a1d8c723d5a2b3d293fe460a7364676
 
 pkgname = riffa-git
-
diff --git a/.gitignore b/.gitignore
index 3ab53dd6b649..a77e7ac8292d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ pkg
 *.tar
 *.tgz
 *.xz
+*.zst
 
diff --git a/PKGBUILD b/PKGBUILD
index 641e38a498fc..46c171c51026 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,11 @@ pkgdesc='RIFFA: A Reusable Integration Framework For FPGA Accelerators'
 url='http://riffa.ucsd.edu/'
 license=('custom')
 
-makedepends=('linux-headers')
+# Note : Dependency is on currently running kernel, which the compilation based on, NOT on the kernel package installed
+_local_linux_version=$(uname -r | sed -r 's/(-arch)/.arch/')
+
+depends=("linux=$_local_linux_version")
+makedepends=("linux-headers=$_local_linux_version")
 install='riffa.install'
 
 source=(
@@ -31,9 +35,9 @@ pkgver() {
 	cd "${srcdir}/riffa"
 
 	# RIFFA version (extracted from Makefile)
-	_distver=`sed -n -e 's/^RELEASE_VER=\([0-9.a-z]*\)\s*$/\1/p' Makefile`
+	local _distver=$(sed -n -e 's/^RELEASE_VER=\([0-9.a-z]*\)\s*$/\1/p' Makefile)
 	# Date of the last git commit
-	_gitver=`git log -n 1 --date=short | sed -n -e 's/^Date:\s*\([0-9-]*\)\s*$/\1/p' | tr -d -`
+	local _gitver=$(git log -n 1 --date=short | sed -n -e 's/^Date:\s*\([0-9-]*\)\s*$/\1/p' | tr -d -)
 
 	echo $_distver.git$_gitver;
 }
@@ -60,16 +64,12 @@ build() {
 }
 
 package() {
-	# Note: Can't use the riffa provided install commands because all is hardcoded for Red Hat / Debian
-
-	_extramodules=extramodules-`uname -r | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\..*/\1.\2/g'`-ARCH
-	sed --follow-symlinks -i -e 's/^\([[:blank:]]*EXTRAMODULES=\).*$/\1'"$_extramodules"'/g' "${srcdir}/riffa.install"
 
 	install -Dm0755 "${srcdir}/99-riffa.rules" "${pkgdir}/etc/udev/rules.d/99-riffa.rules"
 
 	cd "${srcdir}/riffa/driver/linux"
 
-	install -D riffa.ko "${pkgdir}/usr/lib/modules/$_extramodules/riffa.ko"
+	install -D riffa.ko "${pkgdir}/usr/lib/modules/$(uname -r)/kernel/drivers/riffa/riffa.ko"
 
 	install -Dm0644 riffa.h        "${pkgdir}/usr/include/riffa.h"
 	install -Dm0644 riffa_driver.h "${pkgdir}/usr/include/riffa_driver.h"
diff --git a/riffa.install b/riffa.install
index 7cc7d952e997..1306f0786720 100644
--- a/riffa.install
+++ b/riffa.install
@@ -1,19 +1,18 @@
 
-_depmod() {
-  EXTRAMODULES=extramodules-5.12-ARCH
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
+# Note : pacman autoimatically performs the following tasks after package install/update/remove:
+# Update libraries with ldconfig
+# Update kernel module dependencies with depmod (provided the module is installed at aappropariate path)
 
 post_install() {
-  echo '==> You must load the riffa kernel module before using Riffa: # modprobe riffa'
-  _depmod
+  echo '==> The RIFFA driver must be enabled to be used : # modprobe riffa'
 }
 
 post_upgrade() {
-  _depmod
-  echo '==> Manually reload the riffa kernel module to use the new version.'
+  echo '==> To use the new RIFFA driver without rebooting : # rmmod riffa ; modprobe riffa'
 }
 
 post_remove() {
-  _depmod
+  echo '==> Removing the Riffa kernel module'
+  rmmod riffa
 }
+