[samba] use version 3.0.37

diff --git a/meta-openvuplus/recipes-connectivity/samba/samba-basic.inc b/meta-openvuplus/recipes-connectivity/samba/samba-basic.inc
new file mode 100644 (file)
index 0000000..f0a9bd7
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/samba/samba-basic.inc
@@ -0,0 +1,20 @@
+SRC_URI += "file://config-lfs.patch \
+            file://quota.patch;striplevel=0 \
+            "
+
+EXTRA_OECONF += "\
+        --without-ads \
+        --without-winbind \
+        --without-ldap \
+        --without-krb5"
+
+PACKAGES =+ "libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
+
+FILES_libnetapi = "${libdir}/libnetapi.so.*"
+FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*"
+FILES_libtdb = "${libdir}/libtdb.so.*"
+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_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"

diff --git a/meta-openvuplus/recipes-connectivity/samba/samba.inc b/meta-openvuplus/recipes-connectivity/samba/samba.inc
new file mode 100644 (file)
index 0000000..d3ff384
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/samba/samba.inc
@@ -0,0 +1,89 @@
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "readline virtual/libiconv talloc"
+
+SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+           file://volatiles.03_samba \
+           file://smb.conf \
+           file://init \
+           file://tdb.pc \
+           "
+
+S = "${WORKDIR}/samba-${PV}/source"
+
+inherit autotools-brokensep update-rc.d
+
+FILES_${PN}     += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \
+                    ${libdir}/auth/*.so ${libdir}/security/*.so"
+FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \
+                    ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so"
+
+SAMBAMMAP = "no"
+SAMBAMMAP_libc-glibc = "yes"
+
+# The file system settings --foodir=dirfoo and overridden unconditionally
+# in the samba config by --with-foodir=dirfoo - even if the --with is not
+# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
+EXTRA_OECONF='--disable-cups \
+              --with-readline=${STAGING_LIBDIR}/.. \
+              --with-libiconv=${STAGING_LIBDIR}/.. \
+              --without-automount \
+              --with-configdir=${sysconfdir}/samba \
+              --with-privatedir=${sysconfdir}/samba/private \
+              --with-lockdir=${localstatedir}/lock \
+              --with-piddir=${localstatedir}/run \
+              --with-logfilebase=${localstatedir}/log \
+              --with-libdir=${libdir} \
+              --with-mandir=${mandir} \
+              --with-swatdir=${datadir}/swat \
+              --with-aio-support \
+              --without-libtalloc \
+              samba_cv_struct_timespec=yes \
+              libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'
+
+INITSCRIPT_NAME = "samba"
+# No dependencies, goes in at level 20 (NOTE: take care with the
+# level, later levels put the shutdown later too - see the links
+# in rc6.d, the shutdown must precede network shutdown).
+INITSCRIPT_PARAMS = "defaults"
+CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
+
+do_configure_prepend () {
+       ./script/mkversion.sh
+       if [ ! -e acinclude.m4 ]; then
+               touch aclocal.m4        
+               cat aclocal.m4 > acinclude.m4
+       fi
+}
+
+do_compile () {
+       oe_runmake proto_exists
+       base_do_compile
+}
+
+do_install_append() {
+       install -d ${D}${libdir}/pkgconfig/
+       cp ${WORKDIR}/tdb.pc ${D}${libdir}/pkgconfig/
+       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}${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}/
+
+       # 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
+       rmdir ${D}/var/run
+}
+

diff --git a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bb b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bb
index eb05c71..13949da 100644 (file)
--- a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bb
+++ b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bb
@@ -1,5 +1,5 @@
-require recipes-connectivity/samba/samba.inc
-require recipes-connectivity/samba/samba-basic.inc
+require samba.inc
+require samba-basic.inc
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 PR = "r2"

diff --git a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
index bbbfc66..77f43ba 100644 (file)
--- a/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
+++ b/meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
@@ -1,4 +1,4 @@
-PR .= "-vuplus3"
+PR .= "-vuplus0"
 
 SRC_URI += " \
        file://01samba-kill \