From 7ed96138be05abe18e5a0cf43f9290278386ca17 Mon Sep 17 00:00:00 2001
From: ikseong <ikseong@dev03-server.(none)>
Date: Fri, 4 Jun 2010 19:30:41 +0900
Subject: [PATCH] modify recipes/samba

modify samba.inc with vuplus SRC_URI_append, PACKAGES, PROVIDES_append, CONFFILES_${PN}, do_install_prepand, co_install_append.
modify samba.inc with opendreambox to block PACKAGES on line 47.
add files in files/vuplus/ : 01samba-kill, 01samba-start, smb.conf.
---
 recipes/samba/files/vuplus/01samba-kill  |  5 +++++
 recipes/samba/files/vuplus/01samba-start |  3 +++
 recipes/samba/files/vuplus/smb.conf      | 28 ++++++++++++++++++++++++++++
 recipes/samba/samba.inc                  | 21 ++++++++++++++++++++-
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100755 recipes/samba/files/vuplus/01samba-kill
 create mode 100755 recipes/samba/files/vuplus/01samba-start
 create mode 100755 recipes/samba/files/vuplus/smb.conf
 mode change 100644 => 100755 recipes/samba/samba.inc

diff --git a/recipes/samba/files/vuplus/01samba-kill b/recipes/samba/files/vuplus/01samba-kill
new file mode 100755
index 0000000..41f7781
--- /dev/null
+++ b/recipes/samba/files/vuplus/01samba-kill
@@ -0,0 +1,5 @@
+#!/bin/sh
+killall -9 smbd
+rm -rf /var/log/log.smbd
+killall -9 nmbd
+rm -rf /var/log/log.nmbd
diff --git a/recipes/samba/files/vuplus/01samba-start b/recipes/samba/files/vuplus/01samba-start
new file mode 100755
index 0000000..ce397ad
--- /dev/null
+++ b/recipes/samba/files/vuplus/01samba-start
@@ -0,0 +1,3 @@
+#!/bin/sh
+nmbd -D
+smbd -D
diff --git a/recipes/samba/files/vuplus/smb.conf b/recipes/samba/files/vuplus/smb.conf
new file mode 100755
index 0000000..ea08f1b
--- /dev/null
+++ b/recipes/samba/files/vuplus/smb.conf
@@ -0,0 +1,28 @@
+[global]
+   load printers = no
+   guest account = root
+   log file = /tmp/smb.log
+   log level = 1
+   security = share
+   server string = Vuplus %h network services
+   workgroup = Vuplus
+   netbios name = %h
+   case sensitive=yes
+   preserve case=yes
+   short preserve case=yes
+   socket options = TCP_NODELAY
+   preferred master = no ;(These stop the machine being master browser, which means that it doesn't waste time there.)
+
+[Configuration]
+  comment = Configuration files - take care!
+  path = /var
+  read only = no
+  public = yes
+  guest ok = yes
+
+[Harddisk]
+  comment = The harddisk
+  path = /hdd
+  read only = no
+  public = yes
+  guest ok = yes
diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc
old mode 100644
new mode 100755
index 951f719..ebb4363
--- a/recipes/samba/samba.inc
+++ b/recipes/samba/samba.inc
@@ -13,6 +13,10 @@ SRC_URI_append_opendreambox = " \
 	file://01samba-kill \
 	file://01samba-start"
 
+SRC_URI_append_vuplus = " \
+	file://01samba-kill \
+	file://01samba-start"
+
 S = "${WORKDIR}/samba-${PV}/source"
 
 inherit autotools update-rc.d
@@ -40,7 +44,8 @@ EXTRA_OECONF='--disable-cups \
               samba_cv_struct_timespec=yes'
 
 PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc"
-PACKAGES =+ "${@base_conditional('DISTRO', 'opendreambox', ' sambaserver libpopt libtalloc libtdb', '', d)}"
+PACKAGES_opendreambox =+ "${@base_conditional('DISTRO', 'opendreambox', ' sambaserver libpopt libtalloc libtdb', '', d)}"
+PACKAGES_vuplus =+ "${@base_conditional('DISTRO', 'vuplus', ' sambaserver libpopt libtalloc libtdb', '', d)}"
 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"
 FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
@@ -55,6 +60,7 @@ FILES_libtalloc = "${libdir}/libtalloc.so.*"
 FILES_libtdb = "${libdir}/libtdb.so.*"
 
 PROVIDES_append_opendreambox = " sambaserver libpopt libtalloc libtdb"
+PROVIDES_append_vuplus = " sambaserver libpopt libtalloc libtdb"
 
 INITSCRIPT_NAME = "samba"
 # No dependencies, goes in at level 20 (NOTE: take care with the
@@ -65,6 +71,7 @@ CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
 
 CONFFILES_sambaserver = "${sysconfdir}/samba/smb.conf"
 CONFFILES_${PN}_opendreambox = ""
+CONFFILES_${PN}_vuplus = ""
 
 do_configure_prepend () {
 	./script/mkversion.sh
@@ -116,6 +123,18 @@ do_install_append_opendreambox() {
 	install -m 0755 ${WORKDIR}/01samba-start ${D}/etc/network/if-up.d
 }
 
+do_install_prepend_vuplus() {
+	install -c -m 644 ${WORKDIR}/smb.conf ../examples/smb.conf.default
+}
+
+do_install_append_vuplus() {
+	install -d ${D}/etc/samba/private
+	install -d ${D}/etc/network/if-down.d
+	install -m 0755 ${WORKDIR}/01samba-kill ${D}/etc/network/if-down.d
+	install -d ${D}/etc/network/if-up.d
+	install -m 0755 ${WORKDIR}/01samba-start ${D}/etc/network/if-up.d
+}
+
 do_stage() {
 	install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
 	oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
-- 
2.7.4