pool/ocfs2-tools
4
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=20

Browse Source
This commit is contained in:
OBS User unknown 2009-07-13 19:50:05 +00:00 committed by Git OBS Bridge
parent e215397b54
commit 9a30c2e917
4 changed files with 26 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ocfs2-quota.diff
View File

@ -787,7 +787,7 @@ index 0259161..b50201a 100644
o2image: $(OBJS) $(LIBOCFS2_DEPS)
- $(LINK) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
+ $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
+ $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) -lpthread
include $(TOPDIR)/Postamble.make
--

12
ocfs2-tools-glibc210.diff Normal file
View File

@ -0,0 +1,12 @@
Index: ocfs2-tools/ocfs2_controld/main.c
===================================================================
--- ocfs2-tools.orig/ocfs2_controld/main.c
+++ ocfs2-tools/ocfs2_controld/main.c
@@ -34,6 +34,7 @@
#include <sys/socket.h>
#include <signal.h>
#include <syslog.h>
+#include <limits.h>
#include <sched.h>
#include "ocfs2-kernel/kernel-list.h"

7
ocfs2-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 13 16:57:52 CEST 2009 - coolo@novell.com
- fix build with e2fsprogs
- fix build with glibc 2.10
- fix build with as-needed
-------------------------------------------------------------------
Thu Apr 16 01:40:48 CEST 2009 - ro@suse.de

131
ocfs2-tools.spec
View File

@ -22,13 +22,14 @@ Name: ocfs2-tools
BuildRequires: e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools
Version: 1.4.1
Release: 22
License: GPL v2 only; GPL v2 or later
Release: 23
License: GPL v2 only ; GPL v2 or later
Group: System/Filesystems
Source: ocfs2-tools.tar.bz2
Source1: o2cb.ocf
Patch5: ocfs2-tools-static-glib.diff
Patch6: ocfs2console-display-fix.diff
Patch7: ocfs2-tools-glibc210.diff
Patch99: ocfs2-devel.diff
Patch100: ocfs2-quota.diff
Patch101: change-quotafile-names.diff
@ -116,6 +117,7 @@ Authors:
%setup -n %{name}
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch99 -p1
%patch100 -p1
%patch101 -p1
@ -126,6 +128,8 @@ Authors:
%patch106 -p1
%build
# disable as-needed to fix configure checks
export SUSE_ASNEEDED=0
%{?suse_update_config:%{suse_update_config -f}}
export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export PROJECT="ocfs2-tools"
@ -233,126 +237,3 @@ fi
%{_libdir}/pkgconfig/ocfs2.pc
%changelog
* Thu Apr 16 2009 ro@suse.de
- buildfix: refresh patches
* Fri Feb 27 2009 coyli@suse.de
- tunefs.ocfs2.8.in_more_options.diff: add manual info for
-y, -n and --update-cluster-statck options (bnc#478259)
* Sat Feb 21 2009 lmb@suse.de
- ocfs2_controld-retry-470741.diff: Increase retry count.
* Fri Feb 20 2009 lmb@suse.de
- Split off legacy O2CB init scripts and binaries into
ocfs2-tools-o2cb.
* Thu Feb 19 2009 coyli@suse.de
- update o2cb.ocf to fix return value format (bnc#474353)
* Mon Feb 16 2009 coyli@suse.de
- ocfs2console: Whoops, don't reset all warnings, just pop the DISPLAY one.
Thanks to Hu Ziming from IBM and Joel Becker from Oracle.
* Tue Feb 10 2009 coyli@suse.de
- ocfs2console: remove unsupported option when calling tunefs.ocfs2 (bnc#472353)
* Mon Feb 09 2009 abeekhof@suse.de
- Re-implement kill_stack_node() to use node attributes instead of stonithd
- Reuse more functions from Pacemaker shared libraries
- Have the o2cb OCF agent produce extra output if the daemon doesn't come up
* Thu Feb 05 2009 coyli@suse.de
- Replace Hu Ziming's patch to Jeol Becker's patch for bnc#448523.
* Tue Jan 13 2009 coyli@suse.de
- fix ocfs2console crashing when DISOPLAY is not correclty set(bnc#448523),
thanks to Hu Ziming from IBM.
* Sat Jan 03 2009 coly.li@suse.de
- add ocfs2-kmp (ocfs2 KMP package) into installation dependency(bnc#459437)
* Fri Dec 05 2008 coyli@suse.de
- ensure o2cb OCF resource agent is executable
- add libdlm to ocfs2-tools' dependency (bnc#448751)
* Sat Nov 22 2008 mfasheh@suse.com
- Add a quota fixup patch to match up system file names in tools
with the kernel.
* Wed Nov 12 2008 abeekhof@suse.de
- Add an OCF-style script to allow Pacemaker to reliably manage the
ocfs2 modules. The existing LSB-style one is inadequate.
* Mon Oct 27 2008 abeekhof@suse.de
- Refresh package to upstream a93731c164d024e0016520a1f4cd8f9007d7c05e
- Remove part of the static glib patch as tunefs.ocfs2 no longer uses glib
- Combine patches yet to be upstreamed to ease maintenance
* Mon Oct 27 2008 mfasheh@suse.com
- Add quota support patches
* Mon Oct 20 2008 abeekhof@suse.de
- New patch for ocfs2_controld - make sure stad(err|out|in) are mapped to /dev/null
and not left unassigned (which causes issues when logging)
* Mon Sep 22 2008 abeekhof@suse.de
- ocfs2console: Allow ocfs2console to enumerate device mapper devices (bnc#414756)
* Tue Sep 16 2008 abeekhof@suse.de
- Update for new pacemaker dependancies
- Use correct path for ocfs2_controld.*
- Package required udev rules
* 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
- Made init scripts LSB compliant.
* Fri Feb 22 2008 jeffm@suse.com
- Re-added init script support for userspace heartbeat.
* Tue Feb 19 2008 jeffm@suse.com
- Statically link glib-2.0 with tunefs and o2cb_ctl.
* Mon Jan 28 2008 jeffm@suse.com
- Update to 1.3.9
* Mon Jan 14 2008 jeffm@suse.com
- Update to 1.2.7
- Add shrinking journal size support
- Fix crash in slotmap
- Don't append _netdev for local mounts
- Add query support for tunefs
- Add remove slot features to tunefs
* Tue Aug 07 2007 jeffm@suse.com
- Update to 1.2.6
- Support for file attributes field
- Fix for automatically selecting next node number
- Multiple fsck fixes
- Offline resize
- Documentation updates
* Sun Nov 19 2006 schwab@suse.de
- Don't use kernel headers.
* Sun Nov 19 2006 ro@suse.de
- define offsetof locally if it does not come from kernel header
* Mon Oct 30 2006 lmb@suse.de
- Upgrade to version 1.2.2 to match in-kernel version.
- Split-off devel subpackage.
* Sat Oct 28 2006 meissner@suse.de
- use RPM_OPT_FLAGS
* Sat Sep 30 2006 aj@suse.de
- Cleanup BuildRequires.
* Wed Aug 16 2006 cthiel@suse.de
- buildrequire python-gtk-devel instead of python-gtk
* Wed May 03 2006 kukuk@suse.de
- Fix compile with new glibc
* Wed Apr 26 2006 lmb@suse.de
- Update to 1.2.1 to match in-kernel version.
* Mon Apr 24 2006 lmb@suse.de
- Create /sbin/rcocfs2, rco2cb symlinks (#167261).
* Tue Apr 04 2006 lmb@suse.de
- Install "ocfs2" init script and enable it (#160724).
* Fri Mar 03 2006 jeffm@suse.com
- Updated to version 1.2.0, per Oracle
* Fri Mar 03 2006 jeffm@suse.com
- Enabled o2cb by default on package install to allow it to shut
down when manually started. Otherwise, the system will hang
during shutdown.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Fri Nov 11 2005 lmb@suse.de
- Should-Start: iscsi added (from SLES9) (#114733)
* Wed Nov 02 2005 dmueller@suse.de
- don't build as root
* Wed Nov 02 2005 jeffm@suse.com
- Update to version 1.1.3 - SVN 1105
* Mon Aug 22 2005 garloff@suse.de
- Fix python defines.
* Mon Aug 22 2005 garloff@suse.de
- Fix build with different python versions.
- Fix package description.
* Sat Aug 20 2005 lmb@suse.de
- Initial packaging of ocfs2-tools, from SLES9.
- Update to version 1.1.1 - SVN 1063