Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-06-28 22:19:31 +0200
committerMichal Marek <mmarek@suse.cz>2010-06-28 22:40:55 +0200
commit80bf02eb294bed187ab68e695e33fe0eb810481c (patch)
treec51af60a26c47748d9b530d6b9b278aa25c3f22b
parentdc04f3e32e7f9eadf3d1234cab055cb6a1575a78 (diff)
- rpm/find-provides: Add base symsets to the main subpackage.
-rw-r--r--kernel-source.changes5
-rw-r--r--rpm/find-provides9
2 files changed, 10 insertions, 4 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index ac32a5e8f2..22fe5d10b5 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Jun 28 22:19:17 CEST 2010 - mmarek@suse.cz
+
+- rpm/find-provides: Add base symsets to the main subpackage.
+
+-------------------------------------------------------------------
Thu Jun 24 21:02:48 CEST 2010 - agruen@suse.de
- Replace the nfs4acl patches by their successor patch queue,
diff --git a/rpm/find-provides b/rpm/find-provides
index f64f150c0a..8d0cd8f614 100644
--- a/rpm/find-provides
+++ b/rpm/find-provides
@@ -1,5 +1,6 @@
#! /bin/bash
+set -x
builddir="$1"
shift
@@ -27,17 +28,17 @@ if ! grep -q '\.ko$' "$filelist"; then
exit 0
fi
if samemodules "$builddir"/base-modules "$filelist"; then
- subpack=base
+ symsets=("$builddir/base-symsets")
elif samemodules "$builddir"/main-modules "$filelist"; then
- subpack=main
+ symsets=("$builddir/base-symsets" "$builddir/main-symsets")
elif samemodules "$builddir"/unsupported-modules "$filelist"; then
- subpack=extra
+ symsets=("$builddir/extra-symsets")
else
echo "find-provides: failed to determine which subpackage is this" >&2
exit 1
fi
-find "$builddir/$subpack-symsets" -type f -printf '%f\n' | \
+find "${symsets[@]}" -type f -printf '%f\n' | \
sed -rn 's/^\.?(.+)\.([a-z0-9]{16})(\.fake)?$/kernel('$flavor':\1) = \2/p'
exit 0