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

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

Browse Source
This commit is contained in:
OBS User unknown 2008-02-20 13:58:12 +00:00 committed by Git OBS Bridge
parent 01a8ec0920
commit 99bab81977
9 changed files with 84 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ocfs2-tools-1.2.2.diff
View File

@ -1,22 +0,0 @@
diff -ur ocfs2-tools-1.2.2.orig/configure.in ocfs2-tools-1.2.2/configure.in
--- ocfs2-tools-1.2.2.orig/configure.in 2006-10-19 19:10:53.000000000 +0200
+++ ocfs2-tools-1.2.2/configure.in 2006-10-21 01:02:31.000000000 +0200
@@ -88,14 +88,17 @@
AC_SUBST(COM_ERR_LIBS)
])
+saved_LDFLAGS="$LDFLAGS"
+LDFLAGS="-lpthread"
UUID_LIBS=
-AC_CHECK_LIB(uuid, uuid_unparse, UUID_LIBS=-luuid)
+AC_CHECK_LIB(uuid, uuid_unparse, UUID_LIBS="-luuid -lpthread")
if test "x$UUID_LIBS" = "x"; then
AC_MSG_ERROR([Unable to find uuid library])
fi
AC_CHECK_HEADER(uuid/uuid.h, :,
AC_MSG_ERROR([Unable to find uuid headers]))
AC_SUBST(UUID_LIBS)
+LDFLAGS="$saved_LDFLAGS"
NCURSES_LIBS=
AC_CHECK_LIB(ncurses, tgetstr, NCURSES_LIBS=-lncurses)

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

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

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

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

13
ocfs2-tools-offsetof.diff
View File

@ -1,13 +0,0 @@
--- libocfs2/include/ocfs2.h
+++ libocfs2/include/ocfs2.h
@@ -41,9 +41,9 @@
#include <string.h>
#include <limits.h>
+#include <stddef.h>
#include <linux/types.h>
-#include <linux/stddef.h>
#include <et/com_err.h>

22
ocfs2-tools-static-glib.diff Normal file
View File

@ -0,0 +1,22 @@
diff -ru ocfs2-tools/o2cb_ctl/Makefile ocfs2-tools.fix/o2cb_ctl/Makefile
--- ocfs2-tools/o2cb_ctl/Makefile 2007-11-13 04:19:54.000000000 -0500
+++ ocfs2-tools.fix/o2cb_ctl/Makefile 2008-02-19 15:00:40.000000000 -0500
@@ -49,6 +49,6 @@
o2cb_ctl_CPPFLAGS = $(GLIB_CFLAGS) -DG_DISABLE_DEPRECATED
o2cb_ctl: $(O2CB_CTL_OBJS) $(LIBOCFS2_DEPS) $(LIBO2CB_DEPS)
- $(LINK) $(LIBO2CB_LIBS) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
+ $(LINK) $(LIBO2CB_LIBS) -Wl,-Bstatic $(GLIB_LIBS) -Wl,-Bdynamic $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
include $(TOPDIR)/Postamble.make
diff -ru ocfs2-tools/tunefs.ocfs2/Makefile ocfs2-tools.fix/tunefs.ocfs2/Makefile
--- ocfs2-tools/tunefs.ocfs2/Makefile 2008-02-19 15:02:38.000000000 -0500
+++ ocfs2-tools.fix/tunefs.ocfs2/Makefile 2008-02-19 15:02:00.000000000 -0500
@@ -39,6 +39,6 @@
DIST_FILES = $(CFILES) $(HFILES) tunefs.ocfs2.8.in
tunefs.ocfs2: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
- $(LINK) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(UUID_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
+ $(LINK) -Wl,-Bstatic $(GLIB_LIBS) -Wl,-Bdynamic $(LIBOCFS2_LIBS) $(UUID_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
include $(TOPDIR)/Postamble.make

18
ocfs2-tools-suse.diff
View File

@ -1,6 +1,7 @@
diff -ru ocfs2-tools-0.99.2.orig/vendor/common/o2cb.init ocfs2-tools-0.99.2/vendor/common/o2cb.init
--- ocfs2-tools-0.99.2.orig/vendor/common/o2cb.init 2005-03-20 20:57:01.000000000 +0100
+++ ocfs2-tools-0.99.2/vendor/common/o2cb.init 2005-03-30 15:01:43.836820411 +0200
Index: ocfs2-tools/vendor/common/o2cb.init
===================================================================
--- ocfs2-tools.orig/vendor/common/o2cb.init
+++ ocfs2-tools/vendor/common/o2cb.init
@@ -6,8 +6,8 @@
#
### BEGIN INIT INFO
@ -12,10 +13,11 @@ diff -ru ocfs2-tools-0.99.2.orig/vendor/common/o2cb.init ocfs2-tools-0.99.2/vend
# Required-Stop:
# Default-Start: 2 3 5
# Default-Stop:
--- ocfs2-tools-0.99.2.orig/debugfs.ocfs2/Makefile
+++ ocfs2-tools-0.99.2.orig/debugfs.ocfs2/Makefile
@@ -12,10 +12,11 @@
Index: ocfs2-tools/debugfs.ocfs2/Makefile
===================================================================
--- ocfs2-tools.orig/debugfs.ocfs2/Makefile
+++ ocfs2-tools/debugfs.ocfs2/Makefile
@@ -12,10 +12,11 @@ INCLUDES = -Iinclude -I$(TOPDIR)/libocfs
INCLUDES += $(GLIB_CFLAGS)
ifdef OCFS2_DEBUG
@ -27,5 +29,5 @@ diff -ru ocfs2-tools-0.99.2.orig/vendor/common/o2cb.init ocfs2-tools-0.99.2/vend
endif
+CFLAGS=-Wall $(OPTS)
CFILES = main.c commands.c dump.c utils.c journal.c find_inode_paths.c dump_fs_locks.c
CFILES = main.c commands.c dump.c utils.c journal.c find_block_inode.c find_inode_paths.c dump_fs_locks.c

10
ocfs2-tools.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Feb 19 21:14:00 CET 2008 - jeffm@suse.com
- Statically link glib-2.0 with tunefs and o2cb_ctl.
-------------------------------------------------------------------
Mon Jan 28 17:12:13 CET 2008 - jeffm@suse.com
- Update to 1.3.9
-------------------------------------------------------------------
Mon Jan 14 22:13:41 CET 2008 - jeffm@suse.com

69
ocfs2-tools.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package ocfs2-tools (Version 1.2.7)
# spec file for package ocfs2-tools (Version 1.3.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -10,10 +10,11 @@
# norootforbuild
Name: ocfs2-tools
BuildRequires: e2fsprogs-devel glib2-devel python-devel python-gtk-devel readline-devel update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools
Version: 1.2.7
Version: 1.3.9
Release: 1
License: GPL v2 or later
Group: System/Filesystems
@ -21,10 +22,9 @@ Source: ocfs2-tools-%{version}.tar.bz2
Patch0: ocfs2-tools-suse.diff
Patch1: blkid.m4.diff
Patch2: offsetof.diff
Patch3: ocfs2-tools-1.2.2.diff
Patch4: ocfs2-tools-offsetof.diff
Patch5: ocfs2-tools-o_creat-mode.diff
Patch6: ocfs2-tools-1.2.7-tunefs-path.diff
Patch3: ocfs2-tools-o_creat-mode.diff
Patch4: ocfs2-tools-1.2.7-tunefs-path.diff
Patch5: ocfs2-tools-static-glib.diff
Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: coreutils, net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq
@ -81,22 +81,21 @@ Authors:
Oracle Corporation
%prep
%setup -n ocfs2-tools-%{version}
%setup -n %{name}
%patch0 -p1
%patch1 -p1
%patch2
%patch2 -p1
%patch3 -p1
%patch4 -p0
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export PROJECT="ocfs2-tools"
autoreconf -fi -I /usr/share/aclocal
%configure --disable-debug --prefix=/usr --mandir=/usr/share/man
# --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
%configure --disable-debug --prefix=/usr --mandir=/usr/share/man \
--enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
make OPTS="$RPM_OPT_FLAGS"
%install
@ -183,60 +182,64 @@ fi
%{_libdir}/pkgconfig/ocfs2.pc
%changelog
* Mon Jan 14 2008 - jeffm@suse.com
* 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
* 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
* Sun Nov 19 2006 schwab@suse.de
- Don't use kernel headers.
* Sun Nov 19 2006 - ro@suse.de
* 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
* 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
* Sat Oct 28 2006 meissner@suse.de
- use RPM_OPT_FLAGS
* Sat Sep 30 2006 - aj@suse.de
* Sat Sep 30 2006 aj@suse.de
- Cleanup BuildRequires.
* Wed Aug 16 2006 - cthiel@suse.de
* Wed Aug 16 2006 cthiel@suse.de
- buildrequire python-gtk-devel instead of python-gtk
* Wed May 03 2006 - kukuk@suse.de
* Wed May 03 2006 kukuk@suse.de
- Fix compile with new glibc
* Wed Apr 26 2006 - lmb@suse.de
* Wed Apr 26 2006 lmb@suse.de
- Update to 1.2.1 to match in-kernel version.
* Mon Apr 24 2006 - lmb@suse.de
* Mon Apr 24 2006 lmb@suse.de
- Create /sbin/rcocfs2, rco2cb symlinks (#167261).
* Tue Apr 04 2006 - lmb@suse.de
* Tue Apr 04 2006 lmb@suse.de
- Install "ocfs2" init script and enable it (#160724).
* Fri Mar 03 2006 - jeffm@suse.com
* Fri Mar 03 2006 jeffm@suse.com
- Updated to version 1.2.0, per Oracle
* Fri Mar 03 2006 - jeffm@suse.com
* 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
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Fri Nov 11 2005 - lmb@suse.de
* Fri Nov 11 2005 lmb@suse.de
- Should-Start: iscsi added (from SLES9) (#114733)
* Wed Nov 02 2005 - dmueller@suse.de
* Wed Nov 02 2005 dmueller@suse.de
- don't build as root
* Tue Nov 01 2005 - jeffm@suse.com
* Wed Nov 02 2005 jeffm@suse.com
- Update to version 1.1.3 - SVN 1105
* Mon Aug 22 2005 - garloff@suse.de
* Mon Aug 22 2005 garloff@suse.de
- Fix python defines.
* Mon Aug 22 2005 - garloff@suse.de
* Mon Aug 22 2005 garloff@suse.de
- Fix build with different python versions.
- Fix package description.
* Sat Aug 20 2005 - lmb@suse.de
* Sat Aug 20 2005 lmb@suse.de
- Initial packaging of ocfs2-tools, from SLES9.
- Update to version 1.1.1 - SVN 1063

6
offsetof.diff
View File

@ -1,10 +1,10 @@
--- libocfs2/include/ocfs2.h
+++ libocfs2/include/ocfs2.h
--- a/libocfs2/include/ocfs2.h
+++ b/libocfs2/include/ocfs2.h
@@ -43,6 +43,7 @@
#include <limits.h>
#include <linux/types.h>
+#include <linux/stddef.h>
+#include <stddef.h>
#include <et/com_err.h>