ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

Accepting request 162089 from home:saschpe:branches:network:ha-clustering:Factory

Browse Source 
- Add _service file to automatically pull from git. It can be invoked
  locally by "osc service disabledrun"
- Use spec-cleaner
- No need to call ldconfig without shared objects
- Drop unneeded %clean section
- No need to export CFLAGS, %configure does that.
- Also provide ocfs2-support to have clean upgrade path
- Drop patches (merged upstream):
  + fix-pacemaker-libs.patch
  + support-for-xvd-devices.patch

OBS-URL: https://build.opensuse.org/request/show/162089
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=49
This commit is contained in:
Goldwyn Rodrigues 2013-04-03 17:16:10 +00:00 committed by Git OBS Bridge
parent 43faa20b89
commit 7dbe91ec8d
7 changed files with 97 additions and 116 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" mode="disabled">
<param name="url">git://oss.oracle.com/git/ocfs2-tools.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">1.8.2+git.%ct.%h</param>
<param name="revision">master</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">ocfs2*.tar</param>
<param name="compression">gz</param>
</service>
<service name="set_version" mode="disabled">
<param name="basename">ocfs2</param>
</service>
</services>

13
fix-pacemaker-libs.patch
View File

@ -1,13 +0,0 @@
Index: ocfs2-tools/ocfs2_controld/Makefile
===================================================================
--- ocfs2-tools.orig/ocfs2_controld/Makefile 2013-03-21 14:23:20.052598134 -0500
+++ ocfs2-tools/ocfs2_controld/Makefile 2013-03-21 14:37:56.089354059 -0500
@@ -67,7 +67,7 @@ DIST_FILES = \
ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS)
$(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \
$(OPENAIS_LIBS) $(COROSYNC_LIBS) \
- $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd
+ $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd -lcrmcommon
ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS)
$(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \

3
ocfs2-tools-1.8.2+git.1361836695.ff84eb5.tar.gz Normal file
View File

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

14
ocfs2-tools.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Apr 2 09:47:35 UTC 2013 - speilicke@suse.com
- Add _service file to automatically pull from git. It can be invoked
locally by "osc service disabledrun"
- Use spec-cleaner
- No need to call ldconfig without shared objects
- Drop unneeded %clean section
- No need to export CFLAGS, %configure does that.
- Also provide ocfs2-support to have clean upgrade path
- Drop patches (merged upstream):
+ fix-pacemaker-libs.patch
+ support-for-xvd-devices.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 21 15:00:46 CDT 2013 - rgoldwyn@suse.com Thu Mar 21 15:00:46 CDT 2013 - rgoldwyn@suse.com

136
ocfs2-tools.spec
View File

@ -17,28 +17,13 @@
Name: ocfs2-tools Name: ocfs2-tools
BuildRequires: autoconf Version: 1.8.2+git.1361836695.ff84eb5
BuildRequires: e2fsprogs-devel Release: 0
BuildRequires: glib2-devel
BuildRequires: libaio-devel
BuildRequires: libbz2-devel
BuildRequires: libcorosync-devel
BuildRequires: libdlm-devel
BuildRequires: libopenais-devel
BuildRequires: libpacemaker-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: libz1
BuildRequires: python-devel
BuildRequires: python-gtk-devel
BuildRequires: readline-devel
BuildRequires: update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools Summary: Oracle Cluster File System 2 Core Tools
License: GPL-2.0+ License: GPL-2.0+
Group: System/Filesystems Group: System/Filesystems
Version: 1.8.2 Url: http://oss.oracle.com/projects/ocfs2-tools/
Release: 0 Source: ocfs2-tools-%{version}.tar.gz
Source: ocfs2-tools.tar.bz2
Source1: o2cb.ocf Source1: o2cb.ocf
Source2: reflink.tar.bz2 Source2: reflink.tar.bz2
Patch101: force-debug.patch Patch101: force-debug.patch
@ -56,18 +41,32 @@ Patch206: ocfs2-tools-resource.patch
Patch207: fix-indexed-dirs.patch Patch207: fix-indexed-dirs.patch
Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch
Patch209: 0002-Break-a-chain-loop-in-group-desc.patch Patch209: 0002-Break-a-chain-loop-in-group-desc.patch
Patch210: fix-pacemaker-libs.patch BuildRequires: autoconf
Patch211: support-for-xvd-devices.patch BuildRequires: e2fsprogs-devel
Url: http://oss.oracle.com/projects/ocfs2-tools/ BuildRequires: libaio-devel
BuildRequires: libbz2-devel
BuildRequires: libcorosync-devel
BuildRequires: libdlm-devel
BuildRequires: libopenais-devel
BuildRequires: libpacemaker-devel
BuildRequires: libxslt-devel
BuildRequires: libz1
BuildRequires: python-devel
BuildRequires: python-gtk-devel
BuildRequires: readline-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libxml-2.0)
Requires(pre): %fillup_prereq
Requires(pre): %insserv_prereq
Requires: /sbin/chkconfig Requires: /sbin/chkconfig
Requires: e2fsprogs Requires: e2fsprogs
Requires: glib2 >= 2.2.3 Requires: glib2 >= 2.2.3
Requires: modutils Requires: modutils
Requires: net-tools Requires: net-tools
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: openais Requires: openais
%if %suse_version < 1120 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} < 1120
# There's no separate kmp for openSUSE 11.2 # There's no separate kmp for openSUSE 11.2
Recommends: ocfs2-kmp Recommends: ocfs2-kmp
%endif %endif
@ -81,14 +80,14 @@ managing the file system.
%package -n ocfs2console %package -n ocfs2console
Summary: Oracle Cluster Filesystem 2 GUI tools Summary: Oracle Cluster Filesystem 2 GUI tools
Group: System/Filesystems Group: System/Filesystems
Obsoletes: ocfs2-support
Requires: ocfs2-tools = %{version}
AutoReqProv: No
Requires: e2fsprogs Requires: e2fsprogs
Requires: glib2 >= 2.2.3 Requires: glib2 >= 2.2.3
Requires: ocfs2-tools = %{version} Requires: ocfs2-tools = %{version}
Requires: ocfs2-tools = %{version}
Requires: python-gtk >= 1.99.16 Requires: python-gtk >= 1.99.16
Requires: vte >= 0.11.10 Requires: vte >= 0.11.10
Provides: ocfs2-support = %{version}
Obsoletes: ocfs2-support < %{version}
%description -n ocfs2console %description -n ocfs2console
OCFS is the Oracle Cluster Filesystem. OCFS is the Oracle Cluster Filesystem.
@ -120,7 +119,7 @@ This package contains the core user-space tools needed for creating and
managing the file system. managing the file system.
%prep %prep
%setup -q -n %{name} -a 2 %setup -q -a 2
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
@ -136,70 +135,59 @@ managing the file system.
%patch207 -p1 %patch207 -p1
%patch208 -p1 %patch208 -p1
%patch209 -p1 %patch209 -p1
%patch210 -p1
%patch211 -p1
%build %build
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=%{_mandir} --enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes %configure --disable-debug --enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
make OPTS="$RPM_OPT_FLAGS" make OPTS="%{optflags}"
cd reflink cd reflink
%configure --prefix=/usr --mandir=%{_mandir} %configure
make reflink make reflink
cd .. cd ..
%install %install
mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p %{buildroot}/sbin
mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p %{buildroot}%{_prefix}/bin
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d mkdir -p %{buildroot}%{_sysconfdir}/init.d
mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
mkdir -p $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2 mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/o2cb cp -f vendor/common/o2cb.init %{buildroot}%{_sysconfdir}/init.d/o2cb
cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ocfs2 cp -f vendor/common/ocfs2.init %{buildroot}%{_sysconfdir}/init.d/ocfs2
cp -f vendor/common/51-ocfs2.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_sysconfdir}/udev/rules.d
cp -f $RPM_SOURCE_DIR/o2cb.ocf $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb cp -f $RPM_SOURCE_DIR/o2cb.ocf %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
chmod a+x $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
cp -f vendor/common/o2cb.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.o2cb cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
ln -sf ..%{_sysconfdir}/init.d/o2cb $RPM_BUILD_ROOT/sbin/rco2cb ln -sf ..%{_sysconfdir}/init.d/o2cb %{buildroot}/sbin/rco2cb
ln -sf ..%{_sysconfdir}/init.d/ocfs2 $RPM_BUILD_ROOT/sbin/rcocfs2 ln -sf ..%{_sysconfdir}/init.d/ocfs2 %{buildroot}/sbin/rcocfs2
make DESTDIR="$RPM_BUILD_ROOT" install make DESTDIR="%{buildroot}" install
cd reflink cd reflink
make DESTDIR="$RPM_BUILD_ROOT" install make DESTDIR="%{buildroot}" install
cd .. cd ..
mv $RPM_BUILD_ROOT/{,/usr}/sbin/o2image mv %{buildroot}/{,/usr}/sbin/o2image
mv $RPM_BUILD_ROOT/{,/usr}/sbin/debugfs.ocfs2 mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
mv $RPM_BUILD_ROOT/{,/usr}/sbin/ocfs2_controld.pcmk mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f find %{buildroot} -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('%{buildroot}/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')"
%clean
if
[ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]
then
rm -rf $RPM_BUILD_ROOT
fi
%post -p /sbin/ldconfig
%preun o2cb %preun o2cb
%stop_on_removal ocfs2 %stop_on_removal ocfs2
%stop_on_removal o2cb %stop_on_removal o2cb
%postun o2cb %postun o2cb
/sbin/ldconfig
%{insserv_cleanup} %{insserv_cleanup}
%restart_on_update ocfs2 %restart_on_update ocfs2
%restart_on_update o2cb %restart_on_update o2cb
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING CREDITS MAINTAINERS
%doc documentation/users_guide.txt
%dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev
%dir %{_sysconfdir}/udev/rules.d %dir %{_sysconfdir}/udev/rules.d
/sbin/fsck.ocfs2 /sbin/fsck.ocfs2
@ -231,12 +219,10 @@ fi
%{_mandir}/man5/ocfs2.cluster.conf.5.gz %{_mandir}/man5/ocfs2.cluster.conf.5.gz
%{_mandir}/man7/ocfs2.7.gz %{_mandir}/man7/ocfs2.7.gz
%{_mandir}/man1/o2info.1.gz %{_mandir}/man1/o2info.1.gz
%doc COPYING CREDITS MAINTAINERS %dir %{_prefix}/lib/ocf
%doc documentation/users_guide.txt %dir %{_prefix}/lib/ocf/resource.d
%dir /usr/lib/ocf %dir %{_prefix}/lib/ocf/resource.d/ocfs2
%dir /usr/lib/ocf/resource.d %{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
%dir /usr/lib/ocf/resource.d/ocfs2
/usr/lib/ocf/resource.d/ocfs2/o2cb
%files -n ocfs2console %files -n ocfs2console
%defattr(-,root,root) %defattr(-,root,root)
@ -246,6 +232,7 @@ fi
%files o2cb %files o2cb
%defattr(-,root,root) %defattr(-,root,root)
%doc README.O2CB
/sbin/rco2cb /sbin/rco2cb
/sbin/rcocfs2 /sbin/rcocfs2
/sbin/o2cb_ctl /sbin/o2cb_ctl
@ -253,10 +240,9 @@ fi
%{_sysconfdir}/init.d/o2cb %{_sysconfdir}/init.d/o2cb
%{_sysconfdir}/init.d/ocfs2 %{_sysconfdir}/init.d/ocfs2
%{_mandir}/man8/o2cb_ctl.8* %{_mandir}/man8/o2cb_ctl.8*
/var/adm/fillup-templates/sysconfig.o2cb %{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
%{_mandir}/man7/o2cb.7.gz %{_mandir}/man7/o2cb.7.gz
%{_mandir}/man8/o2cb.8.gz %{_mandir}/man8/o2cb.8.gz
%doc README.O2CB
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)

3
ocfs2-tools.tar.bz2
View File

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

24
support-for-xvd-devices.patch
View File

@ -1,24 +0,0 @@
commit ff84eb5b6e76427f227632d5604703b8584d1b7f
Author: Srinivas Eeda <srinivas.eeda@oracle.com>
Date: Mon Feb 25 15:58:15 2013 -0800
ocfs2-tools: add support for xvd devices
It is common for virtual disks to be used with ocfs2 inside a VM. With Xen, these devices are /dev/xvd. This patch allows for xvd devices to be used when using global-heartbeat.
Signed-off-by: Wim Coekaerts <wim.coekaerts@oracle.com>
Acked-by: sunil.mushran@gmail.com
diff --git a/o2cb_ctl/o2cb_scandisk.c b/o2cb_ctl/o2cb_scandisk.c
index 92e754e..6cd3635 100644
--- a/o2cb_ctl/o2cb_scandisk.c
+++ b/o2cb_ctl/o2cb_scandisk.c
@@ -128,6 +128,8 @@ static void add_to_list(struct list_head *device_list, struct devnode *node)
add = !strncmp(path->path, "/dev/sd", 7);
if (!add)
add = !strncmp(path->path, "/dev/loop", 9);
+ if (!add)
+ add = !strncmp(path->path, "/dev/xvd", 8);
}
if (add) {
hb = malloc(sizeof(struct hb_devices));