commit drbd for openSUSE:Factory
Hello community, here is the log from the commit of package drbd for openSUSE:Factory checked in at Thu Oct 8 18:11:29 CEST 2009. -------- --- drbd/drbd.changes 2009-07-19 21:51:52.000000000 +0200 +++ drbd/drbd.changes 2009-10-07 22:03:58.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Oct 7 19:16:37 UTC 2009 - aj@suse.de + +- update to 8.3.4: + * Support kernel 2.6.31 + * Numerous bug fixes + * Support for Infiniband via SDP (sockets direct protocol) +- Add build fix from upstream. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- drbd-8.3.2.tar.bz2 New: ---- build-fix.diff drbd-8.3.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd.spec ++++++ --- /var/tmp/diff_new_pack.XrnUbn/_old 2009-10-08 18:11:14.000000000 +0200 +++ /var/tmp/diff_new_pack.XrnUbn/_new 2009-10-08 18:11:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package drbd (Version 8.3.2) +# spec file for package drbd (Version 8.3.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,9 +20,10 @@ Name: drbd BuildRequires: bison flex glib-devel kernel-source kernel-syms module-init-tools Summary: Distributed Replicated Block Device -Version: 8.3.2 -Release: 2 +Version: 8.3.4 +Release: 1 Source: %{name}-%{version}.tar.bz2 +Patch1: build-fix.diff License: GPL v2 or later Group: Productivity/Clustering/HA Provides: drbdsetup drbd-control @@ -62,6 +63,7 @@ %prep %setup -n %{name}-%{version} +%patch1 -p0 mkdir source cp -a drbd/. source/. || : cp source/Makefile-2.6 source/Makefile @@ -87,8 +89,6 @@ export CONFIG_BLK_DEV_DRBD=m export DIST=suselike make PREFIX=%{buildroot}/ install-tools -mkdir $RPM_BUILD_ROOT/etc/bash_completion.d -cp scripts/drbdadm.bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/drbdadm.sh 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 @@ -131,7 +131,7 @@ %files -n drbd %defattr(644, root, root) %config(noreplace) /etc/drbd.conf -/etc/bash_completion.d/drbdadm.sh +/etc/bash_completion.d/drbdadm %defattr(755, root, root) /sbin/drbdadm /sbin/drbdsetup ++++++ build-fix.diff ++++++ --- 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 } ++++++ drbd-8.3.2.tar.bz2 -> drbd-8.3.4.tar.bz2 ++++++ ++++ 19847 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de