Accepting request 37680 from Base:System
Copy from Base:System/drbd based on submit request 37680 from user dirkmueller OBS-URL: https://build.opensuse.org/request/show/37680 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=25
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
cb631d75e5
commit
267ac243e6
10
64bit-fixes.diff
Normal file
10
64bit-fixes.diff
Normal file
@ -0,0 +1,10 @@
|
||||
--- user/drbdadm_parser.c
|
||||
+++ user/drbdadm_parser.c
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
+#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <glob.h>
|
||||
#include <search.h>
|
||||
@ -1,27 +0,0 @@
|
||||
--- drbd/drbd_req.c 2009-10-07 21:29:57.964277921 +0200
|
||||
+++ drbd/drbd_req.c 2009-10-07 21:55:32.817152584 +0200
|
||||
@@ -61,7 +61,7 @@
|
||||
part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
|
||||
part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
|
||||
part_stat_unlock();
|
||||
- mdev->vdisk->part0.in_flight++;
|
||||
+ mdev->vdisk->part0.in_flight[rw]++;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -77,13 +77,13 @@
|
||||
#ifdef __disk_stat_add
|
||||
__disk_stat_add(mdev->vdisk, ticks[rw], duration);
|
||||
disk_round_stats(mdev->vdisk);
|
||||
- mdev->vdisk->in_flight--;
|
||||
+ mdev->vdisk->in_flight[rw]--;
|
||||
#else
|
||||
cpu = part_stat_lock();
|
||||
part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
|
||||
part_round_stats(cpu, &mdev->vdisk->part0);
|
||||
part_stat_unlock();
|
||||
- mdev->vdisk->part0.in_flight--;
|
||||
+ mdev->vdisk->part0.in_flight[rw]--;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c106b7df233dee2265fbf60526fccf74a3433e1641073f56664013695de600cf
|
||||
size 331346
|
||||
3
drbd-8.3.7.tar.bz2
Normal file
3
drbd-8.3.7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:234d89c74d7ab43f2003d3bab8b564b046acc6a3d351978d9716d35147820551
|
||||
size 365182
|
||||
39
drbd.changes
39
drbd.changes
@ -1,3 +1,42 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 11 14:29:39 CEST 2010 - dmueller@suse.de
|
||||
|
||||
- remove KMP subpackage, the kernel modules are part of the kernel
|
||||
and don't build out of tree anymore
|
||||
|
||||
- update to 8.3.7:
|
||||
* Lots of fixes to the new RPM packaging
|
||||
* Lots of fixes to the autoconfig stuff
|
||||
* Following the rename of CONFIG_LBD to CONFIG_LBDAF
|
||||
* Silenced an assert. Could trigger after changing write ordering (Bugz 261)
|
||||
* Fixed a race condition between detach and ongoing IO. Very hard to
|
||||
trigger, caused an OOPS in make_request/drbd_make_request. (Bugz 262)
|
||||
* Fixed a regression in the resync handshake code introduced before 8.3.3.
|
||||
That bug causes DRBD to block during the initial handshake when a partial
|
||||
resync is not possible but a full resync is necessary. Happens very rarely.
|
||||
(Bugz 260)
|
||||
* Do not drop into StandAlone mode when connection is lost during authentication
|
||||
* Corrected a null test in the authentication code, found by conccinelle,
|
||||
thanks to upstream integration. The chance to trigger that was probably 10^-9.
|
||||
* crm-fence-peer.sh is now also usable if DRBD is managed from the xen block
|
||||
helper script
|
||||
* Fixes to the init script's dependencies
|
||||
* Backported cleanups that where contributed to the in kernel DRBD
|
||||
* Allow online resizing of disconnected devices, new option to drbdsetup
|
||||
drbdsetup /dev/drbdX resize --assume-peer-has-space
|
||||
* Allow multiple after options in the syncer section for stacked setups
|
||||
* Correctly process relative paths in include statements in drbd.conf
|
||||
* New option (-t) for drbdadm to test syntax of config snippets
|
||||
* Following Linux upstream changes 2.6.32 (SHASH and in_flight issues)
|
||||
* New /etc/drbd.conf example that suggests the use of /etc/drbd.d/xxx.res
|
||||
* Fixed a regression introduced shortly before 8.3.3, which might
|
||||
case a deadlock in DRBD's disconnect code path. (Bugz 258)
|
||||
* Fixed drbdsetup X resume-io which is needed for the recovery
|
||||
from the effects of broken fence-peer scripts. (Bugz 256)
|
||||
* Do not reduce master score of a current Primary on connection loss,
|
||||
to avoid unnecessary migrations
|
||||
* Do not display the usage count dialog for /etc/inti.d/drbd status
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 8 16:54:23 CET 2010 - vuntz@opensuse.org
|
||||
|
||||
|
||||
108
drbd.spec
108
drbd.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package drbd (Version 8.3.4)
|
||||
# spec file for package drbd (Version 8.3.7)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -18,19 +18,21 @@
|
||||
|
||||
|
||||
Name: drbd
|
||||
BuildRequires: bison flex kernel-source kernel-syms module-init-tools
|
||||
BuildRequires: bison flex udev
|
||||
Summary: Distributed Replicated Block Device
|
||||
Version: 8.3.4
|
||||
Release: 2
|
||||
Version: 8.3.7
|
||||
Release: 1
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Patch1: build-fix.diff
|
||||
Patch1: init-script-fixes.diff
|
||||
Patch2: 64bit-fixes.diff
|
||||
License: GPLv2+
|
||||
Group: Productivity/Clustering/HA
|
||||
Provides: drbdsetup drbd-control
|
||||
Url: http://www.drbd.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: %insserv_prereq %fillup_prereq fileutils
|
||||
%suse_kernel_module_package kdump um
|
||||
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
|
||||
@ -39,59 +41,31 @@ raid 1. It is a building block for setting up clusters.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Philipp Reisner <philipp.reisner@linbit.com>
|
||||
Lars Ellenberg <lars.ellenberg@linbit.com>
|
||||
|
||||
%package KMP
|
||||
License: GPLv2+
|
||||
Summary: Distributed Replicated Block Device
|
||||
Group: System/Kernel
|
||||
|
||||
%description KMP
|
||||
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.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Philipp Reisner <philipp.reisner@linbit.com>
|
||||
Lars Ellenberg <lars.ellenberg@linbit.com>
|
||||
|
||||
%prep
|
||||
%setup -n %{name}-%{version}
|
||||
%patch1 -p0
|
||||
mkdir source
|
||||
cp -a drbd/. source/. || :
|
||||
cp source/Makefile-2.6 source/Makefile
|
||||
mkdir obj
|
||||
%setup
|
||||
%patch1
|
||||
%patch2
|
||||
|
||||
%build
|
||||
export RPM_BUILD_ROOT
|
||||
export CONFIG_BLK_DEV_DRBD=m
|
||||
export DIST=suselike
|
||||
mkdir -p %{buildroot}
|
||||
make clean
|
||||
make PREFIX=%{buildroot}/ OPTFLAGS="$RPM_OPT_FLAGS" tools
|
||||
export EXTRA_CFLAGS='-DVERSION=\"%version\"'
|
||||
for flavor in %flavors_to_build; do
|
||||
rm -rf obj/$flavor
|
||||
cp -r source obj/$flavor
|
||||
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \
|
||||
M=$PWD/obj/$flavor
|
||||
done
|
||||
PATH=/sbin:$PATH %configure \
|
||||
--without-km \
|
||||
--with-utils \
|
||||
--with-udev \
|
||||
--with-distro=suse \
|
||||
--with-heartbeat \
|
||||
--with-pacemaker \
|
||||
--with-xen \
|
||||
--with-bashcompletion
|
||||
|
||||
make OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
export RPM_BUILD_ROOT
|
||||
export CONFIG_BLK_DEV_DRBD=m
|
||||
export DIST=suselike
|
||||
make PREFIX=%{buildroot}/ install-tools
|
||||
cp scripts/drbd.rules $RPM_BUILD_ROOT/etc/udev/rules.d/65-drbd.rules
|
||||
# these files look like wrong installed documentation
|
||||
rm $RPM_BUILD_ROOT/etc/udev/rules.d/65-drbd.rules.disabled
|
||||
%makeinstall
|
||||
rm $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/linbit/drbd
|
||||
ln -sf ../etc/init.d/drbd $RPM_BUILD_ROOT/sbin/rcdrbd
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/drbd
|
||||
@ -108,13 +82,6 @@ ___
|
||||
%ifnarch %ix86 x86_64
|
||||
rm -rf $RPM_BUILD_ROOT/etc/xen
|
||||
%endif
|
||||
# Install kernel modules:
|
||||
export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
|
||||
export INSTALL_MOD_DIR=updates
|
||||
for flavor in %flavors_to_build; do
|
||||
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \
|
||||
M=$PWD/obj/$flavor
|
||||
done
|
||||
|
||||
%clean
|
||||
rm -rf "$RPM_BUILD_ROOT"
|
||||
@ -129,10 +96,21 @@ rm -rf "$RPM_BUILD_ROOT"
|
||||
%{insserv_cleanup}
|
||||
|
||||
%files -n drbd
|
||||
%defattr(644, root, root)
|
||||
%defattr(-, root, root)
|
||||
%config(noreplace) /etc/drbd.conf
|
||||
/etc/bash_completion.d/drbdadm
|
||||
%defattr(755, root, root)
|
||||
/etc/bash_completion.d/drbdadm.sh
|
||||
%config /etc/drbd.d/global_common.conf
|
||||
%doc %{_mandir}/man5/drbd.conf.5*
|
||||
%doc %{_mandir}/man8/drbd.8*
|
||||
%doc %{_mandir}/man8/drbdsetup.8*
|
||||
%doc %{_mandir}/man8/drbdadm.8*
|
||||
%doc %{_mandir}/man8/drbddisk.8*
|
||||
%doc %{_mandir}/man8/drbdmeta.8*
|
||||
%doc COPYING
|
||||
%doc README
|
||||
%doc ChangeLog
|
||||
%doc scripts/drbd.conf
|
||||
%dir /etc/drbd.d
|
||||
/sbin/drbdadm
|
||||
/sbin/drbdsetup
|
||||
/sbin/rcdrbd
|
||||
@ -154,15 +132,5 @@ rm -rf "$RPM_BUILD_ROOT"
|
||||
/usr/lib/drbd
|
||||
%dir /etc/ha.d
|
||||
%dir /etc/ha.d/resource.d
|
||||
%doc %{_mandir}/man5/drbd.conf.5*
|
||||
%doc %{_mandir}/man8/drbd.8*
|
||||
%doc %{_mandir}/man8/drbdsetup.8*
|
||||
%doc %{_mandir}/man8/drbdadm.8*
|
||||
%doc %{_mandir}/man8/drbddisk.8*
|
||||
%doc %{_mandir}/man8/drbdmeta.8*
|
||||
%doc COPYING
|
||||
%doc README
|
||||
%doc ChangeLog
|
||||
%doc scripts/drbd.conf
|
||||
|
||||
%changelog
|
||||
|
||||
18
init-script-fixes.diff
Normal file
18
init-script-fixes.diff
Normal file
@ -0,0 +1,18 @@
|
||||
--- scripts/drbd
|
||||
+++ scripts/drbd
|
||||
@@ -8,12 +8,11 @@
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: drbd
|
||||
-# Required-Start: $local_fs $network $syslog
|
||||
-# Required-Stop: $local_fs $network $syslog
|
||||
+# Required-Start: $remote_fs $network $syslog
|
||||
+# Required-Stop: $remote_fs $network $syslog
|
||||
# Should-Start: sshd multipathd
|
||||
# Should-Stop: sshd multipathd
|
||||
-# Default-Start:
|
||||
-# Default-Stop:
|
||||
+# Default-Start: 3 5
|
||||
# Short-Description: Control drbd resources.
|
||||
### END INIT INFO
|
||||
|
||||
Loading…
Reference in New Issue
Block a user