[redhat-rpm-config: 107/215] patch from jcm to adjust kmod handling

[Panu Matilainen]

commit 48c39c99dc02c52d67038cefd7610b24cf79c5f1
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Jun 19 15:18:25 2007 +0000

    patch from jcm to adjust kmod handling

 find-requires |   20 ++++++--------------
 symset-table  |    5 +++++
 2 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/find-requires b/find-requires
index 140ea22..9d0d179 100755
--- a/find-requires
+++ b/find-requires
@@ -5,11 +5,6 @@
 # sonames, script interpreters, and perl modules.
 #
 
-if [ "$1" ]
-then
-   package_name = "$1"
-fi
-
 ulimit -c 0
 
 #
@@ -144,21 +139,18 @@ done | sort -u
 # cheat a little here by looking first for a kernel, then for a kmod.
 #
 
-is_kmod=1
+unset is_kmod
+
 for f in $filelist; do
     if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ]
     then
-        is_kernel=1;
-    fi
-    if [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]
+        is_kmod=1;
+    elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]
     then
-        unset is_kmod;
+	unset is_kmod;
+	break;
     fi
 done
-if [ ! "$is_kernel" ] || [ "$package_name" == "kernel" ]
-then
-    unset is_kmod
-fi
 
 [ -x /usr/lib/rpm/redhat/find-requires.ksyms ] && [ "$is_kmod" ] &&
     printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-requires.ksyms
diff --git a/symset-table b/symset-table
index c94a61c..acc00c3 100755
--- a/symset-table
+++ b/symset-table
@@ -19,6 +19,11 @@ for symsets in /boot/symsets-*.tar.gz; do
     | tar xf -
 done
 
+for symsets in /usr/src/kernels/*/symsets-*.tar.gz; do
+    zcat $symsets \
+    | tar xf -
+done
+
 for symsets in *; do
     krel=${symsets#symsets-}
     for symset in $symsets/*; do