From fc90c24df1b2822d734340b6004d3b2a045ac7ef Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 2 Aug 2006 18:33:30 +0000 Subject: [PATCH] fs-conv-sol26-move-20060802 Take advantage of the new platform infrastructure to move fs_conv_sol26 out of the vol directory and remove the annoying Autoconf support for optionally build it in favor of the platform support. We no longer care about upgrading inode file servers on DUX, so make fs_conv_DUX4 go away. --- src/cf/osconf.m4 | 10 ----- src/config/Makefile.config.in | 8 ---- src/platform/SOLARIS/Makefile.in | 44 ++++++++++++++++--- .../SOLARIS/fs_conv_sol26.c} | 0 src/vol/Makefile.in | 17 +------ 5 files changed, 40 insertions(+), 39 deletions(-) rename src/{vol/fs_conv_411.c => platform/SOLARIS/fs_conv_sol26.c} (100%) diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index bfc12fe49..fc757d516 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -960,16 +960,6 @@ case $AFS_SYSNAME in AC_SUBST(dest_XFS_SIZE_CHECK) ;; - sun4x_*|sunx86_*) - FS_CONV_SOL26="fs_conv_sol26" - install_FS_CONV_SOL26='$(DESTDIR)${afssrvsbindir}/fs_conv_sol26' - dest_FS_CONV_SOL26='$(DEST)/root.server/usr/afs/bin/fs_conv_sol26' - - AC_SUBST(FS_CONV_SOL26) - AC_SUBST(install_FS_CONV_SOL26) - AC_SUBST(dest_FS_CONV_SOL26) - ;; - alpha_dux*) FS_CONV_OSF40D="fs_conv_dux40D" install_FS_CONV_OSF40D='$(DESTDIR)${afssrvsbindir}/fs_conv_dux40D' diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index d7f0fe425..43a836caf 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -90,14 +90,6 @@ YACC = @YACC@ # # Special build targets # -dest_FS_CONV_OSF40D = @dest_FS_CONV_OSF40D@ -install_FS_CONV_OSF40D = @install_FS_CONV_OSF40D@ -FS_CONV_OSF40D = @FS_CONV_OSF40D@ - -dest_FS_CONV_SOL26 = @dest_FS_CONV_SOL26@ -install_FS_CONV_SOL26 = @install_FS_CONV_SOL26@ -FS_CONV_SOL26 = @FS_CONV_SOL26@ - dest_XFS_SIZE_CHECK = @dest_XFS_SIZE_CHECK@ install_XFS_SIZE_CHECK = @install_XFS_SIZE_CHECK@ XFS_SIZE_CHECK = @XFS_SIZE_CHECK@ diff --git a/src/platform/SOLARIS/Makefile.in b/src/platform/SOLARIS/Makefile.in index 39ed2af85..948a5ef18 100644 --- a/src/platform/SOLARIS/Makefile.in +++ b/src/platform/SOLARIS/Makefile.in @@ -5,10 +5,44 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -SHELL=/bin/sh +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config -# We have no platform-specific stuff for this platform (yet). -all: -install: -dest: +INCLS = ${TOP_INCDIR}/afs/afsint.h ${TOP_INCDIR}/afs/cmd.h \ + ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/param.h + +LIBS = ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \ + ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libacl.a + +all: fs_conv_sol26 + +# +# Build targets +# +fs_conv_sol26: fs_conv_sol26.o ${LIBS} + ${CC} ${CFLAGS} -o fs_conv_sol26 fs_conv_sol26.o \ + ${TOP_LIBDIR}/libcmd.a ${LIBS} ${XLIBS} + +fs_conv_sol26: ${INCLS} AFS_component_version_number.c + +# +# Installation targets +# +install: fs_conv_sol26 + ${INSTALL} -d ${DESTDIR}${afssrvsbindir} + ${INSTALL_PROGRAM} fs_conv_sol26 \ + ${DESTDIR}${afssrvsbindir}/fs_conv_sol26 + +dest: fs_conv_sol26 + ${INSTALL} -d ${DEST}/root.server/usr/afs/bin + ${INSTALL_PROGRAM} fs_conv_sol26 \ + $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 + +# +# Misc. targets +# clean: + $(RM) -f *.o *.a AFS_component_version_number.c fs_conv_sol26 + +include ../config/Makefile.version diff --git a/src/vol/fs_conv_411.c b/src/platform/SOLARIS/fs_conv_sol26.c similarity index 100% rename from src/vol/fs_conv_411.c rename to src/platform/SOLARIS/fs_conv_sol26.c diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 6cdb05957..c07e746a5 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -34,7 +34,6 @@ all: gi \ volinfo \ fssync-debug \ $(XFS_SIZE_CHECK) \ - $(FS_CONV_SOL26) \ ${TOP_INCDIR}/afs/nfs.h \ ${TOP_INCDIR}/afs/vnode.h \ ${TOP_INCDIR}/afs/viceinode.h \ @@ -123,10 +122,6 @@ install: vlib.a salvager volinfo fssync-debug ${INSTALL_PROGRAM} xfs_size_check \ ${DESTDIR}${afssrvsbindir}/xfs_size_check ; \ fi - set -x; if test x"$(install_FS_CONV_SOL26)" != x"" ; then \ - ${INSTALL_PROGRAM} fs_conv_sol26 \ - ${DESTDIR}${afssrvsbindir}/fs_conv_sol26 ; \ - fi dest: vlib.a salvager volinfo fssync-debug ${INSTALL} -d ${DEST}/lib/afs @@ -155,10 +150,6 @@ dest: vlib.a salvager volinfo fssync-debug ${INSTALL_PROGRAM} xfs_size_check \ $(DEST)/root.server/usr/afs/bin/xfs_size_check ; \ fi - set -x; if test x"$(install_FS_CONV_SOL26)" != x"" ; then \ - ${INSTALL_PROGRAM} fs_conv_sol26 \ - $(DEST)/root.server/usr/afs/bin/fs_conv_sol26 ; \ - fi # # Build targets @@ -215,12 +206,6 @@ fssync-debug: fssync-debug.o physio.o AFS_component_version_number.c ${LIBS} vol-bless: vol-bless.o physio.o ihandle.o ${LIBS} ${CC} ${CFLAGS} -o vol-bless vol-bless.o physio.o ${LIBS} ${XLIBS} -fs_conv_sol26: fs_conv_411.o ${LIBS} - ${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_sol26 fs_conv_411.o ${LIBS} ${XLIBS} - -fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c - ${CC} ${CFLAGS} -c ${srcdir}/fs_conv_411.c - xfs_size_check: xfs_size_check.c ${CC} ${CFLAGS} -o xfs_size_check ${srcdir}/xfs_size_check.c @@ -229,7 +214,7 @@ xfs_size_check: xfs_size_check.c # clean: $(RM) -f *.o *.a AFS_component_version_number.c - $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D + $(RM) -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi test: cd test; $(MAKE) -- 2.39.5