From 393f84b9bb5a832a3af3aa520b307c547614d1d8 Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Sat, 14 Feb 2009 00:11:22 +0000 Subject: samba: Remove package smbfs from > 3.2.4 as these utilities don't exist anymore. Fix a linking issue for samba-ads-3.3.0 by reverting some changes since 3.2.x. --- packages/samba/samba-ads-3.3.0/wbstatic.patch | 194 ++++++++++++++++++++++++++ packages/samba/samba-ads.inc | 4 +- packages/samba/samba-ads_3.2.8.bb | 2 +- packages/samba/samba-ads_3.3.0.bb | 3 +- packages/samba/samba-basic.inc | 4 +- packages/samba/samba.inc | 22 +-- packages/samba/samba_3.0.23c.bb | 7 +- packages/samba/samba_3.0.34.bb | 5 +- packages/samba/samba_3.2.8.bb | 2 +- packages/samba/samba_3.3.0.bb | 2 +- 10 files changed, 220 insertions(+), 25 deletions(-) create mode 100644 packages/samba/samba-ads-3.3.0/wbstatic.patch diff --git a/packages/samba/samba-ads-3.3.0/wbstatic.patch b/packages/samba/samba-ads-3.3.0/wbstatic.patch new file mode 100644 index 0000000000..1d2260cb55 --- /dev/null +++ b/packages/samba/samba-ads-3.3.0/wbstatic.patch @@ -0,0 +1,194 @@ +diff -urN source.old//Makefile.in source//Makefile.in +--- source.old//Makefile.in 2009-01-26 13:56:34.000000000 +0000 ++++ source//Makefile.in 2009-02-13 22:53:43.197061293 +0000 +@@ -690,7 +690,7 @@ + $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \ + $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \ + $(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \ +- $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) @LIBWBCLIENT_STATIC@ \ ++ $(SMBLDAP_OBJ) $(LDB_OBJ) $(LIBNET_OBJ) bin/libwbclient.a \ + $(LIBSMBCONF_OBJ) \ + $(PRIVILEGES_BASIC_OBJ) + +@@ -725,7 +725,7 @@ + web/swat.o web/neg_lang.o + + SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \ +- $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(KRBCLIENT_OBJ) \ ++ $(LOCKING_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(KRBCLIENT_OBJ) \ + $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \ + $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \ + $(PASSCHANGE_OBJ) $(LDB_OBJ) +@@ -745,7 +745,7 @@ + $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \ + rpc_client/cli_pipe.o librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \ + $(RPC_CLIENT_OBJ1) \ +- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \ ++ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \ + $(LIBMSRPC_GEN_OBJ) + + TESTPARM_OBJ = utils/testparm.o \ +@@ -755,18 +755,18 @@ + PASSWD_UTIL_OBJ = utils/passwd_util.o + + SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \ +- $(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \ ++ $(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \ + $(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \ + $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \ + $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ) + +-PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \ ++PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \ + $(LIBSAMBA_OBJ) \ + $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \ + $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \ + $(LDB_OBJ) + +-SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@ ++SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1) bin/libwbclient.a + + DISPLAY_SEC_OBJ= lib/display_sec.o + +@@ -782,7 +782,7 @@ + + RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \ + $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \ +- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \ ++ $(RPC_PARSE_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \ + $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \ + $(LIBADS_OBJ) $(POPT_LIB_OBJ) \ + $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) +@@ -810,7 +810,7 @@ + $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \ + $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) + +-LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@ ++LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) bin/libwbclient.a + + # This shared library is intended for linking with unit test programs + # to test Samba internals. It's called libbigballofmud.so to +@@ -819,7 +819,7 @@ + LIBBIGBALLOFMUD_MAJOR = 0 + + LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ +- $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ \ ++ $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) bin/libwbclient.a \ + $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) + + CLIENT_OBJ1 = client/client.o client/clitar.o rpc_client/cli_pipe.o \ +@@ -831,7 +831,7 @@ + CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \ + $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \ + $(READLINE_OBJ) $(POPT_LIB_OBJ) \ +- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ ++ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ + $(DISPLAY_SEC_OBJ) + + LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \ +@@ -886,7 +886,7 @@ + $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \ + $(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \ + $(LIBSMBCONF_OBJ) \ +- @LIBWBCLIENT_STATIC@ \ ++ bin/libwbclient.a \ + $(PRIVILEGES_BASIC_OBJ) + + CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ +@@ -926,7 +926,7 @@ + $(LIBNDR_GEN_OBJ0) + + PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ +- $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \ ++ $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \ + $(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \ + $(LIBNDR_GEN_OBJ0) + +@@ -942,14 +942,14 @@ + + SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ + $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \ +- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \ ++ $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \ + $(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ) + + SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ + $(PARAM_OBJ) \ + $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \ + $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \ +- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) ++ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) + + EVTLOGADM_OBJ0 = utils/eventlogadm.o + +@@ -988,7 +988,7 @@ + + PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ + pam_smbpass/pam_smb_acct.o pam_smbpass/support.o +-PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \ ++PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \ + $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ + $(LDB_OBJ) + +@@ -1036,7 +1036,7 @@ + smbd/connection.o + + WINBINDD_OBJ = \ +- $(WINBINDD_OBJ1) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \ ++ $(WINBINDD_OBJ1) $(PASSDB_OBJ) bin/libwbclient.a $(GROUPDB_OBJ) \ + $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ + $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \ + $(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \ +@@ -1047,7 +1047,7 @@ + + WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ + $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \ +- lib/winbind_util.o $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ ++ lib/winbind_util.o $(WBCOMMON_OBJ) bin/libwbclient.a + + WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@ + +@@ -1111,7 +1111,7 @@ + $(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \ + $(PASSDB_OBJ) $(GROUPDB_OBJ) \ + $(SMBLDAP_OBJ) $(LIBNMB_OBJ) \ +- $(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \ ++ $(LDB_OBJ) $(WBCOMMON_OBJ) bin/libwbclient.a \ + $(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1) + + +@@ -1120,14 +1120,14 @@ + VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \ + $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \ + $(READLINE_OBJ) $(POPT_LIB_OBJ) \ +- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ ++ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ + $(DISPLAY_SEC_OBJ) + + RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \ + $(LIBSMB_OBJ) \ + $(PARAM_OBJ) \ + $(PASSDB_OBJ) \ +- @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \ ++ bin/libwbclient.a $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \ + $(LIB_NONSMBD_OBJ) \ + $(KRBCLIENT_OBJ) \ + $(RPC_PARSE_OBJ2) \ +@@ -1743,7 +1743,7 @@ + LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@ + LIBWBCLIENT_SHARED_TARGET_SONAME=$(LIBWBCLIENT_SHARED_TARGET).$(LIBWBCLIENT_SOVER) + LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@ +-LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@ ++LIBWBCLIENT=bin/libwbclient.a @LIBWBCLIENT_SHARED@ + LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@ + LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h + +@@ -1880,7 +1880,7 @@ + $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \ + $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ + $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \ +- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ ++ $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ + $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \ + auth/token_util.o + diff --git a/packages/samba/samba-ads.inc b/packages/samba/samba-ads.inc index fee61a7a81..e2f77b8cd9 100644 --- a/packages/samba/samba-ads.inc +++ b/packages/samba/samba-ads.inc @@ -18,21 +18,19 @@ EXTRA_OECONF += "\ --with-ads \ " -PACKAGES =+ "libsmbclient-ads libsmbclient-ads-dev cifs-ads cifs-ads-doc smbfs-ads swat-ads" +PACKAGES =+ "libsmbclient-ads libsmbclient-ads-dev cifs-ads cifs-ads-doc swat-ads" RCONFLICTS_${PN} = "samba" RCONFLICTS_libsmbclient-ads = "libsmbclient" RCONFLICTS_libsmbclient-ads-dev = "libsmbclient-dev" RCONFLICTS_cifs-ads = "cifs" RCONFLICTS_cifs-ads-doc = "cifs-doc" -RCONFLICTS_smbfs-ads = "smbfs" RCONFLICTS_swat-ads = "swat" FILES_cifs-ads = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" FILES_cifs-ads-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" FILES_libsmbclient-ads = "${libdir}/libsmbclient.so.*" FILES_libsmbclient-ads-dev = "${libdir}/libsmbclient.so ${includedir}" -FILES_smbfs-ads = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb" FILES_swat-ads = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" do_configure() { diff --git a/packages/samba/samba-ads_3.2.8.bb b/packages/samba/samba-ads_3.2.8.bb index 944fc792e0..95f09c16cb 100644 --- a/packages/samba/samba-ads_3.2.8.bb +++ b/packages/samba/samba-ads_3.2.8.bb @@ -1,7 +1,7 @@ require samba.inc require samba-ads.inc -PR = "r1" +PR = "r2" SRC_URI += "file://config-lfs.patch;patch=1 \ file://quota.patch;patch=1;pnum=0 \ file://configure-3.2.8.patch;patch=1 \ diff --git a/packages/samba/samba-ads_3.3.0.bb b/packages/samba/samba-ads_3.3.0.bb index a2f2e2c47a..9fd4303143 100644 --- a/packages/samba/samba-ads_3.3.0.bb +++ b/packages/samba/samba-ads_3.3.0.bb @@ -1,12 +1,13 @@ require samba.inc require samba-ads.inc -PR = "r2" +PR = "r3" SRC_URI += "file://config-lfs.patch;patch=1 \ file://quota.patch;patch=1;pnum=0 \ file://configure-3.3.0.patch;patch=1 \ file://config-h.patch;patch=1 \ file://mtab.patch;patch=1 \ + file://wbstatic.patch;patch=1 \ " do_compile () { diff --git a/packages/samba/samba-basic.inc b/packages/samba/samba-basic.inc index 54c54baad8..f1bda65286 100644 --- a/packages/samba/samba-basic.inc +++ b/packages/samba/samba-basic.inc @@ -8,19 +8,17 @@ EXTRA_OECONF += "\ --without-ldap \ --without-krb5" -PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs swat" +PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc swat" RCONFLICTS_${PN} = "samba-ads" RCONFLICTS_libsmbclient = "libsmbclient-ads" RCONFLICTS_libsmbclient-dev = "libsmbclient-ads-dev" RCONFLICTS_cifs = "cifs-ads" RCONFLICTS_cifs-doc = "cifs-ads-doc" -RCONFLICTS_smbfs = "smbfs-ads" RCONFLICTS_swat = "swat-ads" FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" FILES_libsmbclient = "${libdir}/libsmbclient.so.*" FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}" -FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb" FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index 0ffd4b9a13..36de08beca 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -24,7 +24,6 @@ EXTRA_OECONF='--disable-cups \ --with-readline=${STAGING_LIBDIR}/.. \ --with-libiconv=${STAGING_LIBDIR}/.. \ --without-automount \ - --with-smbmount \ --with-configdir=${sysconfdir}/samba \ --with-privatedir=${sysconfdir}/samba/private \ --with-lockdir=${localstatedir}/lock \ @@ -59,22 +58,23 @@ do_install_append() { mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so mkdir -p ${D}${base_sbindir} - rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs - ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb - ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs rm -f ${D}${bindir}/*.old rm -f ${D}${sbindir}/*.old [ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/ [ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/ - install -d "${D}/var/log/samba" - install -d "${D}${sysconfdir}/init.d" - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba - install -d "${D}${sysconfdir}/samba" - install -c -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + # This is needed for < 3.2.4 + rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs + if [ -f ${D}${bindir}/smbmount ]; then + ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb + ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs + fi + + install -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba + install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba + install -d ${D}/var/log/samba install -d ${D}/var/spool/samba - - install -D -m 0644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba } do_stage() { diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb index 6270ab7a13..c08dc04cce 100644 --- a/packages/samba/samba_3.0.23c.bb +++ b/packages/samba/samba_3.0.23c.bb @@ -6,10 +6,13 @@ SRC_URI += "file://configure.patch;patch=1 \ PR = "r7" -PACKAGES =+ " smbfs-doc" +EXTRA_OECONF += "\ + --with-smbmount \ + " +PACKAGES =+ " smbfs smbfs-doc" RCONFLICTS_smbfs-doc = "smbfs-ads-doc" - +FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb" FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8" do_compile () { diff --git a/packages/samba/samba_3.0.34.bb b/packages/samba/samba_3.0.34.bb index 69cf6b474c..d43c50dcdb 100644 --- a/packages/samba/samba_3.0.34.bb +++ b/packages/samba/samba_3.0.34.bb @@ -8,14 +8,15 @@ SRC_URI_append_linux-uclibcgnueabi = "file://uclibc-strlcpy-strlcat.patch;patch= PR = "r5" -PACKAGES =+ "smbfs-doc" +PACKAGES =+ " smbfs smbfs-doc" +FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb" RCONFLICTS_smbfs-doc = "smbfs-ads-doc" - FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ + --with-smbmount \ " do_stage() { diff --git a/packages/samba/samba_3.2.8.bb b/packages/samba/samba_3.2.8.bb index 57f5753fce..2e2cb959f8 100644 --- a/packages/samba/samba_3.2.8.bb +++ b/packages/samba/samba_3.2.8.bb @@ -6,7 +6,7 @@ SRC_URI += "file://configure-3.2.8.patch;patch=1 \ file://mtab.patch;patch=1 \ " -PR = "r0" +PR = "r1" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ diff --git a/packages/samba/samba_3.3.0.bb b/packages/samba/samba_3.3.0.bb index 49432ec843..6270c8c0d7 100644 --- a/packages/samba/samba_3.3.0.bb +++ b/packages/samba/samba_3.3.0.bb @@ -12,7 +12,7 @@ SRC_URI += "file://configure-3.3.0.patch;patch=1 \ file://mtab.patch;patch=1 \ " -PR = "r1" +PR = "r2" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ -- cgit v1.2.3