From ac61ce75ea3747f0a3b6c60966eede5ba9abb46775f86f3af483be7233a36bfa Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 21 Apr 2016 10:23:56 +0000
Subject: [PATCH] Accepting request 390688 from
 home:michal-m:branches:Base:System

- Skip KMPs built from the kernel spec file directly (fate#319339)
- Bump version number to 12.4

- Add module option ib_mthca.catas_reset_disable=1 on ppc64le (bsc#456389).

  kicks in to generate it, but it has issues. bsc#922676

OBS-URL: https://build.opensuse.org/request/show/390688
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=31
---
 modprobe.conf.tar.bz2     |  4 ++--
 suse-module-tools.changes | 15 +++++++++++++--
 suse-module-tools.spec    |  2 +-
 weak-modules2             |  5 +++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/modprobe.conf.tar.bz2 b/modprobe.conf.tar.bz2
index efc4f28..bef6d36 100644
--- a/modprobe.conf.tar.bz2
+++ b/modprobe.conf.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:304a3d04717c996491fca55dcf320a4f19ada765d1a53e83419a404d74d6c60c
-size 3000
+oid sha256:48418d3f702ae6a2971347990ae7e831aa7555cda6bd5c0620a94486fb202d3a
+size 3173
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 440daec..eac7582 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,9 +1,20 @@
+-------------------------------------------------------------------
+Fri Apr  1 11:43:32 UTC 2016 - mmarek@suse.cz
+
+- Skip KMPs built from the kernel spec file directly (fate#319339)
+- Bump version number to 12.4
+
 -------------------------------------------------------------------
 Tue Feb 23 10:43:39 UTC 2016 - lnussel@suse.de
 
 - add missing requirements on module-init-tools, findutils and gzip,
   mkinitrd (bnc#965830)
 
+-------------------------------------------------------------------
+Fri Jan 15 23:04:41 UTC 2016 - bpoirier@suse.com
+
+- Add module option ib_mthca.catas_reset_disable=1 on ppc64le (bsc#456389).
+
 -------------------------------------------------------------------
 Tue Oct 13 08:35:32 UTC 2015 - mmarek@suse.cz
 
@@ -11,13 +22,13 @@ Tue Oct 13 08:35:32 UTC 2015 - mmarek@suse.cz
   with a modified template (bsc#949862).
 
 -------------------------------------------------------------------
-Tue Sep  8 12:44:33 UTC 2015 - trenn@suse.de
+Tue Sep  8 12:52:15 UTC 2015 - trenn@suse.de
 
 - Use /run instead of deprecated /var/run
   This can have sever consequences if this package uses /var/run. It may
   be installed before filesystem package generating the /run tmpfs and
   predict it to generate the link /var/run -> /run. Later dracut convertfs
-  kicks in to generate it, but it has issues. bsc#922676
+  kicks in to generate it, but it has issues. bsc#922676 
 
 -------------------------------------------------------------------
 Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index cb8122f..875f0ec 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           suse-module-tools
-Version:        12.3
+Version:        12.4
 Release:        0
 Requires:       /sbin/depmod
 Requires:       /sbin/mkinitrd
diff --git a/weak-modules2 b/weak-modules2
index 1e32bc5..4e0444c 100644
--- a/weak-modules2
+++ b/weak-modules2
@@ -248,6 +248,11 @@ find_kmps() {
     local kmp
 
     for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do
+	if rpm -q --qf '[%{providename}\n]' --nodigest --nosignature "$kmp" | \
+	    grep -q '^kmp_in_kernel$'; then
+	    # KMP built directly from the kernel spec file (fate#319339)
+	    continue
+	fi
 	rpm -ql --nodigest --nosignature "$kmp" \
 	    | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \
 	    > $tmpdir/modules-$kmp