[Pvfs2-cvs] commit by nlmills in pvfs2: .project
PVFS2-GLOBAL-TODO.txt .cvsignore Makefile.in configure
configure.in module.mk.in
CVS commit program
cvs at parl.clemson.edu
Fri May 21 13:33:51 EDT 2010
Update of /projects/cvsroot/pvfs2
In directory parlweb1:/tmp/cvs-serv1309
Modified Files:
Tag: cu-security-branch
.cvsignore Makefile.in configure configure.in module.mk.in
Added Files:
Tag: cu-security-branch
.project PVFS2-GLOBAL-TODO.txt
Log Message:
revert cu-security-branch to before the attempted merge with Orange-Branch
Index: .cvsignore
===================================================================
RCS file: /projects/cvsroot/pvfs2/.cvsignore,v
diff -p -u -r1.2.70.2 -r1.2.70.3
--- .cvsignore 2 Sep 2009 20:15:42 -0000 1.2.70.2
+++ .cvsignore 21 May 2010 17:33:45 -0000 1.2.70.3
@@ -2,3 +2,7 @@ cscope.*
config.log
aclocal.m4
autom4te.cache
+config.status
+Makefile
+pvfs2-config.h
+module.mk
Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/Makefile.in,v
diff -p -u -r1.263.2.4 -r1.263.2.5
--- Makefile.in 2 Sep 2009 20:15:42 -0000 1.263.2.4
+++ Makefile.in 21 May 2010 17:33:45 -0000 1.263.2.5
@@ -10,7 +10,6 @@
# docsclean cleans up documentation files
# publish copy over documents to the PVFS.org web pags
# admintools builds admin tools
-# usertools builds user tools
# kernapps builds userland helper programs for kernel driver
# cscope generates information for cscope utility
# tags generates tags file for use by editors
@@ -120,7 +119,7 @@ build_static = @build_static@
# of a file that has the same name as the target. Listing them
# here keeps make from accidentally doing too much work (see GNU
# make manual).
-.PHONY: all clean dist distclean docs docsclean publish cscope tags codecheck admintools kernapps usertools
+.PHONY: all clean dist distclean docs docsclean publish cscope tags codecheck admintools kernapps
################################################################
# Find project subdirectories
@@ -436,8 +435,6 @@ ADMINSRC :=
# ADMINSRC_SERVER special version of ADMINSRC for tools that need server
# library
ADMINSRC_SERVER :=
-# usRSRC is source code for userland programs
-USERSRC :=
# LIBSRC is source code for libpvfs2
LIBSRC :=
# SERVERSRC is souce code for the pvfs2 server
@@ -552,13 +549,6 @@ ADMINOBJS := $(patsubst %.c,%.o, $(filte
ADMINTOOLS := $(patsubst %.c,%, $(filter %.c, $(ADMINSRC)))
# ADMINDEPENDS is a list of dependency files for admin programs
ADMINDEPENDS := $(patsubst %.c,%.d, $(filter %.c,$(ADMINSRC)))
-#
-# USEROBJS is a list of user program objects
-USEROBJS := $(patsubst %.c,%.o, $(filter %.c,$(USERSRC)))
-# USERTOOLS is a list of user program executables
-USERTOOLS := $(patsubst %.c,%, $(filter %.c, $(USERSRC)))
-# USERDEPENDS is a list of dependency files for user programs
-USERDEPENDS := $(patsubst %.c,%.d, $(filter %.c,$(USERSRC)))
ifdef BUILD_SERVER
ADMINOBJS_SERVER := $(patsubst %.c,%.o, $(filter %.c,$(ADMINSRC_SERVER)))
@@ -638,7 +628,7 @@ ifdef BUILD_BMI_ONLY
DEPENDS := $(sort $(LIBBMIDEPENDS))
else
DEPENDS := $(sort $(LIBDEPENDS) $(SERVERDEPENDS) $(SERVERBINDEPENDS) \
- $(MISCDEPENDS) $(USERDEPENDS) \
+ $(MISCDEPENDS) \
$(ADMINDEPENDS) $(ADMINDEPENDS_SERVER) $(KERNAPPDEPENDS) $(VISDEPENDS) \
$(VISMISCDEPENDS) $(KARMADEPENDS) $(STATECOMPDEPS) $(FUSEDEPENDS))
endif
@@ -650,13 +640,11 @@ endif
ifdef BUILD_BMI_ONLY
all:: $(BMILIBRARIES)
else
-all:: $(SERVER) $(KARMA) $(LIBRARIES) admintools usertools $(VISS) $(KARMA) $(FUSE)
+all:: $(SERVER) $(KARMA) $(LIBRARIES) admintools $(VISS) $(KARMA) $(FUSE)
endif
# target for building admin tools
admintools: $(ADMINTOOLS) $(ADMINTOOLS_SERVER)
-#target for building user tools
-usertools: $(USERTOOLS)
# target for building kernel driver userland programs
kernapps: $(KERNAPPS) $(KERNAPPSTHR)
@@ -861,7 +849,6 @@ $(VISS): %: %.o $(VISMISCOBJS) $(LIBRARI
# all applications depend on the pvfs2 library
$(ADMINTOOLS): %: %.o $(LIBRARIES)
$(ADMINTOOLS_SERVER): %: %.o $(LIBRARIES) lib/libpvfs2-server.a
-$(USERTOOLS): %: %.o $(LIBRARIES)
$(KERNAPPS): %: %.o $(LIBRARIES)
$(KERNAPPSTHR): %: %.o $(LIBRARIES_THREADED)
@@ -926,7 +913,6 @@ clean::
$(LIBRARIES) $(LIBRARIES_THREADED) $(DEPENDS) $(SERVER) \
$(ADMINOBJS) $(ADMINOBJS_SERVER) $(ADMINTOOLS)\
$(ADMINTOOLS_SERVER) lib/libpvfs2-server.a\
- $(USERTOOLS) $(USEROBJS) \
$(KERNAPPOBJS) $(KERNAPPS) $(KERNAPPSTHR) \
$(VISS) $(VISMISCOBJS) $(VISOBJS) $(VISDEPENDS)\
$(VISMISCDEPENDS) $(KARMAOBJS) $(LIBPICOBJS) \
@@ -957,7 +943,7 @@ ifdef BUILD_BMI_ONLY
# builds a tarball of the BMI source tree suitable for distribution
bmidist: cleaner
@sh $(srcdir)/maint/make-bmi-dist.sh $(srcdir) $(builddir) @PVFS2_VERSION@
- cp -u $(builddir)/config.save $(builddir)/config.status
+ if test -f $(builddir)/config.save; then cp -u $(builddir)/config.save $(builddir)/config.status; fi
endif
# some stuff that is cleaned in both distclean and dist targets
@@ -972,7 +958,7 @@ cleaner: clean
rm -rf autom4te*.cache
rm -f pvfs2-config.h.in~
rm -f $(srcdir)/cscope.out $(srcdir)/cscope.files
- cp -p config.status config.save
+ if test -f config.status; then cp -p config.status config.save; fi
rm -f config.log config.status config.cache
rm -f pvfs- at PVFS2_VERSION@.tar.gz
@@ -1072,7 +1058,6 @@ install:: all install_doc
install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(includedir)
install -m 644 $(srcdir)/include/pvfs2-hint.h $(includedir)
install -m 644 $(srcdir)/include/pvfs2-compat.h $(includedir)
- install -m 644 $(srcdir)/include/pvfs2-mirror.h $(includedir)
install -d $(libdir)
ifneq (,$(LIBRARIES_STATIC))
@@ -1107,15 +1092,12 @@ endif
install -d $(bindir)
install -m 755 $(ADMINTOOLS) $(bindir)
- install -m 755 $(USERTOOLS) $(bindir)
# for compatibility in case anyone really wants "lsplus"
$(LN_S) pvfs2-ls $(bindir)/pvfs2-lsplus
install -m 755 src/apps/admin/pvfs2-config $(bindir)
@# if we ever auto-generate genconfig, remove the $(srcdir)
install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(bindir)
install -m 755 $(srcdir)/src/apps/admin/pvfs2-config-convert $(bindir)
- install -m 755 $(srcdir)/src/apps/admin/pvfs2-getmattr $(bindir)
- install -m 755 $(srcdir)/src/apps/admin/pvfs2-setmattr $(bindir)
ifdef BUILD_KARMA
install -m 755 $(KARMA) $(bindir)
endif
Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -p -u -r1.388.2.7 -r1.388.2.8
--- configure 2 Sep 2009 20:15:42 -0000 1.388.2.7
+++ configure 21 May 2010 17:33:45 -0000 1.388.2.8
@@ -1401,8 +1401,8 @@ CONFIGURE_TIME=`date -u +"%Y-%m-%d-%H%M%
PVFS2_VERSION_MAJOR=2
PVFS2_VERSION_MINOR=8
PVFS2_VERSION_SUB=1
-#PVFS2_PRE=""
-PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
+PVFS2_PRE=""
+#PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB$PVFS2_VERSION_PRE
Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure.in,v
diff -p -u -r1.340.2.7 -r1.340.2.8
--- configure.in 2 Sep 2009 20:15:48 -0000 1.340.2.7
+++ configure.in 21 May 2010 17:33:50 -0000 1.340.2.8
@@ -19,8 +19,8 @@ CONFIGURE_TIME=`date -u +"%Y-%m-%d-%H%M%
PVFS2_VERSION_MAJOR=2
PVFS2_VERSION_MINOR=8
PVFS2_VERSION_SUB=1
-#PVFS2_PRE=""
-PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
+PVFS2_PRE=""
+#PVFS2_VERSION_PRE="pre1-$CONFIGURE_TIME"
PVFS2_VERSION=$PVFS2_VERSION_MAJOR.$PVFS2_VERSION_MINOR.$PVFS2_VERSION_SUB$PVFS2_VERSION_PRE
AC_SUBST(PVFS2_VERSION)
Index: module.mk.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/module.mk.in,v
diff -p -u -r1.1.72.2 -r1.1.72.3
--- module.mk.in 2 Sep 2009 20:15:48 -0000 1.1.72.2
+++ module.mk.in 21 May 2010 17:33:50 -0000 1.1.72.3
@@ -1,2 +1,3 @@
# This file is used by "make dist" to pass along parameters
# to the Makefile in release snapshots
+DIST_RELEASE = 1
More information about the Pvfs2-cvs
mailing list