[Ocfs2-tools-commits] manish commits r209 - in trunk: .
debugfs.ocfs2 extras fsck.ocfs2 libocfs2 mkfs.ocfs2 vendor
vendor/common
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Aug 30 19:06:22 CDT 2004
Author: manish
Date: 2004-08-30 19:06:20 -0500 (Mon, 30 Aug 2004)
New Revision: 209
Added:
trunk/vendor/common/ocfs2-tools.spec.in
Removed:
trunk/vendor/common/ocfs-tools.spec.in
Modified:
trunk/
trunk/Config.make.in
trunk/Makefile
trunk/configure.in
trunk/debugfs.ocfs2/Makefile
trunk/extras/Makefile
trunk/fsck.ocfs2/Makefile
trunk/libocfs2/Makefile
trunk/mkfs.ocfs2/Makefile
trunk/vendor/
Log:
Make it all build again
Property changes on: trunk
___________________________________________________________________
Name: svn:externals
+ load_ocfs http://oss.oracle.com/projects/ocfs-tools/src/trunk/load_ocfs
ocfs_uid_gen http://oss.oracle.com/projects/ocfs-tools/src/trunk/ocfs_uid_gen
Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/Config.make.in 2004-08-31 00:06:20 UTC (rev 209)
@@ -44,15 +44,11 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
-BUILD_OCFS = @BUILD_OCFS@
-BUILD_OCFS2 = @BUILD_OCFS2@
BUILD_OCFSTOOL = @BUILD_OCFSTOOL@
-DEBUGOCFS2 = @DEBUGOCFS2@
+BUILD_DEBUGOCFS2 = @BUILD_DEBUGOCFS2@
OCFS_DEBUG = @OCFS_DEBUG@
-OCFS_MEMDEBUG = @OCFS_MEMDEBUG@
-OCFS_TRACE = @OCFS_TRACE@
OCFS_PROCESSOR = @OCFS_PROCESSOR@
OCFS2_DEBUG_EXE = @OCFS2_DEBUG_EXE@
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/Makefile 2004-08-31 00:06:20 UTC (rev 209)
@@ -22,16 +22,12 @@
$(error could not detect architecture for tools)
endif
-SUBDIRS = load_ocfs ocfs_uid_gen
+SUBDIRS = libocfs2 mkfs.ocfs2 extras load_ocfs ocfs_uid_gen
-ifdef BUILD_OCFS
-SUBDIRS += ocfs
+ifdef BUILD_DEBUGOCFS2
+SUBDIRS += debugfs.ocfs2
endif
-ifdef BUILD_OCFS2
-SUBDIRS += ocfs2
-endif
-
ifdef BUILD_OCFSTOOL
SUBDIRS += ocfstool
endif
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/configure.in 2004-08-31 00:06:20 UTC (rev 209)
@@ -129,40 +129,42 @@
AM_PATH_GLIB($GLIB_REQUIRED_VERSION, :,
AC_MSG_ERROR([Glib $GLIB_REQUIRED_VERSION or better is required.]))
-DEBUGOCFS2=
+BUILD_DEBUGOCFS2=
ocfs_tools_save_LIBS=$LIBS
LIBS="$LIBS -lncurses"
AC_CHECK_LIB(readline, readline,
[AC_CHECK_HEADER(readline/readline.h,
- DEBUGOCFS2=yes,
+ BUILD_DEBUGOCFS2=yes,
[AC_MSG_WARN([readline not found, debugfs.ocfs2 will not be built])])],
[AC_MSG_WARN([readline not found, debugfs.ocfs2 will not be built])])
LIBS=$ocfs_tools_save_LIBS
+AC_SUBST(BUILD_DEBUGOCFS2)
+
BUILD_OCFSTOOL=
-AC_ARG_ENABLE(ocfstool, [ --enable-ocfstool=[yes/no] Build GUI frontend [default=yes]],,enable_ocfstool=yes)
+dnl AC_ARG_ENABLE(ocfstool, [ --enable-ocfstool=[yes/no] Build GUI frontend [default=yes]],,enable_ocfstool=yes)
-if test "x$enable_ocfstool" = "xyes"; then
- AM_PATH_GTK($GTK_REQUIRED_VERSION, have_gtk=yes, have_gtk=no)
+dnl if test "x$enable_ocfstool" = "xyes"; then
+dnl AM_PATH_GTK($GTK_REQUIRED_VERSION, have_gtk=yes, have_gtk=no)
- if test "x$have_gtk" = "xyes"; then
- BUILD_OCFSTOOL=yes
- else
- AC_MSG_WARN([GTK+ $GTK_REQUIRED_VERSION or better not found, ocfstool will not be built])
- fi
-fi
+dnl if test "x$have_gtk" = "xyes"; then
+dnl BUILD_OCFSTOOL=yes
+dnl else
+dnl AC_MSG_WARN([GTK+ $GTK_REQUIRED_VERSION or better not found, ocfstool will not be built])
+dnl fi
+dnl fi
AC_SUBST(BUILD_OCFSTOOL)
AC_OUTPUT([
Config.make
+libocfs2/ocfs2_err.et
debugfs.ocfs2/debugfs.ocfs2.8
mkfs.ocfs2/mkfs.ocfs2.8
ocfs_uid_gen/ocfs_uid_gen.8
load_ocfs/load_ocfs.8
load_ocfs/ocfs.conf.5
ocfstool/ocfstool.8
-vendor/common/ocfs-tools.spec
-ocfs2/libocfs2/ocfs2_err.et
+vendor/common/ocfs2-tools.spec
])
Modified: trunk/debugfs.ocfs2/Makefile
===================================================================
--- trunk/debugfs.ocfs2/Makefile 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/debugfs.ocfs2/Makefile 2004-08-31 00:06:20 UTC (rev 209)
@@ -1,4 +1,4 @@
-TOPDIR = ../..
+TOPDIR = ..
include $(TOPDIR)/Preamble.make
@@ -6,7 +6,7 @@
DEFINES = -DLINUX -DDEBUGOCFS -DDEBUG -DDEBUGOCFS_VERSION=\"0.0.1\"
-INCLUDES = -Iinclude -I../libocfs2/include
+INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include
INCLUDES += $(GLIB_CFLAGS)
CFLAGS += -Wall -O2
Modified: trunk/extras/Makefile
===================================================================
--- trunk/extras/Makefile 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/extras/Makefile 2004-08-31 00:06:20 UTC (rev 209)
@@ -1,4 +1,4 @@
-TOPDIR = ../..
+TOPDIR = ..
include $(TOPDIR)/Preamble.make
Modified: trunk/fsck.ocfs2/Makefile
===================================================================
--- trunk/fsck.ocfs2/Makefile 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/fsck.ocfs2/Makefile 2004-08-31 00:06:20 UTC (rev 209)
@@ -1,4 +1,4 @@
-TOPDIR = ../..
+TOPDIR = ..
include $(TOPDIR)/Preamble.make
@@ -13,7 +13,7 @@
SBIN_PROGRAMS = fsck.ocfs2
-INCLUDES = -I../libocfs2/include
+INCLUDES = -I$(TOPDIR)/libocfs2/include
OPTIMIZE = -O2
@@ -34,14 +34,6 @@
#MANS = fsck.ocfs2.8
-INSTALL_RULES = #install-man-links
-
-#install-man-links: install-mans
-# cd $(DESTDIR)$(mandir)/man8 \
-# && rm -f mkfs.ocfs.8 resizeocfs.8 \
-# && $(LN_S) mkfs.ocfs.8 mkfs.ocfs2.8 \
-# && $(LN_S) tuneocfs.8 resizeocfs.8
-
DIST_FILES = $(VERSION_FILES) $(VERSION_SRC) #mkfs.ocfs2.8.in
fsck.ocfs2: fsck.o
Modified: trunk/libocfs2/Makefile
===================================================================
--- trunk/libocfs2/Makefile 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/libocfs2/Makefile 2004-08-31 00:06:20 UTC (rev 209)
@@ -1,4 +1,4 @@
-TOPDIR = ../..
+TOPDIR = ..
include $(TOPDIR)/Preamble.make
Modified: trunk/mkfs.ocfs2/Makefile
===================================================================
--- trunk/mkfs.ocfs2/Makefile 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/mkfs.ocfs2/Makefile 2004-08-31 00:06:20 UTC (rev 209)
@@ -1,4 +1,4 @@
-TOPDIR = ../..
+TOPDIR = ..
include $(TOPDIR)/Preamble.make
@@ -13,8 +13,8 @@
SBIN_PROGRAMS = mkfs.ocfs2 mkfs.ocfs2.kurt
-LIBOCFS2_CFLAGS = -I$(TOPDIR)/ocfs2/libocfs2/include
-LIBOCFS2_LIBS = -L$(TOPDIR)/ocfs2/libocfs2 -locfs2
+LIBOCFS2_CFLAGS = -I$(TOPDIR)/libocfs2/include
+LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
INCLUDES = $(LIBOCFS2_CFLAGS)
DEFINES = -DLINUX -DUSERSPACE_TOOL -DFORMAT_OCFS -DOCFS2_FLAT_INCLUDES
@@ -43,23 +43,6 @@
INSTALL_RULES = install-sbin-links install-man-links
-##########################
-# WARNING!!!
-# are we still going to do argv[0] tricks?
-##########################
-
-#install-sbin-links: install-sbin-programs
-# cd $(DESTDIR)$(sbindir) \
-# && rm -f mkfs.ocfs2 resizeocfs \
-# && $(LN_S) mkfs.ocfs mkfs.ocfs2 \
-# && $(LN_S) tuneocfs resizeocfs
-
-#install-man-links: install-mans
-# cd $(DESTDIR)$(mandir)/man8 \
-# && rm -f mkfs.ocfs.8 resizeocfs.8 \
-# && $(LN_S) mkfs.ocfs.8 mkfs.ocfs2.8 \
-# && $(LN_S) tuneocfs.8 resizeocfs.8
-
MANS = mkfs.ocfs2.8
DIST_FILES = $(VERSION_FILES) $(VERSION_SRC) mkfs2.c mkfs.ocfs2.8.in
Property changes on: trunk/vendor
___________________________________________________________________
Name: svn:externals
+ redhat http://oss.oracle.com/projects/ocfs-tools/src/trunk/vendor/redhat
unitedlinux http://oss.oracle.com/projects/ocfs-tools/src/trunk/vendor/unitedlinux
Deleted: trunk/vendor/common/ocfs-tools.spec.in
===================================================================
--- trunk/vendor/common/ocfs-tools.spec.in 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/vendor/common/ocfs-tools.spec.in 2004-08-31 00:06:20 UTC (rev 209)
@@ -1,156 +0,0 @@
-#
-# Spec file for ocfs-tools
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-# Because RPM is dumb
-%define _unpackaged_files_terminate_build 0
-
-Summary: Tools for managing the Oracle Cluster Filesystem
-Name: ocfs-tools
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs-tools- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs-tools/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: nobody <nobody at oracle.com>
-Exclusiveos: Linux
-Requires: ocfs-support >= @DIST_VERSION@, %{gtk_name} >= 1.2.8
-BuildRequires: %{gtk_name}-devel >= 1.2.8
-
-BuildRoot: %{_tmppath}/ocfs-tools-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-%description
-Tools to manage the Oracle Cluster Filesystem
-
-
-%package -n ocfs-support
-Summary: Support programs for the Oracle Cluster Filesystem
-Group: System Environment/Kernel
-Requires: fileutils, sh-utils, net-tools, modutils, %{chkconfig_dep}
-AutoReqProv: No
-
-
-%description -n ocfs-support
-Support programs for using the Oracle Cluster Filesystem.
-
-
-%prep
-%setup -n ocfs-tools-%{version}
-
-
-%build
-%configure --prefix=/usr --mandir=/usr/share/man
-make
-
-
-%install
-
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-IVENDOR=redhat
-if [ -r /etc/UnitedLinux-release -o -r /etc/SuSE-release ]
-then
- IVENDOR=unitedlinux
-fi
-cp -f vendor/$IVENDOR/ocfs.init $RPM_BUILD_ROOT/etc/init.d/ocfs
-ln -s ocfs $RPM_BUILD_ROOT/etc/init.d/ocfs2
-
-for tool in load_ocfs ocfs_uid_gen
-do
- cd $tool; make DESTDIR="$RPM_BUILD_ROOT" sbindir=/sbin install; cd ..
-done
-
-cd ocfs
-for tool in format fsck
-do
- cd $tool; make DESTDIR="$RPM_BUILD_ROOT" sbindir=/sbin install; cd ..
-done
-
-for tool in debugocfs
-do
- cd $tool; make DESTDIR="$RPM_BUILD_ROOT" install; cd ..
-done
-
-cd ../ocfs2
-for tool in mkfs.ocfs2 debugfs.ocfs2
-do
- cd $tool; make DESTDIR="$RPM_BUILD_ROOT" sbindir=/sbin install; cd ..
-done
-
-cd ..
-for tool in ocfstool
-do
- cd $tool; make DESTDIR="$RPM_BUILD_ROOT" install; cd ..
-done
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%pre -n ocfs-support
-# Cleanup for bad RPMs
-if [ -e /usr/sbin/load_ocfs ] ; then
- rm -f /usr/sbin/load_ocfs
-fi
-
-if [ -e /usr/sbin/ocfs_uid_gen ] ; then
- rm -f /usr/sbin/ocfs_uid_gen
-fi
-
-%post -n ocfs-support
-chkconfig ocfs on
-chkconfig ocfs2 on
-IVENDOR=redhat
-if [ -r /etc/UnitedLinux-release -o -r /etc/SuSE-release ]
-then
- IVENDOR=unitedlinux
-else
- /etc/init.d/ocfs link
- /etc/init.d/ocfs2 link
-fi
-
-
-%files
-%defattr(-,root,root)
-/usr/sbin
-/usr/share
-
-
-%files -n ocfs-support
-%defattr(-,root,root)
-/sbin/load_ocfs
-/sbin/load_ocfs2
-/sbin/mkfs.ocfs
-/sbin/tuneocfs
-/sbin/resizeocfs
-/sbin/mounted.ocfs
-/sbin/fsck.ocfs
-/sbin/blked.ocfs
-/sbin/mkfs.ocfs2
-/sbin/debugfs.ocfs2
-/sbin/ocfs_uid_gen
-/etc/init.d/ocfs
-/etc/init.d/ocfs2
-
-
-%changelog
-* Mon Jun 21 2004 Manish Singh <manish.singh at oracle.com>
-- Don't dist ocfs2 format for now
-
-* Fri Feb 27 2004 Manish Singh <manish.singh at oracle.com>
-- Dist ocfs2 files
-
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Split out tools
-
-* Thu Mar 27 2003 Joel Becker <joel.becker at oracle.com>
-- Added %if %{up} and ocfs-support Requires
-
-* Thu Mar 27 2003 Bryce <philip.copeland at oracle.com>
-- Initial swipe at rpm spec file cleanup
Copied: trunk/vendor/common/ocfs2-tools.spec.in (from rev 208, trunk/vendor/common/ocfs-tools.spec.in)
===================================================================
--- trunk/vendor/common/ocfs-tools.spec.in 2004-08-30 23:30:00 UTC (rev 208)
+++ trunk/vendor/common/ocfs2-tools.spec.in 2004-08-31 00:06:20 UTC (rev 209)
@@ -0,0 +1,105 @@
+#
+# Spec file for ocfs-tools
+#
+
+# Macros
+# This one is hardcoded because, well, it belongs there
+%define _prefix /usr
+# Because RPM is dumb
+%define _unpackaged_files_terminate_build 0
+
+Summary: Tools for managing the Oracle Cluster Filesystem
+Name: ocfs2-tools
+Version: @DIST_VERSION@
+Release: @RPM_VERSION@
+Copyright: GPL
+Group: System Environment/Kernel
+Source: ocfs2-tools- at DIST_VERSION@.tar.gz
+URL: http://oss.oracle.com/projects/ocfs2-tools/
+Distribution: Oracle
+Vendor: Oracle Corporation
+Packager: nobody <nobody at oracle.com>
+Exclusiveos: Linux
+Requires: ocfs-support >= @DIST_VERSION@, %{gtk_name} >= 1.2.8
+BuildRequires: %{gtk_name}-devel >= 1.2.8
+
+BuildRoot: %{_tmppath}/ocfs2-tools-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
+
+%description
+Tools to manage OCFS2
+
+
+%package -n ocfs2-support
+Summary: Support programs for OCFS2
+Group: System Environment/Kernel
+Requires: fileutils, sh-utils, net-tools, modutils, %{chkconfig_dep}
+AutoReqProv: No
+
+
+%description -n ocfs2-support
+Support programs for using OCFS2
+
+
+%prep
+%setup -n ocfs2-tools-%{version}
+
+
+%build
+%configure --prefix=/usr --mandir=/usr/share/man
+make
+
+
+%install
+
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+IVENDOR=redhat
+if [ -r /etc/UnitedLinux-release -o -r /etc/SuSE-release ]
+then
+ IVENDOR=unitedlinux
+fi
+cp -f vendor/$IVENDOR/ocfs.init $RPM_BUILD_ROOT/etc/init.d/ocfs2
+
+for tool in mkfs.ocfs2 debugfs.ocfs2 load_ocfs ocfs_uid_gen
+do
+ cd $tool; make DESTDIR="$RPM_BUILD_ROOT" sbindir=/sbin install; cd ..
+done
+
+#for tool in ocfstool
+#do
+# cd $tool; make DESTDIR="$RPM_BUILD_ROOT" install; cd ..
+#done
+
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+
+%post -n ocfs-2support
+chkconfig ocfs2 on
+IVENDOR=redhat
+if [ -r /etc/UnitedLinux-release -o -r /etc/SuSE-release ]
+then
+ IVENDOR=unitedlinux
+else
+ /etc/init.d/ocfs2 link
+fi
+
+
+%files
+%defattr(-,root,root)
+/usr/sbin
+/usr/share
+
+
+%files -n ocfs-support
+%defattr(-,root,root)
+/sbin/load_ocfs2
+/sbin/mkfs.ocfs2
+/sbin/debugfs.ocfs2
+/sbin/ocfs_uid_gen2
+/etc/init.d/ocfs2
+
+
+%changelog
+* Mon Aug 30 2004 Manish Singh <manish.singh at oracle.com>
+- Initial rpm spec
More information about the Ocfs2-tools-commits
mailing list