diff --git a/_service b/_service index d79b35d..7227c6e 100644 --- a/_service +++ b/_service @@ -7,10 +7,10 @@ To update to a new release, change "revision" to the desired git commit hash and bump "version" if necessary - 9.0.16-1 + 9.0.17-1 --> - 9.0.16+git.%h - ab9777dfeaf9d619acc9a5201bfcae8103e9529c + 9.0.17+git.%h + b9abab2dd27313922797d026542b399870bfd13e diff --git a/compat_no_bioset_initialized.patch b/compat_no_bioset_initialized.patch index 6e97ac3..dbaebfc 100644 --- a/compat_no_bioset_initialized.patch +++ b/compat_no_bioset_initialized.patch @@ -1,6 +1,6 @@ -diff -Naur drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/drbd_wrappers.h drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/drbd_wrappers.h ---- drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/drbd_wrappers.h 2018-12-10 15:36:51.485109170 +0800 -+++ drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/drbd_wrappers.h 2018-12-10 16:13:27.248289076 +0800 +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; @@ -24,10 +24,10 @@ diff -Naur drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/drbd_wrappers.h +#endif #endif - #endif -diff -Naur drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c ---- drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c 1970-01-01 08:00:00.000000000 +0800 -+++ drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c 2018-12-10 16:18:02.952053971 +0800 + #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 +/* diff --git a/drbd-9.0.16+git.ab9777df.tar.bz2 b/drbd-9.0.16+git.ab9777df.tar.bz2 deleted file mode 100644 index 6c1347c..0000000 --- a/drbd-9.0.16+git.ab9777df.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:885be9f12ad24f16f62f5a1cd36991569187b66a1b878e12cce69fb3117ae239 -size 320850 diff --git a/drbd-9.0.17+git.b9abab2d.tar.bz2 b/drbd-9.0.17+git.b9abab2d.tar.bz2 new file mode 100644 index 0000000..826ee04 --- /dev/null +++ b/drbd-9.0.17+git.b9abab2d.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:350585501737e48f30ae785ea95db65588ab8abca1ac9fa3ec7480d16889c86c +size 444681 diff --git a/drbd.changes b/drbd.changes index 643927e..a93d5df 100644 --- a/drbd.changes +++ b/drbd.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Fri Mar 22 02:10:17 UTC 2019 - nwang@suse.com + +- Upgrade to 9.0.17-1 + * Fix UUID handling of a diskless primary that has not peer with + usable data may not touch the current UUID + * Fix resync-after dependencies; cross-resource dependencies + and missing resources + * Fix resync when the sync source suddenly connects to a more recent + data set via an other connection and becomes sync target on that + other connection; pause first resync; fix wrong display of negative + resync progress percentage in this case + * Fix volume numbers between 32767 and 65534 + * Fix the data integrity implementation; it was broken since drbd-9.0 + and reported only false positives + * Fix for a corner-case when a promote action happens concurrently with + a reconciliation resync + * Improve resync code to be able to fully utilize fast storage + backend devices and fast networks with resync traffic; as a side + effect the settling time of the resync controller got shorter in + for most cases + * Show in the user-visible message who the opener is if if demote/down + fails doe to someone holding a drbd device open + * docker file for a "load drbd module container" and allow to disable + user-mode-helpers, which is necessary for this container +- Add patch fix-make-error.patch for build error of make against TW. + ------------------------------------------------------------------- Thu Jan 10 02:16:03 UTC 2019 - nwang@suse.com diff --git a/drbd.spec b/drbd.spec index 146401f..acde91b 100644 --- a/drbd.spec +++ b/drbd.spec @@ -24,7 +24,7 @@ %endif Name: drbd -Version: 9.0.16+git.ab9777df +Version: 9.0.17+git.b9abab2d Release: 0 Summary: DRBD driver for Linux License: GPL-2.0+ @@ -38,6 +38,7 @@ 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 @@ -73,6 +74,7 @@ installed kernel. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 mkdir source cp -a drbd/. source/. || : diff --git a/drbd_git_revision b/drbd_git_revision index f24f20c..516014e 100644 --- a/drbd_git_revision +++ b/drbd_git_revision @@ -1 +1 @@ -GIT-hash: ab9777dfeaf9d619acc9a5201bfcae8103e9529c +GIT-hash: b9abab2dd27313922797d026542b399870bfd13e diff --git a/fix-make-error.patch b/fix-make-error.patch new file mode 100644 index 0000000..da07a02 --- /dev/null +++ b/fix-make-error.patch @@ -0,0 +1,44 @@ +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. */"; \