From 6a2a17345af332af31d31c6c7b9ec369b17729e4 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Fri, 2 May 2014 15:50:23 -0500 Subject: [PATCH] LU-4961 build: remove libsysio and liblustre autoconf tests Remove the libsysio and liblustre tests from config/lustre-build.m4, lnet/autoconf/lustre-lnet.m4, and lustre/autoconf/lustre-core.m4, leaving a temporary AM_CONDITIONAL(LIBLUSTRE, false) in their place. Remove related bits from lustre-spec.in and debian/rules. Signed-off-by: John L. Hammond Change-Id: I9483bc9114fa0682b84e6a9014123e5838f1c1a7 Reviewed-on: http://review.whamcloud.com/10201 Tested-by: Jenkins Reviewed-by: Bob Glossman Reviewed-by: Brian J. Murrell Tested-by: Maloo Reviewed-by: Oleg Drokin --- autoMakefile.am | 17 ++++- autogen.sh | 4 -- config/lustre-build.m4 | 52 --------------- debian/.gitignore | 2 - debian/rules | 6 +- lnet/autoconf/lustre-lnet.m4 | 34 ---------- lustre.spec.in | 14 +--- lustre/autoMakefile.am | 13 +--- lustre/autoconf/lustre-core.m4 | 144 ++--------------------------------------- lustre/scripts/dkms.mkconf | 1 - 10 files changed, 26 insertions(+), 261 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index a6a8f90..2474931 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,5 +1,18 @@ -SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre -DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib +SUBDIRS := @LDISKFS_SUBDIR@ \ + . \ + @SNMP_SUBDIR@ \ + @LUSTREIOKIT_SUBDIR@ \ + @LIBCFS_SUBDIR@ \ + lnet \ + lustre + +DIST_SUBDIRS := ldiskfs \ + @SNMP_DIST_SUBDIR@ \ + lustre-iokit \ + @LIBCFS_SUBDIR@ \ + lnet \ + lustre \ + config contrib AUTOMAKE_OPTIONS = foreign diff --git a/autogen.sh b/autogen.sh index 215f339..50b5424 100644 --- a/autogen.sh +++ b/autogen.sh @@ -12,7 +12,3 @@ aclocal -I $PWD/config $ACLOCAL_FLAGS autoheader automake -a -c autoconf - -cd libsysio -echo "bootstrapping in libsysio..." -sh autogen.sh diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index 864a653..cbcd90d 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -173,44 +173,6 @@ AS_IF([test "x${!lb_pathvar}" != x -a "x${!lb_pathvar}" != xno], [ ]) # LB_ARG_LIBS_INCLUDES # -# LB_PATH_LIBSYSIO -# -# Handle internal/external libsysio -# -AC_DEFUN([LB_PATH_LIBSYSIO], [ -AC_MSG_CHECKING([location of libsysio]) -AC_ARG_WITH([sysio], - AC_HELP_STRING([--with-sysio=path], - [set path to libsysio source (default is included libsysio)]), - [], [ - AS_IF([test "x$lb_target_os" = xlinux], - [with_sysio="yes"], - [with_sysio="no"]) - ]) -AS_IF([test "x$with_sysio" = xyes], [ - AC_MSG_RESULT([internal]) - LB_CHECK_FILE([$srcdir/libsysio/src/rmdir.c], [], [ - AC_MSG_ERROR([A complete internal libsysio was not found.]) - ]) - LIBSYSIO_SUBDIR="libsysio" - SYSIO="$PWD/libsysio" - ], [test "x$with_sysio" = xno], [ - AC_MSG_RESULT([disabled]) - ], [ - AC_MSG_RESULT([$with_sysio]) - LB_CHECK_FILE([$with_sysio/lib/libsysio.a], [], [ - AC_MSG_ERROR([A complete (built) external libsysio was not found.]) - ]) - LIBSYSIO_SUBDIR="" - SYSIO=$with_sysio - with_sysio="yes" - ]) -enable_sysio=$with_sysio -# We have to configure even if we don't build here for make dist to work -AC_CONFIG_SUBDIRS([libsysio]) -]) # LB_PATH_LIBSYSIO - -# # LB_PATH_LUSTREIOKIT # # We no longer handle external lustre-iokit @@ -336,7 +298,6 @@ AS_IF([test "x$enable_dist" != xno], [ enable_utils="no" enable_tests="no" enable_modules="no" - enable_liblustre="no" ]) ]) # LB_CONFIG_DIST @@ -486,17 +447,6 @@ AM_CONDITIONAL(HAVE_PCLMULQDQ, test x$target_cpu = "xx86_64" -a x$target_vendor AS_IF([test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om"], [AC_DEFINE(HAVE_PCLMULQDQ, 1, [have PCLMULQDQ instruction])]) -# this lets lustre cancel libsysio, per-branch or if liblustre is -# disabled -AS_IF([test "x$LIBSYSIO_SUBDIR" = xlibsysio], [ - AS_IF([test "x$with_sysio" != xyes], [ - SYSIO="" - LIBSYSIO_SUBDIR="" - ]) -]) -AC_SUBST(LIBSYSIO_SUBDIR) -AC_SUBST(SYSIO) - LB_DARWIN_CONDITIONALS LIBCFS_CONDITIONALS @@ -703,13 +653,11 @@ LC_QUOTA LN_CONFIG_USERSPACE -LB_PATH_LIBSYSIO LB_PATH_SNMP LB_PATH_LUSTREIOKIT LB_DEFINE_E2FSPROGS_NAMES -LC_CONFIG_LIBLUSTRE LIBCFS_CONFIGURE LN_CONFIGURE LC_CONFIGURE diff --git a/debian/.gitignore b/debian/.gitignore index 5109e4f..4614fb8 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,6 +1,4 @@ /files -/liblustre -/liblustre.substvars /linux-patch-lustre /lustre-dev /lustre-source diff --git a/debian/rules b/debian/rules index 9c257f3..a59795f 100755 --- a/debian/rules +++ b/debian/rules @@ -100,10 +100,8 @@ autogen-stamp: patch-stamp exit 1; \ fi; \ cp /usr/share/misc/config.sub config.sub; \ - cp /usr/share/misc/config.sub libsysio/config.sub; \ cp /usr/share/misc/config.sub ldiskfs/config.sub; \ cp /usr/share/misc/config.guess config.guess; \ - cp /usr/share/misc/config.guess libsysio/config.guess; \ cp /usr/share/misc/config.guess ldiskfs/config.guess; \ sh build/autogen.sh; \ fi; \ @@ -115,10 +113,9 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in # touch files to same date, to avoid auto* find . -type f -print0 | xargs -0 touch -r COPYING; \ if [ "$(BUILDDIR)" != "." ]; then \ - mkdir -p $(BUILDDIR)/build $(BUILDDIR)/lustre/contrib $(BUILDDIR)/libsysio; \ + mkdir -p $(BUILDDIR)/build $(BUILDDIR)/lustre/contrib; \ cp build/Makefile $(BUILDDIR)/build/; \ cp lustre/contrib/mpich-*.patch $(BUILDDIR)/lustre/contrib/; \ - ln -s ../../../libsysio/include $(BUILDDIR)/libsysio/; \ fi ( cd $(BUILDDIR) && \ $(SRCDIR)/configure --disable-dependency-tracking \ @@ -346,7 +343,6 @@ kdist_config: prep-deb-files patch-stamp --disable-dependency-tracking \ --disable-doc \ --disable-utils \ - --disable-liblustre \ --disable-snmp \ --disable-zerocopy \ --disable-tests \ diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 41b1289..0456002 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -654,40 +654,6 @@ AS_IF([test "x$enable_libwrap" = xyes], [ ]) AC_SUBST(LIBWRAP) -# ---------------------------------------- -# some tests for catamount-like systems -# ---------------------------------------- -AC_MSG_CHECKING([whether to initialize libsysio]) -AC_ARG_ENABLE([sysio_init], - AC_HELP_STRING([--disable-sysio-init], - [call sysio init functions when initializing liblustre]), - [], [enable_sysio_init="yes"]) -AC_MSG_RESULT([$enable_sysio_init]) -AS_IF([test "x$enable_sysio_init" != xno], - [AC_DEFINE([INIT_SYSIO], 1, [call sysio init functions])]) - -AC_MSG_CHECKING([whether to use /dev/urandom for liblustre]) -AC_ARG_ENABLE([urandom], - AC_HELP_STRING([--disable-urandom], - [disable use of /dev/urandom for liblustre]), - [], [enable_urandom="yes"]) -AC_MSG_RESULT([$enable_urandom]) -AS_IF([test "x$enable_urandom" != xno], - [AC_DEFINE([LIBLUSTRE_USE_URANDOM], 1, - [use /dev/urandom for random data])]) - -# -------- check for -lcap support ---- - -AS_IF([test "x$enable_liblustre" = xyes], [ - CAP_LIBS="" - AC_CHECK_LIB([cap], [cap_get_proc], - [ - CAP_LIBS="-lcap" - AC_DEFINE([HAVE_LIBCAP], 1, [use libcap]) - ]) - AC_SUBST(CAP_LIBS) -]) - LN_CONFIG_MAX_PAYLOAD LN_CONFIG_USOCKLND ]) # LN_CONFIGURE diff --git a/lustre.spec.in b/lustre.spec.in index fb757d8..9673957 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -270,9 +270,9 @@ cd $RPM_BUILD_DIR/lustre-%{version} %define optflags -g -O2 -Werror CONFIGURE_ARGS="%{?configure_args} --with-release=%release" %if %{with lustre_tests} -CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests --enable-liblustre-tests" +CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests" %else -CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests" +CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests" %endif %if %{without lustre_iokit} CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit" @@ -309,8 +309,6 @@ make %{?_smp_mflags} -s %{?make_args} %install make install DESTDIR=$RPM_BUILD_ROOT -# hack to avoid changing the libsysio code for "make install" -rm -f $RPM_BUILD_ROOT%{_libdir}/libsysio.a :> lustre.files @@ -342,11 +340,6 @@ chmod -R go-w lustre-source/lustre-%{version} # fc18 needs 'x' permission for library files find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x -if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then - echo '%{_libdir}/liblustre.a' >>lustre.files - echo '%{_libdir}/liblustre.so' >>lustre.files -fi - if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then echo '%{_libdir}/libiam.a' >>lustre.files fi @@ -363,9 +356,6 @@ echo '%{_bindir}/munlink' >>lustre-tests.files %if %{with lustre_modules} echo '%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko' >>lustre-tests.files %endif -if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then - echo '%{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files -fi %endif %if %{defined cross_path} diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am index f8fa834..efe98f9 100644 --- a/lustre/autoMakefile.am +++ b/lustre/autoMakefile.am @@ -47,8 +47,6 @@ SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \ CLIENT_SUBDIRS = mdc lmv llite lclient lov osc -LIBLUSTRE_SUBDIRS = liblustre - SUBDIRS := $(ALWAYS_SUBDIRS) if SERVER @@ -59,16 +57,7 @@ if CLIENT SUBDIRS += $(CLIENT_SUBDIRS) endif -# this needs to be after the client subdirs -if LIBLUSTRE -if !CLIENT -SUBDIRS += $(CLIENT_SUBDIRS) -endif -SUBDIRS += $(LIBLUSTRE_SUBDIRS) -endif - -DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) \ - $(LIBLUSTRE_SUBDIRS) +DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) EXTRA_DIST = BUGS kernel_patches BUILDING diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 8e471bb..970593c 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -64,25 +64,6 @@ AC_DEFINE_UNQUOTED(CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, ]) # LC_CONFIG_OBD_BUFFER_SIZE # -# LC_READLINK_SSIZE_T -# -AC_DEFUN([LC_READLINK_SSIZE_T], [ -AC_CACHE_CHECK([if readlink returns ssize_t], -lb_cv_compile_readlink_ssize_t, [ -AC_TRY_COMPILE([ - #include -], [ - ssize_t readlink(const char *, char *, size_t); -], - [lb_cv_compile_readlink_ssize_t="yes"], - [lb_cv_compile_readlink_ssize_t="no"]) -]) -AS_IF([test "x$lb_cv_compile_readlink_ssize_t" = xyes], - [AC_DEFINE(HAVE_POSIX_1003_READLINK, 1, - [readlink returns ssize_t])]) -]) # LC_READLINK_SSIZE_T - -# # LC_GLIBC_SUPPORT_FHANDLES # AC_DEFUN([LC_GLIBC_SUPPORT_FHANDLES], [ @@ -172,20 +153,6 @@ AS_IF([test "x$enable_checksum" != xno], ]) # LC_CONFIG_CHECKSUM # -# LC_CONFIG_LIBLUSTRE_RECOVERY -# -AC_DEFUN([LC_CONFIG_LIBLUSTRE_RECOVERY], [ -AC_MSG_CHECKING([whether to enable liblustre recovery support]) -AC_ARG_ENABLE([liblustre-recovery], - AC_HELP_STRING([--disable-liblustre-recovery], - [disable liblustre recovery support]), - [], [enable_liblustre_recovery="yes"]) -AC_MSG_RESULT([$enable_liblustre_recovery]) -AS_IF([test "x$enable_liblustre_recovery" != xno], - [AC_DEFINE(ENABLE_LIBLUSTRE_RECOVERY, 1, [Liblustre Can Recover])]) -]) # LC_CONFIG_LIBLUSTRE_RECOVERY - -# # LC_CONFIG_HEALTH_CHECK_WRITE # # Turn off the actual write to the disk @@ -1478,7 +1445,6 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_CONFIG_PINGER LC_CONFIG_CHECKSUM - LC_CONFIG_LIBLUSTRE_RECOVERY LC_CONFIG_HEALTH_CHECK_WRITE LC_CONFIG_LRU_RESIZE LC_LLITE_LLOOP_MODULE @@ -1609,93 +1575,6 @@ AC_MSG_RESULT([$enable_client]) ]) # LC_CONFIG_CLIENT # -# LC_CONFIG_LIBLUSTRE -# -# whether to build liblustre -# -AC_DEFUN([LC_CONFIG_LIBLUSTRE], [ -AC_MSG_CHECKING([whether to build Lustre library]) -AC_ARG_ENABLE([liblustre], - AC_HELP_STRING([--enable-liblustre], - [enable building of Lustre library]), - [], []) -AC_MSG_RESULT([$enable_liblustre]) - -# only build sysio if liblustre is built -with_sysio="$enable_liblustre" - -AC_MSG_CHECKING([whether to build liblustre tests]) -AC_ARG_ENABLE([liblustre-tests], - AC_HELP_STRING([--enable-liblustre-tests], - [enable liblustre tests, if --disable-tests is used]), - [], [enable_liblustre_tests=$enable_tests]) -AS_IF([test "x$enable_liblustre" != xyes], [enable_liblustre_tests="no"]) -AC_MSG_RESULT([$enable_liblustre_tests]) - -AC_MSG_CHECKING([whether to enable liblustre acl]) -AC_ARG_ENABLE([liblustre-acl], - AC_HELP_STRING([--disable-liblustre-acl], - [disable ACL support for liblustre]), - [], [enable_liblustre_acl="yes"]) -AC_MSG_RESULT([$enable_liblustre_acl]) - -AS_IF([test "x$enable_liblustre_acl" = xyes], - [AC_DEFINE(LIBLUSTRE_POSIX_ACL, 1, - [Liblustre Support ACL-enabled MDS])]) - -# -# --enable-mpitest -# -AC_ARG_ENABLE(mpitests, - AC_HELP_STRING([--enable-mpitests=yes|no|mpicc wrapper], - [include mpi tests]), - [ - enable_mpitests="yes" - case $enableval in - yes) - MPICC_WRAPPER=mpicc - ;; - no) - enable_mpitests=no - ;; - *) - MPICC_WRAPPER=$enableval - ;; - esac - ], [ - MPICC_WRAPPER=mpicc - enable_mpitests=yes - ]) - -AS_IF([test "x$enable_mpitests" != xno], [ - oldcc=$CC - CC=$MPICC_WRAPPER - AC_MSG_CHECKING([whether mpitests can be built]) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ - #include - ]],[[ - int flag; - MPI_Initialized(&flag); - ]]) - ], [ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - enable_mpitests=no - ]) - CC=$oldcc -]) -AC_SUBST(MPICC_WRAPPER) - -AC_MSG_NOTICE([Enabling Lustre configure options for libsysio]) -ac_configure_args="$ac_configure_args --with-lustre-hack --with-sockets" - -LC_CONFIG_PINGER -LC_CONFIG_LIBLUSTRE_RECOVERY -]) - -# # LC_CONFIG_QUOTA # # whether to enable quota support global control @@ -1837,23 +1716,18 @@ AS_IF([test $target_cpu == "i686" -o $target_cpu == "x86_64"], # maximum MDS thread count LC_MDS_MAX_THREADS -# include/liblustre.h +# libcfs/include/libcfs/posix/libcfs.h +# lustre/utils/llverdev.c AC_CHECK_HEADERS([sys/user.h sys/vfs.h stdint.h blkid/blkid.h]) -# liblustre/llite_lib.h -AC_CHECK_HEADERS([xtio.h file.h]) - -# liblustre/dir.c +# libcfs/include/libcfs/linux/linux-prim.h, ... AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h]) -# liblustre/lutil.c -AC_CHECK_HEADERS([netinet/in.h arpa/inet.h catamount/data.h]) +# libcfs/libcfs/user-tcpip.c +AC_CHECK_HEADERS([netinet/in.h]) AC_CHECK_FUNCS([inet_ntoa]) -# libsysio/src/readlink.c -LC_READLINK_SSIZE_T - -# libcfs prng.c - depends on linux/types.h from liblustre/dir.c +# libcfs/include/libcfs/linux/linux-prim.h AC_CHECK_HEADERS([linux/random.h], [], [], [#ifdef HAVE_LINUX_TYPES_H #include @@ -1958,8 +1832,7 @@ AS_IF([test "x$enable_pgstat_track" = xyes], # AM_CONDITIONALS for lustre # AC_DEFUN([LC_CONDITIONALS], [ -AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes) -AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes) +AM_CONDITIONAL(LIBLUSTRE, false) AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests) AM_CONDITIONAL(CLIENT, test x$enable_client = xyes) AM_CONDITIONAL(SERVER, test x$enable_server = xyes) @@ -2003,9 +1876,6 @@ lustre/kernel_patches/targets/3.x-fc18.target lustre/ldlm/Makefile lustre/fid/Makefile lustre/fid/autoMakefile -lustre/liblustre/Makefile -lustre/liblustre/tests/Makefile -lustre/liblustre/tests/mpi/Makefile lustre/llite/Makefile lustre/llite/autoMakefile lustre/lclient/Makefile diff --git a/lustre/scripts/dkms.mkconf b/lustre/scripts/dkms.mkconf index 0015d03..6b419a1 100755 --- a/lustre/scripts/dkms.mkconf +++ b/lustre/scripts/dkms.mkconf @@ -33,7 +33,6 @@ PRE_BUILD="configure --with-zfs=\${dkms_tree}/zfs/\${ZFS_VERSION}/build --with-zfs-obj=\${dkms_tree}/zfs/\${ZFS_VERSION}/\${kernelver}/\${arch} --without-ldiskfs - --without-sysio --without-lustre-iokit --disable-snmp --disable-doc -- 1.8.3.1