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=1

Browse Source
This commit is contained in:
OBS User unknown 2007-01-15 23:27:20 +00:00 committed by Git OBS Bridge
commit e417dce244
10 changed files with 528 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

102
blkid.m4.diff Normal file
View File

@ -0,0 +1,102 @@
Added: trunk/blkid.m4
===================================================================
--- trunk/blkid.m4 2005-03-27 22:51:34 UTC (rev 746)
+++ trunk/blkid.m4 2005-03-27 23:17:44 UTC (rev 747)
@@ -0,0 +1,97 @@
+dnl Support for libblkid included in our tree for ocfs2console
+
+AC_DEFUN([OCFS2_BLKID], [
+ HAVE_BLKID=
+ PKG_CHECK_MODULES(BLKID, blkid >= 1.36, HAVE_BLKID=yes,
+ [AC_MSG_WARN([blkid >= 1.36 not found, using internal version])])
+ AC_SUBST(HAVE_BLKID)
+
+ if test "x$HAVE_BLKID" != "xyes"; then
+ AC_CHECK_LIB(uuid, uuid_unparse, :,
+ [AC_MSG_ERROR([could not find uuid library])])
+
+ AC_CHECK_SIZEOF(short)
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(long long)
+
+ AC_CONFIG_COMMANDS([ocfs2console/blkid/blkid_types.h], [
+ outfile=ocfs2console/blkid/blkid_types.h-tmp
+ cat > $outfile <<_______EOF
+/*
+ * If linux/types.h is already been included, assume it has defined
+ * everything we need. (cross fingers) Other header files may have
+ * also defined the types that we need.
+ */
+#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \\
+ !defined(_EXT2_TYPES_H))
+#define _BLKID_TYPES_H
+
+typedef unsigned char __u8;
+typedef signed char __s8;
+
+#if ($ocfs2_SIZEOF_INT == 8)
+typedef int __s64;
+typedef unsigned int __u64;
+#else
+#if ($ocfs2_SIZEOF_LONG == 8)
+typedef long __s64;
+typedef unsigned long __u64;
+#else
+#if ($ocfs2_SIZEOF_LONG_LONG == 8)
+#if defined(__GNUC__)
+typedef __signed__ long long __s64;
+#else
+typedef signed long long __s64;
+#endif /* __GNUC__ */
+typedef unsigned long long __u64;
+#endif /* SIZEOF_LONG_LONG == 8 */
+#endif /* SIZEOF_LONG == 8 */
+#endif /* SIZEOF_INT == 8 */
+
+#if ($ocfs2_SIZEOF_INT == 2)
+typedef int __s16;
+typedef unsigned int __u16;
+#else
+#if ($ocfs2_SIZEOF_SHORT == 2)
+typedef short __s16;
+typedef unsigned short __u16;
+#else
+ ?==error: undefined 16 bit type
+#endif /* SIZEOF_SHORT == 2 */
+#endif /* SIZEOF_INT == 2 */
+
+#if ($ocfs2_SIZEOF_INT == 4)
+typedef int __s32;
+typedef unsigned int __u32;
+#else
+#if ($ocfs2_SIZEOF_LONG == 4)
+typedef long __s32;
+typedef unsigned long __u32;
+#else
+#if ($ocfs2_SIZEOF_SHORT == 4)
+typedef short __s32;
+typedef unsigned short __u32;
+#else
+ ?== error: undefined 32 bit type
+#endif /* SIZEOF_SHORT == 4 */
+#endif /* SIZEOF_LONG == 4 */
+#endif /* SIZEOF_INT == 4 */
+
+#endif /* _*_TYPES_H */
+_______EOF
+
+ if cmp -s $outfile ocfs2console/blkid/blkid_types.h; then
+ AC_MSG_NOTICE([ocfs2console/blkid/blkid_types.h is unchanged])
+ rm -f $outfile
+ else
+ mv $outfile ocfs2console/blkid/blkid_types.h
+ fi
+ ],[
+ ocfs2_SIZEOF_SHORT=$ac_cv_sizeof_short
+ ocfs2_SIZEOF_INT=$ac_cv_sizeof_int
+ ocfs2_SIZEOF_LONG=$ac_cv_sizeof_long
+ ocfs2_SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
+ ])
+ fi
+])

22
ocfs2-tools-1.2.2.diff Normal file
View File

@ -0,0 +1,22 @@
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.2.tar.bz2 Normal file
View File

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

13
ocfs2-tools-offsetof.diff Normal file
View File

@ -0,0 +1,13 @@
--- 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>

31
ocfs2-tools-suse.diff Normal file
View File

@ -0,0 +1,31 @@
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
@@ -6,8 +6,8 @@
#
### BEGIN INIT INFO
# Provides: o2cb
-# Required-Start: $network
-# Should-Start:
+# Required-Start: $network $syslog $named
+# Should-Start: sshd iscsi
# 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 @@
INCLUDES += $(GLIB_CFLAGS)
ifdef OCFS2_DEBUG
-CFLAGS = -Wall -O -ggdb
+OPTS = -O -ggdb
else
-CFLAGS = -Wall -O2
+OPTS = -O2
endif
+CFLAGS=-Wall $(OPTS)
CFILES = main.c commands.c dump.c utils.c journal.c find_inode_paths.c dump_fs_locks.c

100
ocfs2-tools.changes Normal file
View File

@ -0,0 +1,100 @@
-------------------------------------------------------------------
Sun Nov 19 22:40:24 CET 2006 - schwab@suse.de
- Don't use kernel headers.
-------------------------------------------------------------------
Sun Nov 19 22:09:50 CET 2006 - ro@suse.de
- define offsetof locally if it does not come from kernel header
-------------------------------------------------------------------
Mon Oct 30 17:43:47 CET 2006 - lmb@suse.de
- Upgrade to version 1.2.2 to match in-kernel version.
- Split-off devel subpackage.
-------------------------------------------------------------------
Sat Oct 28 22:48:11 CEST 2006 - meissner@suse.de
- use RPM_OPT_FLAGS
-------------------------------------------------------------------
Sat Sep 30 09:21:03 CEST 2006 - aj@suse.de
- Cleanup BuildRequires.
-------------------------------------------------------------------
Wed Aug 16 16:12:07 CEST 2006 - cthiel@suse.de
- buildrequire python-gtk-devel instead of python-gtk
-------------------------------------------------------------------
Wed May 3 10:24:04 CEST 2006 - kukuk@suse.de
- Fix compile with new glibc
-------------------------------------------------------------------
Wed Apr 26 13:37:24 CEST 2006 - lmb@suse.de
- Update to 1.2.1 to match in-kernel version.
-------------------------------------------------------------------
Mon Apr 24 13:07:50 CEST 2006 - lmb@suse.de
- Create /sbin/rcocfs2, rco2cb symlinks (#167261).
-------------------------------------------------------------------
Tue Apr 4 17:07:28 CEST 2006 - lmb@suse.de
- Install "ocfs2" init script and enable it (#160724).
-------------------------------------------------------------------
Fri Mar 3 00:17:55 CET 2006 - jeffm@suse.com
- Updated to version 1.2.0, per Oracle
-------------------------------------------------------------------
Fri Mar 3 00:04:01 CET 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 21:38:55 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Fri Nov 11 15:07:50 CET 2005 - lmb@suse.de
- Should-Start: iscsi added (from SLES9) (#114733)
-------------------------------------------------------------------
Wed Nov 2 22:07:24 CET 2005 - dmueller@suse.de
- don't build as root
-------------------------------------------------------------------
Tue Nov 1 23:15:11 CET 2005 - jeffm@suse.com
- Update to version 1.1.3 - SVN 1105
-------------------------------------------------------------------
Mon Aug 22 15:35:21 CEST 2005 - garloff@suse.de
- Fix python defines.
-------------------------------------------------------------------
Mon Aug 22 12:47:14 CEST 2005 - garloff@suse.de
- Fix build with different python versions.
- Fix package description.
-------------------------------------------------------------------
Sat Aug 20 15:36:48 CEST 2005 - lmb@suse.de
- Initial packaging of ocfs2-tools, from SLES9.
- Update to version 1.1.1 - SVN 1063

224
ocfs2-tools.spec Normal file
View File

@ -0,0 +1,224 @@
#
# spec file for package ocfs2-tools (Version 1.2.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# 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.2
Release: 9
License: GNU General Public License (GPL)
Group: System/Filesystems
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
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
AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
OCFS is the Oracle Cluster File System.
This package contains the core user-space tools needed for creating and
managing the file system.
Authors:
--------
Oracle Corporation
%package -n ocfs2console
Summary: Oracle Cluster Filesystem 2 GUI tools
Group: System/Filesystems
Obsoletes: ocfs2-support
Requires: ocfs2-tools = %{version}
AutoReqProv: No
Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, python-gtk >= 1.99.16, ocfs2-tools = %{version}
%{py_requires}
%description -n ocfs2console
OCFS is the Oracle Cluster Filesystem.
This package contains additional tools and a GUI (python-gtk).
Authors:
--------
Oracle Corporation
%package devel
Summary: Oracle Cluster File System 2 Development files
Group: System/Filesystems
Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel
%description devel
OCFS is the Oracle Cluster File System.
This package contains the header files and static libraries for
developing low-level OCFS2-aware applications.
Authors:
--------
Oracle Corporation
%prep
%setup -n ocfs2-tools-%{version}
%patch0 -p1
%patch1 -p1
%patch2
%patch3 -p1
%patch4 -p0
%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
make OPTS="$RPM_OPT_FLAGS"
%install
mkdir -p $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT/sbin
cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT/etc/init.d/o2cb
cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT/etc/init.d/ocfs2
ln -sf ../etc/init.d/o2cb $RPM_BUILD_ROOT/sbin/rco2cb
ln -sf ../etc/init.d/ocfs2 $RPM_BUILD_ROOT/sbin/rcocfs2
mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates
cp -f vendor/common/o2cb.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.o2cb
make DESTDIR="$RPM_BUILD_ROOT" install
mv $RPM_BUILD_ROOT/{,/usr}/sbin/debugfs.ocfs2
mv $RPM_BUILD_ROOT/{,/usr}/sbin/ocfs2cdsl
%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{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
%run_ldconfig
%{fillup_and_insserv -n -y -Y o2cb o2cb}
%{fillup_and_insserv -n -y -Y ocfs2 ocfs2}
%preun
%stop_on_removal ocfs2
%stop_on_removal o2cb
%postun
%run_ldconfig
%restart_on_update ocfs2
%restart_on_update o2cb
%{insserv_cleanup}
%files
%defattr(-,root,root)
/sbin/fsck.ocfs2
/sbin/mkfs.ocfs2
/sbin/mounted.ocfs2
/sbin/tunefs.ocfs2
/sbin/o2cb_ctl
/sbin/mount.ocfs2
/sbin/ocfs2_hb_ctl
/usr/sbin/debugfs.ocfs2
/usr/sbin/ocfs2cdsl
/sbin/rco2cb
/sbin/rcocfs2
/etc/init.d/o2cb
/etc/init.d/ocfs2
/usr/share/man/man8/debugfs.ocfs2.8*
/usr/share/man/man8/fsck.ocfs2.8*
/usr/share/man/man8/fsck.ocfs2.checks.8*
/usr/share/man/man8/mkfs.ocfs2.8*
/usr/share/man/man8/tunefs.ocfs2.8*
/usr/share/man/man8/mounted.ocfs2.8*
/usr/share/man/man8/mount.ocfs2.8*
/usr/share/man/man8/o2cb_ctl.8*
/usr/share/man/man8/ocfs2_hb_ctl.8*
/usr/share/man/man8/ocfs2cdsl.8*
/var/adm/fillup-templates/sysconfig.o2cb
%doc README.O2CB COPYING CREDITS MAINTAINERS
%doc documentation/users_guide.txt
%files -n ocfs2console
%defattr(-,root,root)
%{py_sitedir}/ocfs2interface
/usr/sbin/ocfs2console
/usr/share/man/man8/ocfs2console.8*
%files devel
%defattr(-,root,root)
%{_includedir}/o2cb
%{_includedir}/o2dlm
%{_includedir}/ocfs2
%{_libdir}/libo2cb.a
%{_libdir}/libo2dlm.a
%{_libdir}/libocfs2.a
%{_libdir}/pkgconfig/o2cb.pc
%{_libdir}/pkgconfig/o2dlm.pc
%{_libdir}/pkgconfig/ocfs2.pc
%changelog -n ocfs2-tools
* 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
* Tue Nov 01 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

10
offsetof.diff Normal file
View File

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

0
ready Normal file
View File