Improve localmodcfg

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2768ad30ffb5..c01939b2ba8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-uksm
 	pkgver = 4.19.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/dolohow/uksm
 	arch = x86_64
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 69f98e2d53ef..ad864a88e96a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,13 +27,15 @@ _NUMAdisable=y
 # that you currently have probed in your system VASTLY reducing the number of
 # modules built and the build time to do it.
 #
-# WARNING - ALL modules must be probed BEFORE you begin making the pkg!
+# WARNING - ALL modules must be probed or loaded via a config file BEFORE you
+# begin making the pkg unless you're running modprobed-db (AUR) and building
+# this with makepkg as the user who is keeping the database.
 #
 # To keep track of which modules are needed for your specific system/hardware,
 # give module_db script a try: https://aur.archlinux.org/packages/modprobed-db
 # This PKGBUILD will call it directly to probe all the modules you have logged!
 #
-# More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed_db
+# More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db
 _localmodcfg=
 
 # Use the current kernel's .config file
@@ -54,7 +56,7 @@ _major=4.19
 _minor=4
 pkgver=${_major}.${_minor}
 _srcname=linux-${pkgver}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://github.com/dolohow/uksm"
 license=('GPL2')
@@ -157,18 +159,16 @@ prepare() {
         fi
 
     ### Optionally load needed modules for the make localmodconfig
-	# See https://aur.archlinux.org/packages/modprobed-db
-		if [ -n "$_localmodcfg" ]; then
-		msg2 "If you have modprobe-db installed, running it in recall mode now"
-		if [ -e /usr/bin/modprobed-db ]; then
-			[[ -x /usr/bin/sudo ]] || {
-                        echo "Cannot call modprobe with sudo. Install sudo and configure it to work with this user."
-                        exit 1; }
-			sudo /usr/bin/modprobed-db recall
-		fi
-		msg2 "Running Steven Rostedt's make localmodconfig now"
-		make localmodconfig
-	fi
+        # See https://aur.archlinux.org/packages/modprobed-db
+        if [ -n "$_localmodcfg" ]; then
+            if [ -f $HOME/.config/modprobed.db ]; then
+            msg2 "Found a modprobed-db database for Steven Rostedt's make localmodconfig"
+            make LSMOD=$HOME/.config/modprobed.db localmodconfig
+        else
+            msg2 "Running Steven Rostedt's make localmodconfig now"
+            make localmodconfig
+            fi
+        fi
 
     ### Running make nconfig