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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=5

Browse Source
This commit is contained in:
OBS User unknown 2007-09-17 15:10:20 +00:00 committed by Git OBS Bridge
parent 8b947bef08
commit 44c2da2968
8 changed files with 56 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drbd-0.7.23.tar.gz
View File

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

3
drbd-8.0.6.tar.gz Normal file
View File

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

23
drbd-Makefile.module
View File

@ -1,23 +0,0 @@
#
# SUSE specific makefile for the km_drbd
#
EXTRA_CFLAGS += -I$(src)
CFLAGS_drbd_sizeof_sanity_check.o = -Wpadded
obj-m := drbd.o
drbd-objs := drbd_sizeof_sanity_check.o \
drbd_buildtag.o drbd_bitmap.o drbd_fs.o drbd_proc.o \
drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o \
lru_cache.o drbd_main.o
# Set to something different to install somewhere else:
# MOD_DIR := extra
.PHONY: modules install clean modules_add
install : modules_add
modules modules_add clean:
$(MAKE) -C $(KERNEL_SOURCE) $@ SUBDIRS=$(CURDIR)

12
drbd-kver.patch
View File

@ -1,12 +0,0 @@
Index: drbd/linux/drbd_config.h
===================================================================
--- drbd/linux/drbd_config.h (revision 2574)
+++ drbd/linux/drbd_config.h (working copy)
@@ -69,6 +69,6 @@
// but more recent kernels define it in arch/um/include/mem.h
#define HAVE_UML_TO_VIRT
-//#define NO_MORE_DEV_FS
+#define NO_MORE_DEV_FS
#endif

7
drbd-modprobe.d
View File

@ -1,7 +0,0 @@
# If you wish to use drbd on the old major number 43 (/dev/nbX) instead
# of the new default major number 147 (/dev/drbdX), enable this.
#
# Then, reload the module.
#
# options drbd use_nbd_major=1

49
drbd-optflags.patch
View File

@ -1,8 +1,12 @@
Index: drbd-0.7.13/benchmark/Makefile
===================================================================
--- drbd-0.7.13.orig/benchmark/Makefile 2004-10-08 11:22:47.000000000 +0200
+++ drbd-0.7.13/benchmark/Makefile 2005-09-01 12:25:11.248962784 +0200
@@ -1,4 +1,6 @@
---
benchmark/Makefile | 4 +++-
testing/Makefile | 2 +-
user/Makefile | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
--- drbd-8.0.6.orig/benchmark/Makefile 2007-05-22 14:57:52.000000000 +0200
+++ drbd-8.0.6/benchmark/Makefile 2007-09-17 14:20:13.584966000 +0200
@@ -1,6 +1,8 @@
-CFLAGS=-Wall
+CFLAGS=-Wall $(OPTFLAGS)
+
@ -10,29 +14,32 @@ Index: drbd-0.7.13/benchmark/Makefile
all: dm
Index: drbd-0.7.13/testing/Makefile
===================================================================
--- drbd-0.7.13.orig/testing/Makefile 2004-11-02 11:09:09.000000000 +0100
+++ drbd-0.7.13/testing/Makefile 2005-09-01 12:25:11.249962638 +0200
@@ -1,5 +1,6 @@
PROGRAMS=show_size access_and_verify ioctl_structs_sizes
install:
--- drbd-8.0.6.orig/testing/Makefile 2007-05-22 14:58:01.000000000 +0200
+++ drbd-8.0.6/testing/Makefile 2007-09-17 14:20:37.310216000 +0200
@@ -1,7 +1,7 @@
PROGRAMS=show_size access_and_verify #drbd_states
-CFLAGS=-Wall -I../drbd
+OPTFLAGS=-O2
+CFLAGS=-Wall $(OPTFLAGS) -I../drbd
all: $(PROGRAMS)
Index: drbd-0.7.13/user/Makefile
===================================================================
--- drbd-0.7.13.orig/user/Makefile 2004-11-02 11:09:09.000000000 +0100
+++ drbd-0.7.13/user/Makefile 2005-09-01 12:25:46.980727993 +0200
@@ -17,7 +17,8 @@
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
clean:
rm -f $(PROGRAMS)
--- drbd-8.0.6.orig/user/Makefile 2007-08-02 21:09:28.000000000 +0200
+++ drbd-8.0.6/user/Makefile 2007-09-17 14:23:06.198178000 +0200
@@ -18,11 +18,12 @@
#
-CFLAGS = -c -Wall -I../drbd
+OPTFLAGS = -O2
+CFLAGS = $(OPTFLAGS) -c -Wall -I../drbd
KDIR := /lib/modules/$(shell uname -r)/build
CC = gcc
-CFLAGS = -g -O2 -c -W -Wall -I../drbd
+OPTFLAGS = -O2
+CFLAGS = -g $(OPTFLAGS) -c -W -Wall -I../drbd
# for the netlink connector stuff <linux/connector.h>:
drbdsetup: CFLAGS += -I$(KDIR)/include
drbdsetup drbdmeta: CFLAGS += -fno-strict-aliasing
drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \

5
drbd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 17 14:41:31 CEST 2007 - lmb@suse.de
- Update to drbd 8.0.6 for kernel-compatibility (310187)
-------------------------------------------------------------------
Wed Apr 4 22:13:20 CEST 2007 - lrupp@suse.de

42
drbd.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package drbd (Version 0.7.23)
# spec file for package drbd (Version 8.0.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -12,18 +12,14 @@
Name: drbd
BuildRequires: bison flex glib-devel kernel-source kernel-syms module-init-tools
Summary: Distributed Replicated Block Device
Version: 0.7.23
Release: 13
Version: 8.0.6
Release: 1
Source: %{name}-%{version}.tar.gz
# Source: drbd-SVN.tar.bz2
Source1: drbd-Makefile.module
Source2: drbd-modprobe.d
Patch0: drbd-optflags.patch
Patch1: drbd-kver.patch
License: GNU General Public License (GPL)
License: GPL v2 or later
Group: Productivity/Clustering/HA
Provides: drbdsetup drbd-control
URL: http://www.drbd.org/
Url: http://www.drbd.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq fileutils
%suse_kernel_module_package kdump um
@ -59,10 +55,9 @@ Authors:
%prep
%setup -n drbd-%{version}
%patch0 -p1
%patch1 -p0
mkdir source
cp -a drbd/. source/. || :
cp %{SOURCE1} source/Makefile
cp source/Makefile-2.6 source/Makefile
mkdir obj
%build
@ -84,7 +79,6 @@ export RPM_BUILD_ROOT
export DIST=suselike
make PREFIX=%{buildroot}/ install-tools
ln -sf ../etc/init.d/drbd $RPM_BUILD_ROOT/sbin/rcdrbd
ln -sf drbddisk $RPM_BUILD_ROOT/etc/ha.d/resource.d/datadisk
mkdir -p $RPM_BUILD_ROOT/var/lib/drbd
#
# and I only want to install a hint to the example conf
@ -95,8 +89,6 @@ cat <<___ > $RPM_BUILD_ROOT/etc/drbd.conf
# %{_docdir}/drbd/drbd.conf
#
___
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d/
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/drbd
# Install kernel modules:
export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
export INSTALL_MOD_DIR=updates
@ -115,31 +107,37 @@ done
%{insserv_cleanup}
%files -n drbd
%defattr(-, root, root)
%config /etc/drbd.conf
%defattr(644, root, root)
%config(noreplace) /etc/drbd.conf
%defattr(755, root, root)
/sbin/drbdadm
/sbin/drbdsetup
/sbin/rcdrbd
/var/lib/drbd
/sbin/drbdmeta
/etc/xen/scripts/block-drbd
/etc/ha.d/resource.d/drbddisk
%config /etc/init.d/drbd
%dir /etc/modprobe.d
%config /etc/modprobe.d/drbd
%defattr(-, root, root)
/var/lib/drbd
/usr/lib/drbd
%dir /etc/ha.d
%dir /etc/ha.d/resource.d
/etc/ha.d/resource.d/drbddisk
/etc/ha.d/resource.d/datadisk
%dir /etc/xen
%dir /etc/xen/scripts
%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 upgrade_*.txt
%doc scripts/drbd.conf
%changelog
* Mon Sep 17 2007 - lmb@suse.de
- Update to drbd 8.0.6 for kernel-compatibility (310187)
* Wed Apr 04 2007 - lrupp@suse.de
- added module-init-tools to BuildRequires
* Fri Mar 30 2007 - rguenther@suse.de