From 3caf087dcae2b80aef70a3f63ab685bc26772fb4 Mon Sep 17 00:00:00 2001
From: Eugene Syromiatnikov <esyr@redhat.com>
Date: Mon, 21 Jan 2019 11:10:24 +0100
Subject: [PATCH] kmodtool: update dependencies, weak-modules path

Add Requires(post) and Requires(postun) on weak-modules, use
/usr/sbin/weak-modules path, add relevant build requirements.

* kmodtool (get_rpmtemplate): Add weak-modules to Requires(post),
Requires(postun). Prefix path to weak-modules with /usr.

Resolves: #2002887
Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
---
 kmodtool | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kmodtool b/kmodtool
index 6665a74..10cf3b9 100755
--- a/kmodtool
+++ b/kmodtool
@@ -133,6 +133,8 @@ Provides:         kernel-modules >= ${verrel}${dotvariant}
 Provides:         ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires(post):   /usr/sbin/depmod
 Requires(postun): /usr/sbin/depmod
+Requires(post):   /usr/sbin/weak-modules
+Requires(postun): /usr/sbin/weak-modules
 EOF
 
     if [ "yes" != "$nobuildreqs" ]
@@ -164,9 +166,9 @@ if [ -e "/boot/System.map-${verrel}${dotvariant}" ]; then
 fi
 
 modules=( \$(find /lib/modules/${verrel}${dotvariant}/extra/${kmod_name} | grep '\.ko$') )
-if [ -x "/sbin/weak-modules" ]; then
+if [ -x "/usr/sbin/weak-modules" ]; then
     printf '%s\n' "\${modules[@]}" \
-    | /sbin/weak-modules --add-modules
+    | /usr/sbin/weak-modules --add-modules
 fi
 EOF
 
@@ -183,9 +185,9 @@ fi
 
 modules=( \$(cat /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules) )
 rm /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules
-if [ -x "/sbin/weak-modules" ]; then
+if [ -x "/usr/sbin/weak-modules" ]; then
     printf '%s\n' "\${modules[@]}" \
-    | /sbin/weak-modules --remove-modules
+    | /usr/sbin/weak-modules --remove-modules
 fi
 EOF