Author: adrian.chadd
Date: Sat Apr 4 16:38:07 2009
New Revision: 13910
Removed:
playpen/LUSCA_HEAD_ufsrework/src/fs/diskd/
playpen/LUSCA_HEAD_ufsrework/src/fs/ufs/
Modified:
playpen/LUSCA_HEAD_ufsrework/configure.in
playpen/LUSCA_HEAD_ufsrework/src/fs/Makefile.am
Log:
First pass - remove ufs, diskd from the tree and from the build/configure
scripts.
The configure script needs to enable asyncio by default.
Modified: playpen/LUSCA_HEAD_ufsrework/configure.in
==============================================================================
--- playpen/LUSCA_HEAD_ufsrework/configure.in (original)
+++ playpen/LUSCA_HEAD_ufsrework/configure.in Sat Apr 4 16:38:07 2009
@@ -315,14 +315,14 @@
[ case $enableval in
yes)
with_pthreads="yes"
- STORE_MODULES="ufs aufs"
+ STORE_MODULES="aufs"
;;
no)
;;
*)
aufs_io_threads=$enableval
with_pthreads="yes"
- STORE_MODULES="ufs aufs"
+ STORE_MODULES="aufs"
;;
esac
])
@@ -367,7 +367,7 @@
AC_ARG_ENABLE(storeio,
[ --enable-storeio="list of modules"
Build support for the list of store I/O modules.
- The default is only to build the "ufs" module.
+ The default is to build aufs, coss and null modules.
See src/fs for a list of available modules, or
Programmers Guide section <not yet written>
for details on how to build your custom store module],
@@ -393,11 +393,10 @@
esac
],
[ if test -z "$STORE_MODULES"; then
- STORE_MODULES="ufs"
+ STORE_MODULES="aufs coss null"
fi
])
echo "Store modules built: $STORE_MODULES"
-NEED_DISKD=0
USE_AIOPS_WIN32=0
USE_LIBASYNCIO=1
NEED_COSSDUMP=0
@@ -409,9 +408,6 @@
STORE_MODULE_SUBDIRS=
for fs in $STORE_MODULES none; do
case "$fs" in
- diskd)
- NEED_DISKD=1
- ;;
aufs)
if test -z "$with_pthreads"; then
case "$host_os" in
@@ -439,7 +435,6 @@
esac
done
AC_SUBST(STORE_MODULES)
-AM_CONDITIONAL([NEED_DISKD], [test "$NEED_DISKD" = 1])
AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1])
AM_CONDITIONAL([USE_LIBASYNCIO], [test "$USE_LIBASYNCIO" = 1])
AM_CONDITIONAL([NEED_COSSDUMP], [test "$NEED_COSSDUMP" = 1])
Modified: playpen/LUSCA_HEAD_ufsrework/src/fs/Makefile.am
==============================================================================
--- playpen/LUSCA_HEAD_ufsrework/src/fs/Makefile.am (original)
+++ playpen/LUSCA_HEAD_ufsrework/src/fs/Makefile.am Sat Apr 4 16:38:07 2009
@@ -5,27 +5,14 @@
AUTOMAKE_OPTIONS = subdir-objects
-EXTRA_LIBRARIES = libaufs.a libcoss.a libdiskd.a libnull.a libufs.a
+EXTRA_LIBRARIES = libaufs.a libcoss.a libnull.a
noinst_LIBRARIES = @STORE_LIBS@
EXTRA_libaufs_a_SOURCES = aufs/aiops.c aufs/aiops_win32.c
libaufs_a_SOURCES = aufs/store_asyncufs.h aufs/store_dir_aufs.c
aufs/store_io_aufs.c
libcoss_a_SOURCES = coss/store_coss.h coss/store_io_coss.c
coss/store_dir_coss.c
-libdiskd_a_SOURCES = diskd/diskd.c diskd/store_dir_diskd.c
diskd/store_diskd.h \
- diskd/store_io_diskd.c
libnull_a_SOURCES = null/store_null.c
-libufs_a_SOURCES = ufs/store_dir_ufs.c ufs/store_io_ufs.c ufs/store_ufs.h
-
-if NEED_DISKD
-DISKD = diskd-daemon
-else
-DISKD =
-endif
-
-libexec_PROGRAMS = $(DISKD)
-
-diskd_daemon_SOURCES = diskd/diskd.c
LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@
@@ -42,5 +29,3 @@
coss/clean: clean
null/all: libnull.a
null/clean: clean
-ufs/all: libufs.a
-ufs/clean: clean
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
