diff --git a/_service b/_service index 7be363b..a70beef 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.9 + 9.0.10 --> - 9.0.9+git.%h - a4cc249ec2d55ec2953aeb482d819e47adbbee33 + 9.0.10+git.%h + b7994aa164158d944115dac2800e5c27ab2cd2c9 diff --git a/drbd-9.0.10+git.b7994aa1.tar.bz2 b/drbd-9.0.10+git.b7994aa1.tar.bz2 new file mode 100644 index 0000000..6a1c900 --- /dev/null +++ b/drbd-9.0.10+git.b7994aa1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ba3cd0cfaab9a3b3acc48f78f94a77250bac9e6cfe10ee6b30d58643286b9de +size 312291 diff --git a/drbd-9.0.9+git.a4cc249e.tar.bz2 b/drbd-9.0.9+git.a4cc249e.tar.bz2 deleted file mode 100644 index d5333f4..0000000 --- a/drbd-9.0.9+git.a4cc249e.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa86fea9488339eb75159d4604a3fc1aad897a2dd5a2eabb5d2c4247f3dd8139 -size 309712 diff --git a/drbd.changes b/drbd.changes index d85e3c1..c250c87 100644 --- a/drbd.changes +++ b/drbd.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Dec 6 07:24:09 UTC 2017 - nwang@suse.com + +- bsc#1074169, Update to 9.0.10-1 +* Fix resync of two secondary nodes in the presence of + a 3rd node that is primary (maybe with disk or diskless); + Fixed the race condition that caused the resync to sometimes not terminate +* Improve connection behavior with autopromote enable one node Primary and + udev present. +* Fix in memory alignment of DRBD's struct bio. +* Improve the quorum implementation, so that is works nicely with for the + purpose of replacing fencing with quorum in a Pacemaker setup. +* Ensure compatibility with upstream Linux kernel 4.14 + ------------------------------------------------------------------- Fri Nov 17 03:03:20 UTC 2017 - nwang@suse.com diff --git a/drbd.spec b/drbd.spec index 1f01dfa..301682e 100644 --- a/drbd.spec +++ b/drbd.spec @@ -24,7 +24,7 @@ %endif Name: drbd -Version: 9.0.9+git.a4cc249e +Version: 9.0.10+git.b7994aa1 Release: 0 Summary: DRBD driver for Linux License: GPL-2.0+ @@ -36,14 +36,12 @@ Source1: preamble Source2: Module.supported Source3: drbd_git_revision Patch1: fix-resync-finished-with-syncs-have-bits-set.patch -# PATCH-FIX-UPSTREAM bmwiedemann -Patch2: reproducible.patch BuildRequires: kernel-source BuildRequires: kernel-syms -BuildRequires: module-init-tools BuildRequires: libelf-devel -Requires: drbd-utils >= 9.0.0 -Supplements: drbd-utils >= 9.0.0 +BuildRequires: module-init-tools +Requires: drbd-utils >= 9.2.0 +Supplements: drbd-utils >= 9.2.0 Obsoletes: drbd-kmp < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: i586 s390 @@ -71,7 +69,6 @@ installed kernel. %prep %setup -q -n drbd-%{version} %patch1 -p1 -%patch2 -p1 mkdir source cp -a drbd/. source/. || : diff --git a/drbd_git_revision b/drbd_git_revision index 53df532..a8aa542 100644 --- a/drbd_git_revision +++ b/drbd_git_revision @@ -1 +1 @@ -GIT-hash: a4cc249ec2d55ec2953aeb482d819e47adbbee33 +GIT-hash: b7994aa164158d944115dac2800e5c27ab2cd2c9 diff --git a/preamble b/preamble index 055ce84..d4699ba 100644 --- a/preamble +++ b/preamble @@ -1,5 +1,5 @@ Requires: kernel-%1 -Requires: drbd-utils >= 8.9.11 -Supplements: drbd-utils >= 8.9.11 +Requires: drbd-utils >= 9.2.0 +Supplements: drbd-utils >= 9.2.0 Supplements: packageand(kernel-%1:%name) Recommends: drbd diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index fced9dd..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 794951592b004e82c0160014751d9ebb654035c0 -Author: Bernhard M. Wiedemann -Date: Tue Jul 18 10:30:16 2017 +0200 - - drbd: Allow to override build date (v3) - - and to not record build user and hostname if requested - in order to allow for reproducible builds. - See https://reproducible-builds.org/ for why this is good - and https://reproducible-builds.org/specs/source-date-epoch/ - for the definition of this variable. - -diff --git a/drbd/Kbuild b/drbd/Kbuild -index 2d1b4d0..80b8099 100644 ---- a/drbd/Kbuild -+++ b/drbd/Kbuild -@@ -134,5 +134,10 @@ $(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y)) - echo >&2 "Your DRBD source tree is broken. Unpack again."; \ - exit 1; \ - fi ; \ -- echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \ -+ if [ -z "${WANT_DRBD_REPRODUCIBLE_BUILD}" ] || [ -z "${SOURCE_DATE_EPOCH}" ] ; then \ -+ buildinfo="build by $$USER@$$HOSTNAME, `date "+%F %T"`" ; \ -+ else \ -+ buildinfo="reproducible build, `date -u -d@${SOURCE_DATE_EPOCH} "+%F %T"`" ; \ -+ fi ; \ -+ echo -e "\t\t\" $$buildinfo\";\n}"; \ - mv -f $@.new $@