From ad08ed08468789e43b27594c91dfcc495096e1136963bd5c0fd7b0844a912379 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sat, 21 Feb 2015 22:16:41 +0000
Subject: [PATCH 1/4] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=86

---
 kmod.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kmod.spec b/kmod.spec
index 239b99b..e863326 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kmod
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -154,7 +154,7 @@ ln -s "%_libdir/libkmod.so.2.2.9" "$b/%_lib/";
 %endif
 
 %check
-make check
+make check V=1
 
 %post -n %lname -p /sbin/ldconfig
 

From 07f12cb6c10919e6030823a55e7be9a546ad282847e3f4107d45f2c845cb2c5a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 22 Feb 2015 10:41:59 +0000
Subject: [PATCH 2/4] - kmod-blacklist-fixtest.patch: tag the test in
 test-blacklist correctly

OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=87
---
 kmod-blacklist-fixtest.patch | 22 ++++++++++++++++++++++
 kmod.changes                 |  5 +++++
 kmod.spec                    |  3 ++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 kmod-blacklist-fixtest.patch

diff --git a/kmod-blacklist-fixtest.patch b/kmod-blacklist-fixtest.patch
new file mode 100644
index 0000000..98c5c57
--- /dev/null
+++ b/kmod-blacklist-fixtest.patch
@@ -0,0 +1,22 @@
+Index: kmod-19/testsuite/test-blacklist.c
+===================================================================
+--- kmod-19.orig/testsuite/test-blacklist.c
++++ kmod-19/testsuite/test-blacklist.c
+@@ -92,14 +92,13 @@ fail_lookup:
+ 	kmod_unref(ctx);
+ 	return EXIT_FAILURE;
+ }
+-static const struct test sblacklist_1 = {
+-	.name = "blacklist_1",
++
++DEFINE_TEST(blacklist_1,
+ 	.description = "check if modules are correctly blacklisted",
+-	.func = blacklist_1,
+ 	.config = {
+ 		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-blacklist/",
+ 	},
+ 	.need_spawn = true,
+-};
++);
+ 
+ TESTSUITE_MAIN();
diff --git a/kmod.changes b/kmod.changes
index 9d835ff..169c881 100644
--- a/kmod.changes
+++ b/kmod.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 22 10:41:40 UTC 2015 - meissner@suse.com
+
+- kmod-blacklist-fixtest.patch: tag the test in test-blacklist correctly
+
 -------------------------------------------------------------------
 Sun Nov 16 20:54:36 UTC 2014 - jengelh@inai.de
 
diff --git a/kmod.spec b/kmod.spec
index e863326..3cb51e7 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -35,6 +35,7 @@ Patch2:         0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch
 Patch3:         0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
 Patch4:         0010-modprobe-Implement-allow-unsupported-modules.patch
 Patch5:         0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
+Patch6:         kmod-blacklist-fixtest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -99,7 +100,7 @@ in %lname.
 
 %prep
 %setup -q
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
 
 %build
 autoreconf -fi

From 6b78f92048512f4ca88dad736a34061e0c21d2e0397c32a0415bacdc33727159 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 22 Feb 2015 10:45:11 +0000
Subject: [PATCH 3/4] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=88

---
 kmod-blacklist-fixtest.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/kmod-blacklist-fixtest.patch b/kmod-blacklist-fixtest.patch
index 98c5c57..b907420 100644
--- a/kmod-blacklist-fixtest.patch
+++ b/kmod-blacklist-fixtest.patch
@@ -20,3 +20,25 @@ Index: kmod-19/testsuite/test-blacklist.c
 +);
  
  TESTSUITE_MAIN();
+Index: kmod-19/testsuite/test-dependencies.c
+===================================================================
+--- kmod-19.orig/testsuite/test-dependencies.c
++++ kmod-19/testsuite/test-dependencies.c
+@@ -76,15 +76,13 @@ static int test_dependencies(const struc
+ 
+ 	return EXIT_SUCCESS;
+ }
+-static const struct test stest_dependencies = {
+-	.name = "test_dependencies",
++DEFINE_TEST(test_dependencies,
+ 	.description = "test if kmod_module_get_dependencies works",
+-	.func = test_dependencies,
+ 	.config = {
+ 		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-dependencies/",
+ 		[TC_UNAME_R] = TEST_UNAME,
+ 	},
+ 	.need_spawn = true,
+-};
++)
+ 
+ TESTSUITE_MAIN();

From 32cc84840360abaa3e5b956650e6ab09b3f2c43e0e90d4143c7a9213548244d5 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 22 Feb 2015 18:10:45 +0000
Subject: [PATCH 4/4] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=89

---
 kmod-blacklist-fixtest.patch | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kmod-blacklist-fixtest.patch b/kmod-blacklist-fixtest.patch
index b907420..2695870 100644
--- a/kmod-blacklist-fixtest.patch
+++ b/kmod-blacklist-fixtest.patch
@@ -1,3 +1,10 @@
+In upstream git:
+	0af8f786c0bae8c10d9b463d72e72cc6e80c26a2
+	From: Marcus Meissner
+and
+	d2db083ab6f8491e806c72888d897d15584f9f17
+	From: Lucas De Marchi
+
 Index: kmod-19/testsuite/test-blacklist.c
 ===================================================================
 --- kmod-19.orig/testsuite/test-blacklist.c