pool/drbd-utils
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 318129 from network:ha-clustering:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/318129
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd-utils?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2015-07-27 07:13:52 +00:00 committed by Git OBS Bridge
commit e94fc206e5
8 changed files with 204 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drbd-utils-8.9.1.tar.bz2
View File

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

3
drbd-utils-8.9.2.tar.gz Normal file
View File

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

46
drbd-utils.changes
View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Thu Jul 23 02:28:37 UTC 2015 - nwang@suse.com
- Add Patch zap-devices-xml.patch and zap-devices.patch
for user space entrance to zap-devices of new-current-uuid.
- Patch fix-libdir-in-Makefile.patch
-------------------------------------------------------------------
Fri Apr 17 06:59:04 UTC 2015 - nwang@suse.com
- Upgrade to released v8.9.2 for Fate#317940
* change systemd unit file: basically just call the init script
* make some previously hardcoded timeouts configurable
* drbdadm: New command peer-device-options
* drbd 9: Move max_buffers to net_conf
* drbd 9: Log errors to syslog if stderr is not available
* init script: fixes for stacked resources
* fix regression corner cases in bitmap size calculation
* allow create-md to initialize peer-max-bio-size to 1M
* drbd 9: make transport selectable
* fix aggregating drbdsetup / drbdmeta exit statii
* some documentation fixes (content and build)
* added direct-connect command
* incompatible drbd-9 metadata format change. use: node_id as index for
peer_md instead of the bitmap_index
* drbdadm/meta/usage_cnt: ensure output is visible
* drbdsetup: fix arguments for all commands expecting a peer_device
* exit codes: redefine E_USAGE to 1 (not 3)
* some build changes
* init script: on start, first try to load the module
* drbdsetup events2: Improve how timestamps are assigned
* udev rules (symlinks in /dev/by-res and by-disk) got fixed
* Fixed upper limit for drbd-8.4 activity log entries
* many fixes to drbdadm adjust and proxy commands for drbd-9
* rhcs_fence: Do not invoke fence agents in parallel, rewrite in bash
* drbdsetup events2 is now also available in drbd-8.4 (backported from
drbd-9)
* reorganized the repository have common code for drbd-9, drbd-8.4
and drbd-8.3 only once
* Fix drbd.ocf for resources without volume 0
-------------------------------------------------------------------
Wed Feb 18 09:16:33 UTC 2015 - rgoldwyn@suse.com
- Upgrade to v8.9.2rc2 with _service file for latest git
-------------------------------------------------------------------
Wed Dec 17 09:16:21 UTC 2014 - lwang@suse.com

96
drbd-utils.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package drbd
# spec file for package drbd-utils
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,17 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: drbd-utils
Version: 8.9.1
Version: 8.9.2
Release: 0
Summary: Distributed Replicated Block Device
License: GPL-2.0+
Group: Productivity/Clustering/HA
Url: http://www.drbd.org/
Source: %{name}-%{version}.tar.bz2
Source: http://oss.linbit.com/drbd/%{name}-%{version}.tar.gz
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: init-script-fixes.diff
Patch2: fix-libdir-in-Makefile.patch
Patch3: zap-devices.patch
Patch4: zap-devices-xml.patch
Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version}
@ -35,21 +39,24 @@ Obsoletes: drbd-pacemaker < %{version}
Obsoletes: drbd-udev < %{version}
# drbd-utils first splict from drbd-8.4.5(only driver)
# and suse let drbd driver goes in-kernel
Provides: drbd = 8.4.5
Obsoletes: drbd < 8.4.5
# Provides: drbd = 8.4.5
# Obsoletes: drbd < 8.4.5
%ifarch %ix86 x86_64
Provides: drbd-xen = %{version}
Obsoletes: drbd-xen < %{version}
%endif
BuildRequires: gcc
BuildRequires: make
BuildRequires: glibc-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: libxslt
BuildRequires: udev
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
BuildRequires: docbook-xsl-stylesheets
BuildRequires: flex
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: libxslt
BuildRequires: make
BuildRequires: systemd
BuildRequires: udev
Provides: drbd-control
Provides: drbdsetup
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -65,67 +72,74 @@ raid 1. It is a building block for setting up clusters.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
PATH=/sbin:$PATH %configure \
--with-utils \
./autogen.sh
PATH=/sbin:$PATH ./configure \
--with-udev \
--with-distro=suse \
--without-heartbeat \
--without-legacy_utils \
--with-pacemaker \
--with-xen \
--with-bashcompletion
--with-bashcompletion \
--with-initscripttype=systemd \
--with-systemdunitdir=/usr/lib/systemd/system \
--prefix=/ \
--sbindir=/sbin \
--libdir=/usr/lib \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
--datarootdir=/usr/share \
--datadir=/usr/share \
--libdir=/usr/lib \
--exec_prefix=/usr/lib \
--with-tmpfilesdir=%{_tmpfilesdir}
make OPTFLAGS="%{optflags}" %{?_smp_mflags}
%install
%make_install
mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
#
# and I only want to install a hint to the example conf
#
cat <<___ > %{buildroot}%{_sysconfdir}/drbd.conf
#
# please have a a look at the example configuration file in
# %{_docdir}/drbd/drbd.conf
#
___
#
%ifnarch %ix86 x86_64
rm -rf %{buildroot}%{_sysconfdir}/xen
%endif
mkdir -p %{buildroot}/usr/lib/udev/rules.d
mv %{buildroot}/lib/udev/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drbd.rules
mv %{buildroot}/lib/udev/rules.d/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drbd.rules
%pre
%service_add_pre drbd.service
%post
%{fillup_and_insserv}
%service_add_post drbd.service
%preun
%{stop_on_removal}
%service_del_preun drbd.service
%postun
%{insserv_cleanup}
%service_del_postun drbd.service
%files -n drbd-utils
%defattr(-, root, root)
%config(noreplace) %{_sysconfdir}/drbd.conf
%config %{_sysconfdir}/bash_completion.d/drbdadm.sh
%config(noreplace) %{_sysconfdir}/drbd.d/global_common.conf
%{_tmpfilesdir}/drbd.conf
%doc %{_mandir}/man5/drbd.*
%doc %{_mandir}/man8/drbd*
%doc COPYING
%doc README
%doc ChangeLog
%doc scripts/drbd.conf
%doc scripts/drbd.conf.example
%dir %{_sysconfdir}/drbd.d
%{_sbindir}/drbdadm
%{_sbindir}/drbdsetup
%{_sbindir}/drbdmeta
%{_sbindir}/drbd-overview
/sbin/drbdadm
/sbin/drbdsetup
/sbin/drbdmeta
/sbin/drbd-overview
%ifarch %ix86 x86_64
%dir %attr(700,root,root) %{_sysconfdir}/xen
%dir %{_sysconfdir}/xen/scripts
@ -134,11 +148,12 @@ mv %{buildroot}/lib/udev/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drb
%{_prefix}/lib/ocf/resource.d/linbit/drbd
%dir /usr/lib/udev
%dir /usr/lib/udev/rules.d
%config /usr/lib/udev/rules.d/65-drbd.rules
%config %{_sysconfdir}/init.d/drbd
/usr/lib/udev/rules.d/65-drbd.rules
%{_unitdir}/drbd.service
/usr/lib/systemd/system/drbd.service
%defattr(-, root, root)
%{_localstatedir}/lib/drbd
%{_prefix}/lib/drbd
/usr/lib/drbd
/lib/drbd
/lib/drbd/drbdadm*
/lib/drbd/drbdsetup*
@ -146,5 +161,4 @@ mv %{buildroot}/lib/udev/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drb
%dir %{_prefix}/lib/ocf/resource.d
%dir %{_prefix}/lib/ocf/resource.d/linbit
%changelog

52
fix-libdir-in-Makefile.patch Normal file
View File

@ -0,0 +1,52 @@
Index: drbd-utils-8.9.2rc2+git.faeb645/scripts/Makefile.in
===================================================================
--- drbd-utils-8.9.2rc2+git.faeb645.orig/scripts/Makefile.in
+++ drbd-utils-8.9.2rc2+git.faeb645/scripts/Makefile.in
@@ -37,7 +37,7 @@ initscripttype = @initscripttype@
BASH_COMPLETION_SUFFIX = @BASH_COMPLETION_SUFFIX@
UDEV_RULE_SUFFIX = @UDEV_RULE_SUFFIX@
INITDIR = @INITDIR@
-LIBDIR = @prefix@/lib/@PACKAGE_TARNAME@
+LIBDIR = @libdir@/@PACKAGE_TARNAME@
LN_S = @LN_S@
# features enabled or disabled by configure
Index: drbd-utils-8.9.2rc2+git.faeb645/user/v9/Makefile.in
===================================================================
--- drbd-utils-8.9.2rc2+git.faeb645.orig/user/v9/Makefile.in
+++ drbd-utils-8.9.2rc2+git.faeb645/user/v9/Makefile.in
@@ -31,7 +31,7 @@ sysconfdir = @sysconfdir@
BASH_COMPLETION_SUFFIX = @BASH_COMPLETION_SUFFIX@
UDEV_RULE_SUFFIX = @UDEV_RULE_SUFFIX@
INITDIR = @INITDIR@
-LIBDIR = @prefix@/lib/@PACKAGE_TARNAME@
+LIBDIR = @libdir@/@PACKAGE_TARNAME@
CC = @CC@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
Index: drbd-utils-8.9.2rc2+git.faeb645/user/v83/Makefile.in
===================================================================
--- drbd-utils-8.9.2rc2+git.faeb645.orig/user/v83/Makefile.in
+++ drbd-utils-8.9.2rc2+git.faeb645/user/v83/Makefile.in
@@ -31,7 +31,7 @@ sysconfdir = @sysconfdir@
BASH_COMPLETION_SUFFIX = @BASH_COMPLETION_SUFFIX@
UDEV_RULE_SUFFIX = @UDEV_RULE_SUFFIX@
INITDIR = @INITDIR@
-LIBDIR = @prefix@/lib/@PACKAGE_TARNAME@
+LIBDIR = @libdir@/@PACKAGE_TARNAME@
CC = @CC@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
Index: drbd-utils-8.9.2rc2+git.faeb645/user/v84/Makefile.in
===================================================================
--- drbd-utils-8.9.2rc2+git.faeb645.orig/user/v84/Makefile.in
+++ drbd-utils-8.9.2rc2+git.faeb645/user/v84/Makefile.in
@@ -31,7 +31,7 @@ sysconfdir = @sysconfdir@
BASH_COMPLETION_SUFFIX = @BASH_COMPLETION_SUFFIX@
UDEV_RULE_SUFFIX = @UDEV_RULE_SUFFIX@
INITDIR = @INITDIR@
-LIBDIR = @prefix@/lib/@PACKAGE_TARNAME@
+LIBDIR = @libdir@/@PACKAGE_TARNAME@
CC = @CC@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@

10
init-script-fixes.diff
View File

@ -1,7 +1,7 @@
Index: drbd-utils-8.9.1/scripts/drbd
Index: drbd-utils-8.9.2rc2+git.faeb645/scripts/drbd
===================================================================
--- drbd-utils-8.9.1.orig/scripts/drbd
+++ drbd-utils-8.9.1/scripts/drbd
--- drbd-utils-8.9.2rc2+git.faeb645.orig/scripts/drbd
+++ drbd-utils-8.9.2rc2+git.faeb645/scripts/drbd
@@ -9,14 +9,14 @@
#
### BEGIN INIT INFO
@ -22,7 +22,7 @@ Index: drbd-utils-8.9.1/scripts/drbd
# X-Interactive: true
# Short-Description: Control drbd resources.
### END INIT INFO
@@ -170,7 +170,6 @@ case "$1" in
@@ -173,7 +173,6 @@ case "$1" in
done
done
@ -30,7 +30,7 @@ Index: drbd-utils-8.9.1/scripts/drbd
run_hook start_before-wait
$DRBDADM wait-con-int # User interruptible version of wait-connect all
run_hook start
@@ -209,7 +208,6 @@ case "$1" in
@@ -226,7 +225,6 @@ case "$1" in
fi
done
run_hook stop

19
zap-devices-xml.patch Normal file
View File

@ -0,0 +1,19 @@
diff -Naur drbd-utils-8.9.2.orig/documentation/v84/drbdsetup.xml drbd-utils-8.9.2/documentation/v84/drbdsetup.xml
--- drbd-utils-8.9.2.orig/documentation/v84/drbdsetup.xml 2015-07-20 16:06:52.950294231 +0800
+++ drbd-utils-8.9.2/documentation/v84/drbdsetup.xml 2015-07-20 17:56:21.106826315 +0800
@@ -1694,6 +1694,15 @@
<para>Clears the sync bitmap in addition to generating a new current UUID.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><option>--zap-devices</option></term>
+
+ <listitem>
+ <para>Start to zeroing out the device on both side in addition to generating
+ a new current UUID .</para>
+ </listitem>
+ </varlistentry>
</variablelist></para>
<para>This can be used to skip the initial sync, if you want to start from scratch. This

24
zap-devices.patch Normal file
View File

@ -0,0 +1,24 @@
Index: drbd-utils-8.9.2/user/v84/config_flags.c
===================================================================
--- drbd-utils-8.9.2.orig/user/v84/config_flags.c
+++ drbd-utils-8.9.2/user/v84/config_flags.c
@@ -1019,6 +1019,7 @@ struct context_def new_current_uuid_cmd_
NLA_POLICY(new_c_uuid_parms),
.fields = {
{ "clear-bitmap", FLAG(clear_bm) },
+ { "zap-devices", FLAG(zap_devices) },
{ } },
};
Index: drbd-utils-8.9.2/user/v84/linux/drbd_genl.h
===================================================================
--- drbd-utils-8.9.2.orig/user/v84/linux/drbd_genl.h
+++ drbd-utils-8.9.2/user/v84/linux/drbd_genl.h
@@ -238,6 +238,7 @@ GENL_struct(DRBD_NLA_START_OV_PARMS, 9,
GENL_struct(DRBD_NLA_NEW_C_UUID_PARMS, 10, new_c_uuid_parms,
__flg_field(1, DRBD_GENLA_F_MANDATORY, clear_bm)
+ __flg_field(2, DRBD_GENLA_F_MANDATORY, zap_devices)
)
GENL_struct(DRBD_NLA_TIMEOUT_PARMS, 11, timeout_parms,