openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package drbd (Revision d83d84bbada795af722e7269b02d8e35)

Currently displaying revision d83d84bbada795af722e7269b02d8e35 , Show latest

--- drbd.changes.orig
+++ drbd.changes
@@ -1,4 +1,24 @@
 -------------------------------------------------------------------
+Wed Aug 19 08:50:27 UTC 2015 - nwang@suse.com
+
+- Fate#317940, merge patch set into one patch. 
+- Support zeroout/discard-devices instead of zap-devices
+- New feature flag FF_DISCARD
+- Add patch 0001-drbd-Support-zeroout-device-in-initial-sync.patch
+- Remove old patch set:
+  Patch 0000-cover-letter-fate317940.patch
+  Patch 0001-drbd-Fix-the-wrong-logic-of-moving-history.patch
+  Patch 0002-drbd-Add-options-zap_devices-to-new-current-uuid.patch
+  Patch 0003-drbd-A-function-to-zero-out-drbd-backing-device.patch
+  Patch 0004-drbd-New-packet-P_ZERO_OUT.patch
+  Patch 0005-drbd-Functions-to-notify-peer-node-to-start.patch
+  Patch 0006-drbd-Wapper-for-zeroing-out-device-by-worker.patch
+  Patch 0007-drbd-Flags-for-background-drbd-device-work.patch
+  Patch 0008-drbd-Function-to-work-with-packet-P_ZERO_OUT.patch
+  Patch 0009-drbd-Receive-zero-out-command-from-peer-node.patch
+  Patch 0010-drbd-Handle-new-current-uuid-zap-devices.patch
+
+-------------------------------------------------------------------
 Wed Jul 29 01:03:11 UTC 2015 - nwang@suse.com
 
 - BSC#939778. Add obsolete of old packages and a description for
--- drbd.spec.orig
+++ drbd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,29 +24,18 @@
 Name:           drbd
 Version:        8.4.6
 Release:        0
-#Name:           drbd-kernel
 Summary:        Distributed Replicated Block Device
 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
 Source1:        preamble
-# In kernel is: kernel/drivers/block/drbd/drbd.ko
+#In kernel is: kernel/drivers/block/drbd/drbd.ko
 Source2:        Module.supported
 
-# Patch set (0-10) for fate: https://fate.suse.com/317940
-# Already merged into linbit upstream and waiting for next release
-Patch0:         0000-cover-letter-fate317940.patch
-Patch1:         0001-drbd-Fix-the-wrong-logic-of-moving-history.patch
-Patch2:         0002-drbd-Add-options-zap_devices-to-new-current-uuid.patch
-Patch3:         0003-drbd-A-function-to-zero-out-drbd-backing-device.patch
-Patch4:         0004-drbd-New-packet-P_ZERO_OUT.patch
-Patch5:         0005-drbd-Functions-to-notify-peer-node-to-start.patch
-Patch6:         0006-drbd-Wapper-for-zeroing-out-device-by-worker.patch
-Patch7:         0007-drbd-Flags-for-background-drbd-device-work.patch
-Patch8:         0008-drbd-Function-to-work-with-packet-P_ZERO_OUT.patch
-Patch9:         0009-drbd-Receive-zero-out-command-from-peer-node.patch
-Patch10:        0010-drbd-Handle-new-current-uuid-zap-devices.patch
+#Patch for fate: https://fate.suse.com/317940
+#Whether can merge into linbit is under discussion
+Patch1:         0001-drbd-Support-zeroout-device-in-initial-sync.patch
 
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
@@ -58,11 +47,7 @@ BuildRequires:  kernel-syms-rt
 
 Requires:       drbd-utils >= 8.9.0
 Supplements:    drbd-utils >= 8.9.0
-Obsoletes:      drbd-bash-completion < %{version}
 Obsoletes:      drbd-kmp < %{version}
-Obsoletes:      drbd-pacemaker < %{version}
-Obsoletes:      drbd-udev < %{version}
-Obsoletes:      drbd-utils < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    i586 s390
 
@@ -85,15 +70,6 @@ installed kernel.
 %prep
 %setup -q -n drbd-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 rm -rf obj

Places

File project.diff of Package drbd (Revision d83d84bbada795af722e7269b02d8e35)

Places