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

[Jan Steffens]

    Date: Wednesday, August 1, 2018 @ 20:53:02
  Author: heftig
Revision: 330433

Remove $basever from extramodules dir

Modified:
  linux/trunk/PKGBUILD

----------+
 PKGBUILD |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-01 20:53:00 UTC (rev 330432)
+++ PKGBUILD	2018-08-01 20:53:02 UTC (rev 330433)
@@ -74,7 +74,6 @@
   install=linux.install
 
   local kernver="$(<version)"
-  local basever="$(<version cut -d. -f1-2)"
 
   cd $_srcname
 
@@ -88,7 +87,7 @@
 
   # a place for external modules,
   # with version file for building modules and running depmod from hook
-  local extradir="$pkgdir/usr/lib/modules/extramodules-$basever$_kernelname"
+  local extradir="$pkgdir/usr/lib/modules/extramodules$_kernelname"
   install -Dt "$extradir" -m644 ../version
   ln -sr "$extradir" "$modulesdir/extramodules"
 
@@ -104,7 +103,7 @@
   local subst="
     s|%PKGBASE%|$pkgbase|g
     s|%KERNVER%|$kernver|g
-    s|%EXTRAMODULES%|$extramodules|g
+    s|%EXTRAMODULES%|$extradir|g
   "
 
   # hack to allow specifying an initially nonexisting install file