From patchwork Sun Mar 7 15:45:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 47091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.samba.org (fn.samba.org [216.83.154.106]) by ozlabs.org (Postfix) with ESMTP id 869A0B7CC2 for ; Mon, 8 Mar 2010 02:45:25 +1100 (EST) Received: from fn.samba.org (localhost [127.0.0.1]) by lists.samba.org (Postfix) with ESMTP id 21B81AD139; Sun, 7 Mar 2010 08:45:26 -0700 (MST) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on fn.samba.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=3.8 tests=AWL,BAYES_00,LONGWORDS, NO_MORE_FUNN,SPF_PASS,URIBL_BLACK autolearn=no version=3.2.5 X-Original-To: linux-cifs-client@lists.samba.org Delivered-To: linux-cifs-client@lists.samba.org Received: from cdptpa-omtalb.mail.rr.com (cdptpa-omtalb.mail.rr.com [75.180.132.122]) by lists.samba.org (Postfix) with ESMTP id 4A373AD11F; Sun, 7 Mar 2010 08:45:19 -0700 (MST) X-Authority-Analysis: v=1.0 c=1 a=SbyxfsxT9D8A:10 a=20KFwNOVAAAA:8 a=oJcEYqX1xttqhgwRNtgA:9 a=Mbhhdu-OCiT-SeDk5MgA:7 a=hFT9gqvfqF0nkQ8W2D1z_lHRnH0A:4 a=jEp0ucaQiEUA:10 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:39005] helo=mail.poochiereds.net) by cdptpa-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id E0/67-21054-C0AC39B4; Sun, 07 Mar 2010 15:45:17 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 9A8BB58041; Sun, 7 Mar 2010 10:45:16 -0500 (EST) From: Jeff Layton To: linux-cifs-client@lists.samba.org, samba-technical@lists.samba.org Date: Sun, 7 Mar 2010 10:45:16 -0500 Message-Id: <1267976716-20947-1-git-send-email-jlayton@samba.org> X-Mailer: git-send-email 1.6.6.1 Subject: [linux-cifs-client] [PATCH] samba: remove cifs-utils tools from build systems X-BeenThere: linux-cifs-client@lists.samba.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: The Linux CIFS VFS client List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-cifs-client-bounces@lists.samba.org Errors-To: linux-cifs-client-bounces@lists.samba.org From: Jeff Layton Now that cifs-utils are their own project, we need to go ahead and pull them out of the samba tree. This patch represents the first step toward that end. Remove the cifs-utilities from the source3 and source4 builds. Please pay particular attention to the source4 piece. I'm not at all familiar with the build system there, and would appreciate someone sanity checking my changes. It also adds a small README.cifs-utils file in the topdir. This is optional, but I think it's a good idea to carry this for a release or two. Once this patch looks ok, I'll plan to do another patch to actually remove the client dir and the relevant docs-xml files from the tree altogether. Signed-off-by: Jeff Layton --- source3/Makefile.in | 54 ++------------------ source3/configure.in | 124 ---------------------------------------------- source4/client/config.m4 | 13 ----- source4/client/config.mk | 16 ------ source4/configure.ac | 1 - 5 files changed, 5 insertions(+), 203 deletions(-) delete mode 100644 source4/client/config.m4 diff --git a/source3/Makefile.in b/source3/Makefile.in index de70c27..739eeda 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -208,8 +208,6 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ -ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSUMOUNT_PROGS@ - BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \ bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ $(TDBBACKUP) \ @@ -1039,12 +1037,6 @@ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(LDB_OBJ) \ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \ $(LIBNDR_GEN_OBJ0) -CIFS_MOUNT_OBJ = ../client/mount.cifs.o ../client/mtab.o - -CIFS_UMOUNT_OBJ = ../client/umount.cifs.o ../client/mtab.o - -CIFS_UPCALL_OBJ = ../client/cifs.upcall.o - NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \ $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ) @@ -1358,8 +1350,8 @@ SPLIT_TOKENS_OBJ = utils/split_tokens.o \ ###################################################################### # now the rules... ###################################################################### -all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ - $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @CIFSUPCALL_PROGS@ \ +all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) \ + $(MODULES) $(NSS_MODULES) $(PAM_MODULES) \ $(EXTRA_ALL_TARGETS) basics:: @@ -1620,21 +1612,6 @@ bin/smbspool@EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $( @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) -bin/mount.cifs@EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) - @echo Linking $@ - @$(CC) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) - -bin/umount.cifs@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) - @echo Linking $@ - @$(CC) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) - -bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) - @echo Linking $@ - @$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \ - $(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \ - $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \ - $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) - bin/testparm@EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) @echo Linking $@ @$(CC) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ @@ -2973,7 +2950,7 @@ bin/split_tokens@EXEEXT@: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(L $(LDAP_LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) -install:: installservers installbin @INSTALL_CIFSMOUNT@ @INSTALL_CIFSUMOUNT@ @INSTALL_CIFSUPCALL@ installman \ +install:: installservers installbin installman \ installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \ @INSTALL_PAM_MODULES@ installlibs installmo @@ -2999,18 +2976,6 @@ installservers:: all installdirs installbin:: all installdirs @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) -installcifsmount:: @CIFSMOUNT_PROGS@ - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR) - @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ - -installcifsumount:: @CIFSUMOUNT_PROGS@ - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR) - @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUMOUNT_PROGS@ - -installcifsupcall:: @CIFSUPCALL_PROGS@ - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(SBINDIR) - @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) @CIFSUPCALL_PROGS@ - # Some symlinks are required for the 'probing' of modules. # This mechanism should go at some point.. installmodules:: modules installdirs @@ -3087,7 +3052,7 @@ showlayout:: @echo " codepagedir: $(CODEPAGEDIR)" -uninstall:: uninstallmo uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSUMOUNT@ @UNINSTALL_CIFSUPCALL@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@ +uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@ uninstallmo:: @$(SHELL) $(srcdir)/script/uninstallmo.sh $(DESTDIR) $(LOCALEDIR) $(srcdir) @@ -3101,15 +3066,6 @@ uninstallservers:: uninstallbin:: @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS) -uninstallcifsmount:: - @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ - -uninstallcifsumount:: - @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUMOUNT_PROGS@ - -uninstallcifsupcall:: - @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUPCALL_PROGS@ - uninstallmodules:: @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES) @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES) @@ -3159,7 +3115,7 @@ clean:: cleanlibs ../nsswitch/*.o ../nsswitch/*/*.o ../nsswitch/*/*/*.o ../nsswitch/*.@SHLIBEXT@ \ ../client/*.o \ */*.@SHLIBEXT@ */*/*.@SHLIBEXT@ */*/*/*.@SHLIBEXT@ \ - $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ + $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) \ $(MODULES) $(TORTURE_PROGS) \ $(EVERYTHING_PROGS) \ bin/timelimit \ diff --git a/source3/configure.in b/source3/configure.in index 7ba72bf..a1a4d44 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4332,130 +4332,6 @@ AC_ARG_WITH(automount, ) ################################################# -# check for mount- and umount.cifs support -CIFSMOUNT_PROGS="" -INSTALL_CIFSMOUNT="" -UNINSTALL_CIFSMOUNT="" -AC_MSG_CHECKING(whether to build mount.cifs) -AC_ARG_WITH(cifsmount, -[AS_HELP_STRING([--with-cifsmount], [Include mount.cifs (Linux only) support (default=yes)])], -[ case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - case "$host_os" in - *linux*) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSMOUNT,1,[Whether to build mount.cifs]) - CIFSMOUNT_PROGS="bin/mount.cifs" - INSTALL_CIFSMOUNT="installcifsmount" - UNINSTALL_CIFSMOUNT="uninstallcifsmount" - ;; - *) - AC_MSG_ERROR(not on a linux system!) - ;; - esac - ;; - esac ], -[ case "$host_os" in - *linux*) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSMOUNT,1,[Whether to build mount.cifs]) - CIFSMOUNT_PROGS="bin/mount.cifs" - INSTALL_CIFSMOUNT="installcifsmount" - UNINSTALL_CIFSMOUNT="uninstallcifsmount" - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ] -) - -CIFSUMOUNT_PROGS="" -INSTALL_CIFSUMOUNT="" -UNINSTALL_CIFSUMOUNT="" -AC_MSG_CHECKING(whether to build umount.cifs) -AC_ARG_WITH(cifsumount, -[AS_HELP_STRING([--with-cifsumount], [Include umount.cifs (Linux only) support (default=no)])], -[ case "$withval" in - yes) - case "$host_os" in - *linux*) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSUMOUNT,1,[Whether to build umount.cifs]) - CIFSUMOUNT_PROGS="bin/umount.cifs" - INSTALL_CIFSUMOUNT="installcifsumount" - UNINSTALL_CIFSUMOUNT="uninstallcifsumount" - ;; - *) - AC_MSG_ERROR(not on a linux system!) - ;; - esac - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(no) -) - -################################################# -# check for cifs.upcall support -AC_CHECK_HEADERS([keyutils.h], [HAVE_KEYUTILS_H=1], [HAVE_KEYUTILS_H=0]) -CIFSUPCALL_PROGS="" -INSTALL_CIFSUPCALL="" -UNINSTALL_CIFSUPCALL="" -AC_MSG_CHECKING(whether to build cifs.upcall) -AC_ARG_WITH(cifsupcall, -[AS_HELP_STRING([--with-cifsupcall], [Include cifs.upcall (Linux only) support (default=yes)])], -[ case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - case "$host_os" in - *linux*) - if test x"$use_ads" != x"yes"; then - AC_MSG_ERROR(ADS support should be enabled for building cifs.upcall) - elif test x"$HAVE_KEYUTILS_H" != "x1"; then - AC_MSG_ERROR(keyutils package is required for cifs.upcall) - else - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall]) - CIFSUPCALL_PROGS="bin/cifs.upcall" - INSTALL_CIFSUPCALL="installcifsupcall" - UNINSTALL_CIFSUPCALL="uninstallcifsupcall" - fi - ;; - *) - AC_MSG_ERROR(not on a linux system!) - ;; - esac - ;; - esac ], -[ case "$host_os" in - *linux*) - if test x"$use_ads" != x"yes"; then - AC_MSG_WARN(ADS support should be enabled for building cifs.upcall) - elif test x"$HAVE_KEYUTILS_H" != "x1"; then - AC_MSG_WARN(keyutils package is required for cifs.upcall) - else - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall]) - CIFSUPCALL_PROGS="bin/cifs.upcall" - INSTALL_CIFSUPCALL="installcifsupcall" - UNINSTALL_CIFSUPCALL="uninstallcifsupcall" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ] -) - - -################################################# # Check for a PAM clear-text auth, accounts, password # and session support. Most PAM implementations keep their # headers in /usr/include/security. Darwin keeps its in diff --git a/source4/client/config.m4 b/source4/client/config.m4 deleted file mode 100644 index 800320d..0000000 --- a/source4/client/config.m4 +++ /dev/null @@ -1,13 +0,0 @@ -case "$host_os" in - *linux*) - SMB_ENABLE(mount.cifs, YES) - SMB_ENABLE(umount.cifs, YES) - SMB_ENABLE(cifs.upcall, NO) # Disabled for now - ;; - *) - SMB_ENABLE(mount.cifs, NO) - SMB_ENABLE(umount.cifs, NO) - SMB_ENABLE(cifs.upcall, NO) - ;; -esac - diff --git a/source4/client/config.mk b/source4/client/config.mk index dee42d0..877544a 100644 --- a/source4/client/config.mk +++ b/source4/client/config.mk @@ -20,22 +20,6 @@ PRIVATE_DEPENDENCIES = \ smbclient_OBJ_FILES = $(clientsrcdir)/client.o -[BINARY::mount.cifs] -INSTALLDIR = BINDIR - -mount.cifs_OBJ_FILES = ../client/mount.cifs.o \ - ../client/mtab.o - -[BINARY::umount.cifs] -INSTALLDIR = BINDIR - -umount.cifs_OBJ_FILES = ../client/umount.cifs.o \ - ../client/mtab.o - -#[BINARY::cifs.upcall] -#INSTALLDIR = BINDIR -#cifs.upcall_OBJ_FILES = ../client/cifs.upcall.o - ################################# # Start BINARY cifsdd [BINARY::cifsdd] diff --git a/source4/configure.ac b/source4/configure.ac index eab1be6..ac4a0da 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -32,7 +32,6 @@ SMB_INCLUDE_MK(lib/zlib.mk) ]) m4_include(../nsswitch/nsstest.m4) m4_include(../pidl/config.m4) -m4_include(client/config.m4) AC_CONFIG_FILES(lib/registry/registry.pc) AC_CONFIG_FILES(librpc/dcerpc.pc)