pool/ocfs2-tools
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2008-09-13 12:38:22 +00:00 committed by Git OBS Bridge
parent 60f8b72761
commit 5a01f5ec2b
6 changed files with 119 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ocfs2-devel.diff Normal file
View File

@ -0,0 +1,32 @@
diff -upb -ur ocfs2-tools/ocfs2_controld/pacemaker.c upstream/ocfs2_controld/pacemaker.c
--- ocfs2-tools/ocfs2_controld/pacemaker.c 2008-08-21 02:49:41.000000000 +0200
+++ upstream/ocfs2_controld/pacemaker.c 2008-09-09 23:52:32.000000000 +0200
@@ -20,8 +20,16 @@
#include <unistd.h>
#include <syslog.h>
-#include <crm/crm.h>
-#include <crm/common/cluster.h>
+#include <bzlib.h>
+
+#include <pacemaker/crm_config.h>
+/* heartbeat support is irrelevant here */
+#undef SUPPORT_HEARTBEAT
+#define SUPPORT_HEARTBEAT 0
+
+#include <pacemaker/crm/crm.h>
+#include <pacemaker/crm/ais.h>
+#include <pacemaker/crm/common/cluster.h>
#include <fencing/stonithd_api.h>
#include "ocfs2-kernel/kernel-list.h"
@@ -29,9 +37,6 @@
#include "ocfs2_controld.h"
-#include <bzlib.h>
-#include <crm/crm.h>
-#include <crm/ais.h>
#include <sys/utsname.h>
int our_nodeid = 0;

29
ocfs2-init.diff Normal file
View File

@ -0,0 +1,29 @@
diff -r bfc9de4afd43 vendor/common/o2cb.init.sh
--- a/vendor/common/o2cb.init.sh Mon Aug 25 09:56:08 2008 +0000
+++ b/vendor/common/o2cb.init.sh Tue Sep 09 17:37:18 2008 +0200
@@ -8,7 +8,8 @@
# Provides: o2cb
# Required-Start: $network
# Should-Start:
-# Required-Stop:
+# Should-Stop:
+# Required-Stop: $null
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Load O2CB cluster services at system boot.
diff -r bfc9de4afd43 vendor/common/ocfs2.init
--- a/vendor/common/ocfs2.init Mon Aug 25 09:56:08 2008 +0000
+++ b/vendor/common/ocfs2.init Tue Sep 09 17:37:18 2008 +0200
@@ -8,9 +8,9 @@
### BEGIN INIT INFO
# Provides: ocfs2
# Required-Start: $network o2cb
-# Required-Stop:
-# X-UnitedLinux-Should-Start:
-# X-UnitedLinux-Should-Stop:
+# Required-Stop: $null
+# Should-Start:
+# Should-Stop:
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Mount OCFS2 volumes at boot.

3
ocfs2-tools-1.3.9.tar.bz2
View File

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

9
ocfs2-tools.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Sep 11 11:04:40 CEST 2008 - abeekhof@suse.de
- Refresh from upstream 1.4.1 (0ead2f1b45568ca441cb3ed679efbbd7eeb68d98)
- Add support for OpenAIS/Pacemaker (userspace cluster stack) integration
based on upstream OCFS2 interface
- Remove the custom Heartbeat integration
- Bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 26 20:54:05 CEST 2008 - jeffm@suse.com Tue Aug 26 20:54:05 CEST 2008 - jeffm@suse.com

83
ocfs2-tools.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package ocfs2-tools (Version 1.3.9) # spec file for package ocfs2-tools (Version 1.4.1)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,19 +19,21 @@
Name: ocfs2-tools Name: ocfs2-tools
BuildRequires: e2fsprogs-devel glib2-devel python-devel python-gtk-devel readline-devel update-desktop-files BuildRequires: e2fsprogs-devel glib2-devel heartbeat-common-devel libdlm-devel libxml2-devel libxslt-devel openais-devel pacemaker-devel >= 0.7.1 python-devel python-gtk-devel readline-devel update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools Summary: Oracle Cluster File System 2 Core Tools
Version: 1.3.9 Version: 1.4.1
Release: 58 Release: 1
License: GPL v2 or later License: GPL v2 or later
Group: System/Filesystems Group: System/Filesystems
Source: ocfs2-tools-%{version}.tar.bz2 Source: ocfs2-tools.tar.bz2
Patch0: ocfs2-tools-suse.diff Patch0: ocfs2-tools-suse.diff
Patch1: blkid.m4.diff Patch1: blkid.m4.diff
Patch2: offsetof.diff Patch2: offsetof.diff
Patch3: ocfs2-tools-o_creat-mode.diff Patch3: ocfs2-tools-o_creat-mode.diff
Patch4: ocfs2-tools-1.2.7-tunefs-path.diff Patch4: ocfs2-tools-1.2.7-tunefs-path.diff
Patch5: ocfs2-tools-static-glib.diff Patch5: ocfs2-tools-static-glib.diff
Patch99: ocfs2-devel.diff
Patch100: ocfs2-init.diff
Url: http://oss.oracle.com/projects/ocfs2-tools/ Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: coreutils, net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 Requires: coreutils, net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
@ -91,34 +93,34 @@ Authors:
%prep %prep
%setup -n %{name} %setup -n %{name}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1 %patch5 -p1
%patch99 -p1
%patch100 -p1
%build %build
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export PROJECT="ocfs2-tools" export PROJECT="ocfs2-tools"
autoreconf -fi -I /usr/share/aclocal autoreconf -fi -I /usr/share/aclocal
%configure --disable-debug --prefix=/usr --mandir=/usr/share/man \ %configure --disable-debug --prefix=/usr --mandir=%{_mandir} \
--enable-dynamic-fsck=yes --enable-dynamic-ctl=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
make OPTS="$RPM_OPT_FLAGS" make OPTS="$RPM_OPT_FLAGS"
%install %install
mkdir -p $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/sbin
cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT/etc/init.d/o2cb mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT/etc/init.d/ocfs2 cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/o2cb
ln -sf ../etc/init.d/o2cb $RPM_BUILD_ROOT/sbin/rco2cb cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ocfs2
ln -sf ../etc/init.d/ocfs2 $RPM_BUILD_ROOT/sbin/rcocfs2 ln -sf ..%{_sysconfdir}/init.d/o2cb $RPM_BUILD_ROOT/sbin/rco2cb
ln -sf ..%{_sysconfdir}/init.d/ocfs2 $RPM_BUILD_ROOT/sbin/rcocfs2
mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates
cp -f vendor/common/o2cb.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.o2cb cp -f vendor/common/o2cb.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.o2cb
make DESTDIR="$RPM_BUILD_ROOT" install make DESTDIR="$RPM_BUILD_ROOT" install
mv $RPM_BUILD_ROOT/{,/usr}/sbin/debugfs.ocfs2 mv $RPM_BUILD_ROOT/{,/usr}/sbin/debugfs.ocfs2
mv $RPM_BUILD_ROOT/{,/usr}/sbin/ocfs2cdsl mv $RPM_BUILD_ROOT/{,/usr}/sbin/o2image
mv $RPM_BUILD_ROOT/{,/usr}/sbin/ocfs2_controld.pcmk
find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')" %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')"
%clean %clean
@ -148,49 +150,56 @@ fi
/sbin/fsck.ocfs2 /sbin/fsck.ocfs2
/sbin/mkfs.ocfs2 /sbin/mkfs.ocfs2
/sbin/mounted.ocfs2 /sbin/mounted.ocfs2
/usr/sbin/tunefs.ocfs2 /sbin/tunefs.ocfs2
/sbin/tunefs.ocfs2
/sbin/o2cb_ctl /sbin/o2cb_ctl
/sbin/mount.ocfs2 /sbin/mount.ocfs2
/sbin/ocfs2_hb_ctl /sbin/ocfs2_hb_ctl
/usr/sbin/debugfs.ocfs2
/usr/sbin/ocfs2cdsl
/sbin/rco2cb /sbin/rco2cb
/sbin/rcocfs2 /sbin/rcocfs2
/etc/init.d/o2cb %{_sbindir}/o2image
/etc/init.d/ocfs2 %{_sbindir}/debugfs.ocfs2
/usr/share/man/man8/debugfs.ocfs2.8* %{_sbindir}/ocfs2_controld.pcmk
/usr/share/man/man8/fsck.ocfs2.8* %{_sysconfdir}/init.d/o2cb
/usr/share/man/man8/fsck.ocfs2.checks.8* %{_sysconfdir}/init.d/ocfs2
/usr/share/man/man8/mkfs.ocfs2.8* %{_mandir}/man8/debugfs.ocfs2.8*
/usr/share/man/man8/tunefs.ocfs2.8* %{_mandir}/man8/fsck.ocfs2.8*
/usr/share/man/man8/mounted.ocfs2.8* %{_mandir}/man8/fsck.ocfs2.checks.8*
/usr/share/man/man8/mount.ocfs2.8* %{_mandir}/man8/mkfs.ocfs2.8*
/usr/share/man/man8/o2cb_ctl.8* %{_mandir}/man8/tunefs.ocfs2.8*
/usr/share/man/man8/ocfs2_hb_ctl.8* %{_mandir}/man8/mounted.ocfs2.8*
/usr/share/man/man8/ocfs2cdsl.8* %{_mandir}/man8/mount.ocfs2.8*
%{_mandir}/man8/o2cb_ctl.8*
%{_mandir}/man8/ocfs2_hb_ctl.8*
%{_mandir}/man7/o2cb.7.gz
%{_mandir}/man8/o2image.8.gz
/var/adm/fillup-templates/sysconfig.o2cb /var/adm/fillup-templates/sysconfig.o2cb
%doc README.O2CB COPYING CREDITS MAINTAINERS %doc README.O2CB COPYING CREDITS MAINTAINERS
%doc documentation/users_guide.txt %doc documentation/users_guide.txt
%files -n ocfs2console %files -n ocfs2console
%defattr(-,root,root) %defattr(-,root,root)
%{_sbindir}/ocfs2console
%{py_sitedir}/ocfs2interface %{py_sitedir}/ocfs2interface
/usr/sbin/ocfs2console %{_mandir}/man8/ocfs2console.8*
/usr/share/man/man8/ocfs2console.8*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/o2cb %{_includedir}/o2cb
%{_includedir}/o2dlm %{_includedir}/o2dlm
%{_includedir}/ocfs2 %{_includedir}/ocfs2
%{_libdir}/libo2cb.a %{_includedir}/ocfs2-kernel
%{_libdir}/libo2dlm.a
%{_libdir}/libocfs2.a
%{_libdir}/pkgconfig/o2cb.pc %{_libdir}/pkgconfig/o2cb.pc
%{_libdir}/pkgconfig/o2dlm.pc %{_libdir}/pkgconfig/o2dlm.pc
%{_libdir}/pkgconfig/ocfs2.pc %{_libdir}/pkgconfig/ocfs2.pc
%changelog %changelog
* Thu Sep 11 2008 abeekhof@suse.de
- Refresh from upstream 1.4.1 (0ead2f1b45568ca441cb3ed679efbbd7eeb68d98)
- Add support for OpenAIS/Pacemaker (userspace cluster stack) integration
based on upstream OCFS2 interface
- Remove the custom Heartbeat integration
- Bugfixes
* Tue Aug 26 2008 jeffm@suse.com * Tue Aug 26 2008 jeffm@suse.com
- Made init scripts LSB compliant. - Made init scripts LSB compliant.
* Fri Feb 22 2008 jeffm@suse.com * Fri Feb 22 2008 jeffm@suse.com

3
ocfs2-tools.tar.bz2 Normal file
View File

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