From 72771797f8db15f3b8cce529fc6deb335c3b50d5 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Fri, 21 Mar 2014 20:01:52 -0500 Subject: [PATCH] LU-2675 liblustre: disable liblustre by default liblustre is not used, nor is it tested, so don't build it by default. Signed-off-by: John L. Hammond Change-Id: Ie2369d0163963d6e691b3787495b1b2155fe6111 Reviewed-on: http://review.whamcloud.com/9756 Tested-by: Jenkins Reviewed-by: Dmitry Eremin Reviewed-by: Andreas Dilger Reviewed-by: Bob Glossman Tested-by: Maloo --- autoMakefile.am | 2 +- contrib/lbuild/lbuild | 1 - debian/control | 22 ---------------------- debian/control.main | 22 ---------------------- debian/liblustre.install | 1 - debian/lustre-tests.install | 1 - debian/rules | 26 +++----------------------- lustre/autoconf/lustre-core.m4 | 6 +++--- 8 files changed, 7 insertions(+), 74 deletions(-) delete mode 100644 debian/liblustre.install diff --git a/autoMakefile.am b/autoMakefile.am index 96d3b39..a6a8f90 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -132,7 +132,7 @@ debs: popd && \ VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog); \ mkdir -p debs && \ - mv ../liblustre_$${VER}_*.deb ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes ../lustre_$${VER%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/ + mv ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes ../lustre_$${VER%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/ EXTRA_DIST += config.h.in diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 8419c67..836c5b2 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -2111,7 +2111,6 @@ while [ "$1" ]; do LUSTRE_TESTS=false fi CONFIGURE_FLAGS=$@ - CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-liblustre --enable-liblustre-tests" break ;; *) diff --git a/debian/control b/debian/control index 43b04c7..950a705 100644 --- a/debian/control +++ b/debian/control @@ -67,28 +67,6 @@ Description: Test suite for the Lustre filesystem . This package provides a number of test utilities for the Lustre filesystem. -Package: liblustre -Priority: optional -Architecture: i386 powerpc amd64 ia64 -Section: libs -Depends: ${shlibs:Depends} -Description: Runtime library for Lustre filesystem utilities - Lustre is a scalable, secure, robust, highly-available cluster file system. - This release is maintained by Whamcloud, Inc. and available - http://wiki.whamcloud.com/ - . - This package provides a shared library that is used by userspace - applications to work with Lustre filesystems. It gives a user application - linked with the library access to Lustre - file systems without the need to mount Lustre (VFS) on the client. - The key goals for the library are to provide a portable mechanism to - access Lustre from different POSIX compliant operating systems, to provide - access from microkernel based systems and from the Windows operating system. - . - Currently, liblustre is still under development and only works on Linux - (i386 & x86_64, not tested on ia64). - . - Package: lustre-dev Section: libdevel Priority: optional diff --git a/debian/control.main b/debian/control.main index 43b04c7..950a705 100644 --- a/debian/control.main +++ b/debian/control.main @@ -67,28 +67,6 @@ Description: Test suite for the Lustre filesystem . This package provides a number of test utilities for the Lustre filesystem. -Package: liblustre -Priority: optional -Architecture: i386 powerpc amd64 ia64 -Section: libs -Depends: ${shlibs:Depends} -Description: Runtime library for Lustre filesystem utilities - Lustre is a scalable, secure, robust, highly-available cluster file system. - This release is maintained by Whamcloud, Inc. and available - http://wiki.whamcloud.com/ - . - This package provides a shared library that is used by userspace - applications to work with Lustre filesystems. It gives a user application - linked with the library access to Lustre - file systems without the need to mount Lustre (VFS) on the client. - The key goals for the library are to provide a portable mechanism to - access Lustre from different POSIX compliant operating systems, to provide - access from microkernel based systems and from the Windows operating system. - . - Currently, liblustre is still under development and only works on Linux - (i386 & x86_64, not tested on ia64). - . - Package: lustre-dev Section: libdevel Priority: optional diff --git a/debian/liblustre.install b/debian/liblustre.install deleted file mode 100644 index c16d59c..0000000 --- a/debian/liblustre.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/liblustre.so usr/lib diff --git a/debian/lustre-tests.install b/debian/lustre-tests.install index a6dd812..1c00088 100644 --- a/debian/lustre-tests.install +++ b/debian/lustre-tests.install @@ -1,2 +1 @@ debian/tmp/usr/lib/lustre/tests/* usr/lib/lustre/tests -debian/tmp/usr/lib/lustre/liblustre/tests/* usr/lib/lustre/tests diff --git a/debian/rules b/debian/rules index aecb8fd..9c257f3 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,6 @@ PATCH_PKG=linux-patch-lustre UTILS_PKG=lustre-utils TESTS_PKG=lustre-tests DEV_PKG=lustre-dev -LIB_PKG=liblustre SOURCE_PKG=lustre-source MODS_PKG=lustre-client-modules @@ -150,8 +149,9 @@ build-stamp: patch-stamp configure-stamp # let's try and operate as close as the user would and not build modules # here (for now) # instead we will build the modules with m-a in the "make debs" target -# binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) binary-$(LIB_PKG) binary-$(MODS_PKG) binary-kern-mods -binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) binary-$(LIB_PKG) +# binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) \ +# binary-$(MODS_PKG) binary-kern-mods +binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) binary-indep: binary-$(PATCH_PKG) binary-$(SOURCE_PKG) @@ -203,7 +203,6 @@ binary-$(UTILS_PKG): build-stamp dh_installman -p $(UTILS_PKG) dh_install -p $(UTILS_PKG) dh_makeshlibs -p $(UTILS_PKG) - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib dh_installexamples -p $(UTILS_PKG) dh_installchangelogs -p $(UTILS_PKG) lustre/ChangeLog dh_compress -p $(UTILS_PKG) @@ -222,7 +221,6 @@ binary-$(TESTS_PKG): build-stamp dh_installman -p $(TESTS_PKG) dh_install -p $(TESTS_PKG) dh_makeshlibs -p $(TESTS_PKG) - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib dh_installexamples -p $(TESTS_PKG) dh_installchangelogs -p $(TESTS_PKG) lustre/ChangeLog dh_compress -p $(TESTS_PKG) @@ -247,23 +245,6 @@ binary-$(DEV_PKG): build-stamp dh_md5sums -p $(DEV_PKG) dh_builddeb -p $(DEV_PKG) -binary-$(LIB_PKG): build-stamp - dh_testdir - dh_testroot - dh_installdirs -p $(LIB_PKG) - dh_installdocs -p $(LIB_PKG) - dh_install -p $(LIB_PKG) - dh_makeshlibs -p $(LIB_PKG) - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib - dh_installchangelogs -p $(LIB_PKG) lustre/ChangeLog - dh_compress -p $(LIB_PKG) - dh_installdeb -p $(LIB_PKG) - dh_strip -p $(LIB_PKG) - dh_fixperms -p $(LIB_PKG) - dh_gencontrol -p $(LIB_PKG) - dh_md5sums -p $(LIB_PKG) - dh_builddeb -p $(LIB_PKG) - binary-$(SOURCE_PKG): build-stamp dh_testdir dh_testroot @@ -311,7 +292,6 @@ binary-$(MODS_PKG): build-stamp dh_installdocs -p $(MODS_PKG)-$(KVER); \ dh_install -p $(MODS_PKG)-$(KVER); \ dh_makeshlibs -p $(MODS_PKG)-$(KVER); \ - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib; \ dh_installchangelogs -p $(MODS_PKG)-$(KVER) lustre/ChangeLog; \ dh_compress -p $(MODS_PKG)-$(KVER); \ dh_installdeb -p $(MODS_PKG)-$(KVER); \ diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index f92fa90..991c1e1 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1598,9 +1598,9 @@ AC_MSG_RESULT([$enable_client]) AC_DEFUN([LC_CONFIG_LIBLUSTRE], [ AC_MSG_CHECKING([whether to build Lustre library]) AC_ARG_ENABLE([liblustre], - AC_HELP_STRING([--disable-liblustre], - [disable building of Lustre library]), - [], [enable_liblustre=$with_sysio]) + AC_HELP_STRING([--enable-liblustre], + [enable building of Lustre library]), + [], []) AC_MSG_RESULT([$enable_liblustre]) # only build sysio if liblustre is built -- 1.8.3.1