samba: Add volatiles config for samba, fixes logging issue, bump PR

8 files changed, 11 insertions, 6 deletions

diff --git a/packages/samba/files/volatiles.03_samba b/packages/samba/files/volatiles.03_samba
new file mode 100644
index 0000000000..469bc9e7b0
--- /dev/null
+++ b/packages/samba/files/volatiles.03_samba
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d root root 0755 /var/log/samba none
diff --git a/packages/samba/samba-ads_3.2.7.bb b/packages/samba/samba-ads_3.2.7.bb
index 9a9bd12e0e..83b4416625 100644
--- a/packages/samba/samba-ads_3.2.7.bb
+++ b/packages/samba/samba-ads_3.2.7.bb
@@ -1,7 +1,7 @@
 require samba.inc
 require samba-ads.inc
 
-PR = "r0"
+PR = "r1"
 SRC_URI += "file://config-lfs.patch;patch=1 \
             file://quota.patch;patch=1;pnum=0 \
             file://configure-3.2.7.patch;patch=1 \
diff --git a/packages/samba/samba-ads_3.3.0.bb b/packages/samba/samba-ads_3.3.0.bb
index afbea8b8d0..7688fd6703 100644
--- a/packages/samba/samba-ads_3.3.0.bb
+++ b/packages/samba/samba-ads_3.3.0.bb
@@ -1,7 +1,7 @@
 require samba.inc
 require samba-ads.inc
 
-PR = "r0"
+PR = "r1"
 SRC_URI += "file://config-lfs.patch;patch=1 \
             file://quota.patch;patch=1;pnum=0 \
             file://configure-3.3.0.patch;patch=1 \
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index de93712132..0ffd4b9a13 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -3,6 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "readline virtual/libiconv"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+           file://volatiles.03_samba \
            file://smb.conf \
            file://init \
            "
@@ -72,6 +73,8 @@ do_install_append() {
 	install -d "${D}${sysconfdir}/samba"
 	install -c -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
 	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 b06544ef2e..6270ab7a13 100644
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -4,7 +4,7 @@ require samba-basic.inc
 SRC_URI += "file://configure.patch;patch=1 \
             file://cifs.patch;patch=1"
 
-PR = "r6"
+PR = "r7"
 
 PACKAGES =+ " smbfs-doc"
 
diff --git a/packages/samba/samba_3.0.34.bb b/packages/samba/samba_3.0.34.bb
index 90b8e1d029..69cf6b474c 100644
--- a/packages/samba/samba_3.0.34.bb
+++ b/packages/samba/samba_3.0.34.bb
@@ -6,7 +6,7 @@ SRC_URI += "file://configure.patch;patch=1 \
 SRC_URI_append_linux-uclibc        = "file://uclibc-strlcpy-strlcat.patch;patch=1"
 SRC_URI_append_linux-uclibcgnueabi = "file://uclibc-strlcpy-strlcat.patch;patch=1"
 
-PR = "r4"
+PR = "r5"
 
 PACKAGES =+ "smbfs-doc"
 
diff --git a/packages/samba/samba_3.2.7.bb b/packages/samba/samba_3.2.7.bb
index 70aff3d126..49ff24a646 100644
--- a/packages/samba/samba_3.2.7.bb
+++ b/packages/samba/samba_3.2.7.bb
@@ -6,7 +6,7 @@ SRC_URI += "file://configure-3.2.7.patch;patch=1 \
             file://mtab.patch;patch=1 \
 	        "
 
-PR = "r3"
+PR = "r4"
 
 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 ccdb24e20e..49432ec843 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 = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "\
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \