Accepting request 729346 from network:ha-clustering:Stable

bsc#1149945, use drbd-9.0 for kernel 5.2+ support.

OBS-URL: https://build.opensuse.org/request/show/729346
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=90

_service

@@ -7,10 +7,11 @@
     To update to a new release, change "revision" to the desired
     git commit hash and bump "version" if necessary
 
-    <param name="version">9.0.19-1</param>
+    <param name="revision">drbd-9.0</param>
+    <param name="version">9.0.19~1</param>
 -->
-    <param name="versionformat">9.0.19+git.%h</param>
-    <param name="revision">6f5fa5d348a99e5eeb09d83c49853d72e614fd07</param>
+    <param name="versionformat">9.0.19~1+git.%h</param>
+    <param name="revision">8e93a5d93b62db7cb3657557e0dafa1c8a1b0cc6</param>
   </service>
 
   <service name="recompress" mode="disabled">

compat_no_bioset_initialized.patch

@@ -1,45 +0,0 @@
-diff -Naur drbd-9.0.17~0rc1+git.e279913a.orig/drbd/drbd-kernel-compat/drbd_wrappers.h drbd-9.0.17~0rc1+git.e279913a/drbd/drbd-kernel-compat/drbd_wrappers.h
---- drbd-9.0.17~0rc1+git.e279913a.orig/drbd/drbd-kernel-compat/drbd_wrappers.h	2019-03-22 10:34:53.269720542 +0800
-+++ drbd-9.0.17~0rc1+git.e279913a/drbd/drbd-kernel-compat/drbd_wrappers.h	2019-03-22 10:35:42.085701294 +0800
-@@ -1397,14 +1397,23 @@
- 	*pool = mempool_create_slab_pool(min_nr, mem_cache);
- 	return *pool == NULL ? -ENOMEM : 0;
- }
-+#ifndef COMPAT_HAVE_BIOSET_INITIALIZED
- static inline bool
- bioset_initialized(struct bio_set **bs)
- {
- 	return *bs != NULL;
- }
-+#endif
- #else
- #define DRBD_MEMPOOL_T mempool_t
- #define DRBD_BIO_SET   bio_set
-+#ifndef COMPAT_HAVE_BIOSET_INITIALIZED
-+static inline bool
-+bioset_initialized(struct bio_set *bs)
-+{
-+	return bs->bio_slab != NULL;
-+}
-+#endif
- #endif
- 
- #if defined(COMPAT_BEFORE_4_13_KERNEL_READ)
-diff -Naur drbd-9.0.17~0rc1+git.e279913a.orig/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c drbd-9.0.17~0rc1+git.e279913a/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c
---- drbd-9.0.17~0rc1+git.e279913a.orig/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c	1970-01-01 08:00:00.000000000 +0800
-+++ drbd-9.0.17~0rc1+git.e279913a/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c	2019-03-22 10:36:08.333690886 +0800
-@@ -0,0 +1,14 @@
-+#include <linux/bio.h>
-+/*
-+With linux v4.18 biosets get embedded
-+commit 917a38c71af82185c39e31589587591fa764fb85
-+Author: Kent Overstreet <kent.overstreet@gmail.com>
-+Date:   Tue May 8 21:33:51 2018 -0400
-+*/
-+
-+static inline bool foo(void)
-+{
-+	struct bio_set bio_set;
-+
-+	return bioset_initialized(&bio_set);
-+}

drbd-9.0.19+git.6f5fa5d3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83a6e0f8ec301b6067f3dc6d408e6627baddc6c3a215aa47a33ba63768fc69fb
-size 333165

drbd-9.0.19~1+git.8e93a5d9.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3578c155c748ec0485d64a15d39734805278ba267302fe41f075fd74e367e6f5
+size 338041

drbd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Sep  9 07:09:37 UTC 2019 - nick wang <nwang@suse.com>
+
+- bsc#1149945, update to 8e93a5d93 (drbd-9.0 branch)
+ * Coccinelle support
+ * compat with up to Linux-5.3
+- Remove patch compat_no_bioset_initialized.patch
+
 -------------------------------------------------------------------
 Fri Jul 19 03:06:11 UTC 2019 - nwang@suse.com
 

drbd.spec

@@ -24,9 +24,9 @@
 %endif
 
 Name:           drbd
-Version:        9.0.19+git.6f5fa5d3
+Version:        9.0.19~1+git.8e93a5d9
 Release:        0
-Summary:        DRBD driver for Linux
+Summary:        Driver for Linux
 License:        GPL-2.0+
 Group:          Productivity/Clustering/HA
 Url:            http://drbd.linbit.com/
@@ -36,12 +36,13 @@ Source1:        preamble
 Source2:        Module.supported
 Source3:        drbd_git_revision
 Patch1:         fix-resync-finished-with-syncs-have-bits-set.patch
-Patch2:         compat_no_bioset_initialized.patch
-Patch3:         rely-on-sb-handlers.patch
+Patch2:         rely-on-sb-handlers.patch
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
 BuildRequires:  libelf-devel
-BuildRequires:  module-init-tools
+#https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py
+BuildRequires:  modutils
+BuildRequires:  coccinelle
 Requires:       drbd-utils >= 9.2.0
 Supplements:    drbd-utils >= 9.2.0
 Obsoletes:      drbd-kmp < %{version}
@@ -59,7 +60,7 @@ device over the network to another machine. Think of it as networked
 raid 1. It is a building block for setting up clusters.
 
 %package KMP
-Summary:        Kernel driver for DRBD
+Summary:        Kernel driver
 Group:          Productivity/Clustering/HA
 Url:            http://drbd.linbit.com/
 
@@ -72,7 +73,6 @@ installed kernel.
 %setup -q -n drbd-%{version}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 mkdir source
 cp -a drbd/. source/. || :
@@ -93,6 +93,7 @@ for flavor in %{flavors_to_build}; do
     cp %{_sourcedir}/Module.supported $flavor
     export DRBDSRC="$PWD/obj/$flavor"
     make -C %{kernel_source $flavor} modules M=$PWD/$flavor
+
     #Check the compat result
     cat $PWD/$flavor/compat.h
 done

drbd_git_revision

@@ -1 +1 @@
-GIT-hash: 6f5fa5d348a99e5eeb09d83c49853d72e614fd07
+GIT-hash: 8e93a5d93b62db7cb3657557e0dafa1c8a1b0cc6

preamble

@@ -1,5 +1,3 @@
 Requires: kernel-%1
-Requires: drbd-utils >= 9.2.0
-Supplements: drbd-utils >= 9.2.0
 Supplements: packageand(kernel-%1:%name)
 Recommends: drbd