Accepting request 706971 from network:ha-clustering:Stable

Update to 9.0.18

OBS-URL: https://build.opensuse.org/request/show/706971
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=86
This commit is contained in:
nick wang 2019-06-03 02:23:04 +00:00 committed by Git OBS Bridge
parent db253bee42
commit b5889d912c
8 changed files with 27 additions and 55 deletions

View File

@ -7,10 +7,10 @@
To update to a new release, change "revision" to the desired
git commit hash and bump "version" if necessary
<param name="version">9.0.17-1</param>
<param name="version">9.0.18-1</param>
-->
<param name="versionformat">9.0.17+git.%h</param>
<param name="revision">b9abab2dd27313922797d026542b399870bfd13e</param>
<param name="versionformat">9.0.18+git.%h</param>
<param name="revision">08cff482579f0dbbc0aed76b65d9b1a1870d2292</param>
</service>
<service name="recompress" mode="disabled">

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:350585501737e48f30ae785ea95db65588ab8abca1ac9fa3ec7480d16889c86c
size 444681

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:530631b92b2f07be5e81bbcc5d9d6c5f528db56ff2540a3a4372b6c7d4a48152
size 331095

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue May 28 05:52:07 UTC 2019 - nwang@suse.com
- Upgrade to 9.0.18-1
* Fix an IO deadlock under memory pressure
* Fix disconnect timing in case the network connection suddenly
drops all packets
* Fix some misbehavior that surfaced with Ahead/Behind
* Fix potential spinlock deadlock in IRQ
* Minor fixes: forget-peer, _rcu iterators
* Quickly stop resync during AHEAD/BEHIND by introducing new
packet for that purpose.
* The quorum feature can now use the connectivity to
the majority of Diskless nodes as tiebreaker
* Access meta-data using DAX if it is on persistent memory
(NVDIMM or PMEM); For write intense workloads this is a x2 to x4 speedup!
- Remove patch fix-make-error.patch since merged into upstream(46e8e3fc)
-------------------------------------------------------------------
Fri Mar 22 02:10:17 UTC 2019 - nwang@suse.com

View File

@ -24,7 +24,7 @@
%endif
Name: drbd
Version: 9.0.17+git.b9abab2d
Version: 9.0.18+git.08cff482
Release: 0
Summary: DRBD driver for Linux
License: GPL-2.0+
@ -38,7 +38,6 @@ 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
Patch4: fix-make-error.patch
BuildRequires: kernel-source
BuildRequires: kernel-syms
BuildRequires: libelf-devel
@ -74,7 +73,6 @@ installed kernel.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
mkdir source
cp -a drbd/. source/. || :

View File

@ -1 +1 @@
GIT-hash: b9abab2dd27313922797d026542b399870bfd13e
GIT-hash: 08cff482579f0dbbc0aed76b65d9b1a1870d2292

View File

@ -1,44 +0,0 @@
Fix the grace build/ld error when build against openSUSE TW.
"$(filter-out drbd_buildtag.o,$(drbd-y))" will translate to
all the .o except drbd_buildtag.o
Error log:
[ 110s] UPD /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/compat.h
[ 110s] CC [M] /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_debugfs.o
[ 111s] GEN /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_buildtag.c
[ 111s] CC [M] /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_buildtag.o
[ 112s] LD [M] /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd.o
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_bitmap.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_proc.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_sender.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_receiver.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_req.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_actlog.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/lru_cache.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_main.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_strings.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_nl.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_interval.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_state.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd-kernel-compat/drbd_wrappers.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_nla.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_transport.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/kref_debug.o: No such file or directory
[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_kref_debug.o: No such file or directory
[ 112s] make[3]: *** [/usr/src/linux-5.0.3-1/scripts/Makefile.build:465: /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd.o] Error 1
[ 112s] make[2]: *** [/usr/src/linux-5.0.3-1/Makefile:1568: _module_/home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default] Error 2
[ 112s] make[1]: *** [Makefile:152: sub-make] Error 2
diff -Naur drbd-9.0.17+git.b9abab2d.orig/drbd/Kbuild drbd-9.0.17+git.b9abab2d/drbd/Kbuild
--- drbd-9.0.17+git.b9abab2d.orig/drbd/Kbuild 2019-04-01 16:13:18.819447480 +0800
+++ drbd-9.0.17+git.b9abab2d/drbd/Kbuild 2019-04-03 15:13:56.227029581 +0800
@@ -124,7 +124,7 @@
# and not in e.g. dash. I'm too lazy to fix it to be compatible.
SHELL=/bin/bash
-$(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y))
+$(obj)/drbd_buildtag.c:
@$(kecho) ' GEN $@ $(echo-why)'
@set -e; exec > $@.new; \
echo -e "/* automatically generated. DO NOT EDIT. */"; \

View File

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