Hello community, here is the log from the commit of package drbd for openSUSE:Factory checked in at 2016-04-22 16:24:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd (Old) and /work/SRC/openSUSE:Factory/.drbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "drbd" Changes: -------- --- /work/SRC/openSUSE:Factory/drbd/drbd.changes 2016-03-16 10:35:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.drbd.new/drbd.changes 2016-04-22 16:24:36.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 8 14:44:21 UTC 2016 - nwang@suse.com + +- Compat with kernel 4.5 +- Add patch kernel-4.5-compat.patch + +------------------------------------------------------------------- @@ -5,0 +12,15 @@ + +------------------------------------------------------------------- +Mon Mar 7 08:42:41 UTC 2016 - nwang@suse.com + +- Update to release drbd-9.0.1 +- Depend on drbd-utils >= 8.9.6 + +------------------------------------------------------------------- +Mon Nov 30 14:31:22 UTC 2015 - nwang@suse.com + +- Update to released drbd-9.0.0 +- Remove patch 0001-Support-zeroout-device-in-initial-sync.patch +- Remove patch update-to-8.4.6-5.patch +- Remove patch rename-GFP_WAIT-to-GFP_RECLAIM.patch +- Remove patch new-bio-struct.patch Old: ---- 0001-Support-zeroout-device-in-initial-sync.patch drbd-8.4.6.tar.gz new-bio-struct.patch rename-GFP_WAIT-to-GFP_RECLAIM.patch update-to-8.4.6-5.patch New: ---- _service drbd-9.0.1+git.86e4439.tar.bz2 drbd_git_revision kernel-4.5-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd.spec ++++++ --- /var/tmp/diff_new_pack.uidvpR/_old 2016-04-22 16:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.uidvpR/_new 2016-04-22 16:24:37.000000000 +0200 @@ -21,38 +21,32 @@ %ifarch x86_64 %define buildrt 0 %endif + Name: drbd -Version: 8.4.6 +Version: 9.0.1+git.86e4439 Release: 0 -Summary: Distributed Replicated Block Device -License: GPL-2.0+ +Summary: DRBD driver for Linux +License: GPL-2.0 Group: Productivity/Clustering/HA -Url: http://www.drbd.org/ -Source: http://oss.linbit.com/drbd/8.4/%{name}-%{version}.tar.gz +Url: http://drbd.linbit.com/ +Source: %{name}-%{version}.tar.bz2 Source1: preamble #In kernel is: kernel/drivers/block/drbd/drbd.ko Source2: Module.supported - -Patch1: update-to-8.4.6-5.patch -#Patch for supporting drbd KMP after kernel4.3 -#This patch can be removed when using in-tree 4.3 -Patch2: new-bio-struct.patch -#Patch for fate: https://fate.suse.com/317940 -#Whether can merge into linbit is under discussion -Patch3: 0001-Support-zeroout-device-in-initial-sync.patch -Patch4: rename-GFP_WAIT-to-GFP_RECLAIM.patch -Patch5: drbd-buildcompare.patch - +Source3: drbd_git_revision +Patch0: kernel-4.5-compat.patch +Patch1: drbd-buildcompare.patch BuildRequires: kernel-source BuildRequires: kernel-syms BuildRequires: module-init-tools + %if 0%{?buildrt} == 1 BuildRequires: kernel-source-rt BuildRequires: kernel-syms-rt %endif -Requires: drbd-utils >= 8.9.0 -Supplements: drbd-utils >= 8.9.0 +Requires: drbd-utils >= 8.9.6 +Supplements: drbd-utils >= 8.9.6 Obsoletes: drbd-kmp < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: i586 s390 @@ -75,33 +69,34 @@ %prep %setup -q -n drbd-%{version} +%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 + +mkdir source +cp -a drbd/. source/. || : +cp $RPM_SOURCE_DIR/drbd_git_revision source/.drbd_git_revision %build rm -rf obj mkdir obj ln -s ../scripts obj/ -for flavor in %{flavors_to_build}; do - cp -r drbd obj/$flavor - cp %_sourcedir/Module.supported obj/$flavor - #make -C %{kernel_source $flavor} modules M=$PWD/obj/$flavor - make -C obj/$flavor %{_smp_mflags} all KDIR=%{kernel_source $flavor} +export CONFIG_BLK_DEV_DRBD=m +export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' + +for flavor in %flavors_to_build; do + rm -rf $flavor + cp -r source $flavor + cp %_sourcedir/Module.supported $flavor + export DRBDSRC="$PWD/obj/$flavor" + make -C %{kernel_source $flavor} modules M=$PWD/$flavor done %install export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates - -for flavor in %{flavors_to_build} ; do - make -C %{kernel_source $flavor} modules_install M=$PWD/obj/$flavor - #From upstream file: drbd-kernel.spec - #kernelrelease=$(cat %{kernel_source $flavor}/include/config/kernel.release || make -s -C %{kernel_source $flavor} kernelrelease) - #mv obj/$flavor/.kernel.config.gz obj/k-config-$kernelrelease.gz +for flavor in %{flavors_to_build}; do + make -C %{kernel_source $flavor} modules_install M=$PWD/$flavor done mkdir -p %{buildroot}/%{_sbindir} ++++++ Module.supported ++++++ --- /var/tmp/diff_new_pack.uidvpR/_old 2016-04-22 16:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.uidvpR/_new 2016-04-22 16:24:37.000000000 +0200 @@ -1 +1,2 @@ updates/drbd.ko +updates/drbd_transport_tcp.ko ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">git://git.linbit.com/drbd-9.0.git</param> <param name="scm">git</param> <param name="filename">drbd</param> <!-- To update to a new release, change "revision" to the desired git commit hash and bump "version" if necessary <param name="version">9.0.1</param> --> <param name="versionformat">9.0.1+git.%h</param> <param name="revision">86e443973082570aeb651848db89e0c7b995c306</param> </service> <service name="recompress" mode="disabled"> <param name="file">*drbd*.tar</param> <param name="compression">bz2</param> </service> <service name="set_version" mode="disabled"> <param name="basename">drbd</param> </service> </services> ++++++ drbd-buildcompare.patch ++++++ --- /var/tmp/diff_new_pack.uidvpR/_old 2016-04-22 16:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.uidvpR/_new 2016-04-22 16:24:37.000000000 +0200 @@ -1,15 +1,10 @@ ---- - drbd/Kbuild | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: drbd-8.4.6/drbd/Kbuild -=================================================================== ---- drbd-8.4.6.orig/drbd/Kbuild -+++ drbd-8.4.6/drbd/Kbuild -@@ -134,5 +134,5 @@ $(obj)/drbd_buildtag.c: $(filter-out drb +diff -Naur drbd-9.0.1+git.86e4439.orig/drbd/Kbuild drbd-9.0.1+git.86e4439/drbd/Kbuild +--- drbd-9.0.1+git.86e4439.orig/drbd/Kbuild 2016-04-13 21:42:44.957501769 +0800 ++++ drbd-9.0.1+git.86e4439/drbd/Kbuild 2016-04-13 21:43:05.622500374 +0800 +@@ -133,5 +133,5 @@ 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}"; \ + echo -e "\t\t\" build by $$USER\";\n}"; \ - mv --force $@.new $@ + mv -f $@.new $@ ++++++ drbd_git_revision ++++++ GIT-hash: 86e443973082570aeb651848db89e0c7b995c306 ++++++ kernel-4.5-compat.patch ++++++ diff -Naur drbd-9.0.1+git.86e4439.orig/drbd/drbd-kernel-compat/drbd_wrappers.h drbd-9.0.1+git.86e4439/drbd/drbd-kernel-compat/drbd_wrappers.h --- drbd-9.0.1+git.86e4439.orig/drbd/drbd-kernel-compat/drbd_wrappers.h 2016-04-08 21:56:02.872683041 +0800 +++ drbd-9.0.1+git.86e4439/drbd/drbd-kernel-compat/drbd_wrappers.h 2016-04-08 22:03:05.732665258 +0800 @@ -1529,31 +1529,6 @@ } #endif -#ifndef COMPAT_HAVE_IB_CQ_INIT_ATTR -#include <rdma/ib_verbs.h> - -struct ib_cq_init_attr { - unsigned int cqe; - int comp_vector; - u32 flags; -}; - -static inline struct ib_cq * -drbd_ib_create_cq(struct ib_device *device, - ib_comp_handler comp_handler, - void (*event_handler)(struct ib_event *, void *), - void *cq_context, - const struct ib_cq_init_attr *cq_attr) -{ - return ib_create_cq(device, comp_handler, event_handler, cq_context, - cq_attr->cqe, cq_attr->comp_vector); -} - -#define ib_create_cq(DEV, COMP_H, EVENT_H, CTX, ATTR) \ - drbd_ib_create_cq(DEV, COMP_H, EVENT_H, CTX, ATTR) -#endif - - #ifndef COMPAT_RDMA_CREATE_ID_HAS_NET_NS /* Since linux v4.4 it has a network namespace as first argument */ #define rdma_create_id(NS, H, C, P, T) rdma_create_id(H, C, P, T) ++++++ preamble ++++++ --- /var/tmp/diff_new_pack.uidvpR/_old 2016-04-22 16:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.uidvpR/_new 2016-04-22 16:24:37.000000000 +0200 @@ -1,3 +1,4 @@ -Requires: kernel-%1 +Requires: kernel-%1 +Supplements: packageand(kernel-%1:%name) Recommends: drbd Recommends: drbd-utils