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

Accepting request 287043 from home:goldwynr:branches:network:ha-clustering:Factory

Browse Source 
Upgrage to 8.9.2rc2 for v9 support

OBS-URL: https://build.opensuse.org/request/show/287043
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=7
This commit is contained in:
Goldwyn Rodrigues 2015-02-20 18:23:31 +00:00 committed by Git OBS Bridge
parent 57c15633e9
commit d84e43448d
11 changed files with 302 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
_service Normal file
View File

@ -0,0 +1,18 @@
<services>
<service name="tar_scm">
<param name="url">git://git.linbit.com/drbd-utils.git</param>
<param name="scm">git</param>
<param name="filename">drbd-utils</param>
<param name="versionformat">8.9.2-rc2+git.%h</param>
<param name="revision">master</param>
</service>
<service name="recompress">
<param name="file">*drbd-utils*.tar</param>
<param name="compression">bz2</param>
</service>
<service name="set_version">
<param name="basename">drbd-utils</param>
</service>
</services>

3
_service:recompress:tar_scm:drbd-utils-8.9.2rc2+git.faeb645.tar.bz2 Normal file
View File

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

160
_service:set_version:drbd-utils.spec Normal file
View File

@ -0,0 +1,160 @@
#
# spec file for package drbd
#
# Copyright (c) 2014 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: drbd-utils
Version: 8.9.2rc2+git.faeb645
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
Source1: drbd_buildtag.c
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: init-script-fixes.diff
Patch2: fix-libdir-in-Makefile.patch
Patch3: disable-sh-b-pri.patch
Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version}
Provides: drbd-udev = %{version}
Obsoletes: drbd-bash-completion < %{version}
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
%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: docbook-xsl-stylesheets
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: systemd
Provides: drbd-control
Provides: drbdsetup
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): %insserv_prereq %fillup_prereq
Requires(preun): %insserv_prereq %fillup_prereq
Requires(postun): %insserv_prereq fileutils
%description
Drbd is a distributed replicated block device. It mirrors a block
device over the network to another machine. Think of it as networked
raid 1. It is a building block for setting up clusters.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
cp $RPM_SOURCE_DIR/drbd_buildtag.c user/shared/
%build
./autogen.sh
PATH=/sbin:$PATH ./configure \
--with-udev \
--with-distro=suse \
--without-heartbeat \
--with-pacemaker \
--with-xen \
--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
make OPTFLAGS="%{optflags}" %{?_smp_mflags}
%install
%make_install
mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
%ifnarch %ix86 x86_64
rm -rf %{buildroot}%{_sysconfdir}/xen
%endif
mkdir -p %{buildroot}/usr/lib/udev/rules.d
mv %{buildroot}/lib/udev/rules.d/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drbd.rules
%post
%service_add_post drbd.service
%preun
%service_del_preun drbd.service
%postun
%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
%doc %{_mandir}/man5/drbd.*
%doc %{_mandir}/man8/drbd*
%doc COPYING
%doc README
%doc ChangeLog
%doc scripts/drbd.conf
%dir %{_sysconfdir}/drbd.d
/sbin/drbdadm
/sbin/drbdsetup
/sbin/drbdmeta
/sbin/drbd-overview
%ifarch %ix86 x86_64
%dir %attr(700,root,root) %{_sysconfdir}/xen
%dir %{_sysconfdir}/xen/scripts
%{_sysconfdir}/xen/scripts/block-drbd
%endif
%{_prefix}/lib/ocf/resource.d/linbit/drbd
%dir /usr/lib/udev
%dir /usr/lib/udev/rules.d
/usr/lib/udev/rules.d/65-drbd.rules
%{_unitdir}/drbd.service
/usr/lib/systemd/system/drbd.service
%defattr(-, root, root)
%{_localstatedir}/lib/drbd
/usr/lib/drbd
/lib/drbd
/lib/drbd/drbdadm*
/lib/drbd/drbdsetup*
%dir %{_prefix}/lib/ocf
%dir %{_prefix}/lib/ocf/resource.d
%dir %{_prefix}/lib/ocf/resource.d/linbit
%changelog

13
disable-sh-b-pri.patch Normal file
View File

@ -0,0 +1,13 @@
Index: drbd-utils-8.9.2rc2+git.faeb645/scripts/drbd.service
===================================================================
--- drbd-utils-8.9.2rc2+git.faeb645.orig/scripts/drbd.service
+++ drbd-utils-8.9.2rc2+git.faeb645/scripts/drbd.service
@@ -21,7 +21,7 @@ ExecStart=/sbin/drbdadm wait-connect all
# Switch resources to primary if applicable
# Better: disable this service unit, and use a cluster manger (pacemaker)
-ExecStart=/sbin/drbdadm sh-b-pri all
+# ExecStart=/sbin/drbdadm sh-b-pri all
# Deactivate all resources on stop
ExecStop=/sbin/drbdadm down all

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.2rc2+git.faeb645.tar.bz2 Normal file
View File

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

5
drbd-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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 Wed Dec 17 09:16:21 UTC 2014 - lwang@suse.com

62
drbd-utils.spec
View File

@ -16,16 +16,19 @@
# #
Name: drbd-utils Name: drbd-utils
Version: 8.9.1 Version: 8.9.2rc2+git.faeb645
Release: 0 Release: 0
Summary: Distributed Replicated Block Device Summary: Distributed Replicated Block Device
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Url: http://www.drbd.org/ Url: http://www.drbd.org/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: drbd_buildtag.c
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: init-script-fixes.diff Patch1: init-script-fixes.diff
Patch2: fix-libdir-in-Makefile.patch
Patch3: disable-sh-b-pri.patch
Provides: drbd-bash-completion = %{version} Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version} Provides: drbd-pacemaker = %{version}
@ -50,6 +53,9 @@ BuildRequires: flex
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: udev BuildRequires: udev
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: systemd
Provides: drbd-control Provides: drbd-control
Provides: drbdsetup Provides: drbdsetup
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -65,17 +71,30 @@ raid 1. It is a building block for setting up clusters.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
cp $RPM_SOURCE_DIR/drbd_buildtag.c user/shared/
%build %build
PATH=/sbin:$PATH %configure \ ./autogen.sh
--with-utils \ PATH=/sbin:$PATH ./configure \
--with-udev \ --with-udev \
--with-distro=suse \ --with-distro=suse \
--without-heartbeat \ --without-heartbeat \
--without-legacy_utils \
--with-pacemaker \ --with-pacemaker \
--with-xen \ --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
make OPTFLAGS="%{optflags}" %{?_smp_mflags} make OPTFLAGS="%{optflags}" %{?_smp_mflags}
@ -84,31 +103,21 @@ make OPTFLAGS="%{optflags}" %{?_smp_mflags}
%make_install %make_install
mkdir -p %{buildroot}%{_localstatedir}/lib/drbd 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 %ifnarch %ix86 x86_64
rm -rf %{buildroot}%{_sysconfdir}/xen rm -rf %{buildroot}%{_sysconfdir}/xen
%endif %endif
mkdir -p %{buildroot}/usr/lib/udev/rules.d 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
%post %post
%{fillup_and_insserv} %service_add_post drbd.service
%preun %preun
%{stop_on_removal} %service_del_preun drbd.service
%postun %postun
%{insserv_cleanup} %service_del_postun drbd.service
%files -n drbd-utils %files -n drbd-utils
%defattr(-, root, root) %defattr(-, root, root)
@ -122,10 +131,10 @@ mv %{buildroot}/lib/udev/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drb
%doc ChangeLog %doc ChangeLog
%doc scripts/drbd.conf %doc scripts/drbd.conf
%dir %{_sysconfdir}/drbd.d %dir %{_sysconfdir}/drbd.d
%{_sbindir}/drbdadm /sbin/drbdadm
%{_sbindir}/drbdsetup /sbin/drbdsetup
%{_sbindir}/drbdmeta /sbin/drbdmeta
%{_sbindir}/drbd-overview /sbin/drbd-overview
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%dir %attr(700,root,root) %{_sysconfdir}/xen %dir %attr(700,root,root) %{_sysconfdir}/xen
%dir %{_sysconfdir}/xen/scripts %dir %{_sysconfdir}/xen/scripts
@ -134,11 +143,12 @@ mv %{buildroot}/lib/udev/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drb
%{_prefix}/lib/ocf/resource.d/linbit/drbd %{_prefix}/lib/ocf/resource.d/linbit/drbd
%dir /usr/lib/udev %dir /usr/lib/udev
%dir /usr/lib/udev/rules.d %dir /usr/lib/udev/rules.d
%config /usr/lib/udev/rules.d/65-drbd.rules /usr/lib/udev/rules.d/65-drbd.rules
%config %{_sysconfdir}/init.d/drbd %{_unitdir}/drbd.service
/usr/lib/systemd/system/drbd.service
%defattr(-, root, root) %defattr(-, root, root)
%{_localstatedir}/lib/drbd %{_localstatedir}/lib/drbd
%{_prefix}/lib/drbd /usr/lib/drbd
/lib/drbd /lib/drbd
/lib/drbd/drbdadm* /lib/drbd/drbdadm*
/lib/drbd/drbdsetup* /lib/drbd/drbdsetup*

7
drbd_buildtag.c Normal file
View File

@ -0,0 +1,7 @@
/* automatically generated. DO NOT EDIT. */
#include <linux/drbd.h>
const char *drbd_buildtag(void)
{
return "GIT-hash: faeb645ecbf334347e0512b4fa2d7549543b5b50"
" build by goldwyn@shrek.lan, 2015-02-18 01:51:25";
}

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