Updated akari 1.0.47 for kernel 5.x

2 files changed, 11 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f8d64afe17a7..f237cd66528f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,28 @@
 # Contributor: jorge_barroso <jorge.barroso.11 at gmail dot com>
 
 pkgname=akari
-pkgver=1.0.38
-_timestamp=20180522
-_extramodules=extramodules-4.17-ARCH
+pkgver=1.0.47
+_timestamp=20220222
 _ccstoolsver=1.8.5
-pkgrel=3
+pkgrel=1
 pkgdesc='TOMOYO Linux 1.8.x Module for the Linux kernel'
 arch=('x86_64')
 url='http://akari.osdn.jp/'
 license=('GPL')
-makedepends=('linux' 'linux-headers>=4.19' 'linux-headers<4.20')
+makedepends=('linux' 'linux-headers')
 conflicts=("ccs-tools<${_ccstoolsver}")
 install=${pkgname}.install
 source=("http://osdn.jp/frs/redir.php?f=/akari/49272/${pkgname}-${pkgver}-${_timestamp}.tar.gz"
         "http://osdn.jp/frs/redir.php?f=/akari/49272/${pkgname}-${pkgver}-${_timestamp}.tar.gz.asc"
         activation_trigger.patch)
-sha256sums=('9d784dc6288f7d040c2864ad36834dc967d462a212c7dc626443db44f723981a'
+sha256sums=('71ec6ba451a84c9b0ec625bfa1f5e9560220df25b9b0376d1167989977e5a6da'
             'SKIP'
             '55d86a0d602631129298887fa63c1396ed6c6229965efcdbdc549ee159a39702')
 noextract=("${pkgname}-${pkgver}-${_timestamp}.tar.gz")
 validpgpkeys=('43C83369623D7AD3A96C2FC7425F128D0C64F52A')
 
 prepare() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  _kernver="$(uname -r)"
   cp -a "/usr/lib/modules/${_kernver}/build" "${srcdir}"
   cd "${srcdir}/build"
   tar -zxf "${srcdir}/${pkgname}-${pkgver}-${_timestamp}.tar.gz"
@@ -33,11 +32,12 @@ prepare() {
 
 build() {
   cd "${srcdir}/build/"
-  make SUBDIRS=akari SYSSRC=/usr/lib/modules/${_kernver}/build modules
+  make M=akari modules
 }
 
 package() {
+  _kernver="$(uname -r)"
   install -D -m644 "${srcdir}/build/akari/akari.ko" \
-    "${pkgdir}/usr/lib/modules/${_extramodules}/akari.ko"
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+    "${pkgdir}/usr/lib/modules/${_kernver}/extramodules/akari.ko"
+  gzip "${pkgdir}/usr/lib/modules/${_kernver}/extramodules/"*.ko
 }
diff --git a/akari.install b/akari.install
index 2b4202a72d33..90ebf2b10779 100644
--- a/akari.install
+++ b/akari.install
@@ -1,6 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.19-ARCH'
-    depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
+    depmod $(uname -r)
     echo "In order to use akari module append \"init=/usr/bin/ccs-init\""
     echo "to the kernel boot options and reboot the system to activate"
 }