samba: Move cifs.patch from .inc to .bb as newer versions don't need this patch

diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index ab9ab42..e7b9212 100644 (file)
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -3,8 +3,8 @@ LICENSE = "GPL"
 DEPENDS = "readline virtual/libiconv"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-           file://cifs.patch;patch=1"
+           file://configure.patch;patch=1"
+
 S = "${WORKDIR}/samba-${PV}/source"
 
 inherit autotools

diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index ef1359c..fdbc67d 100644 (file)
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -6,6 +6,7 @@ PR = "r2"
 SRC_URI += "file://config-lfs.patch;patch=1 \
           file://init \
            file://quota.patch;patch=1;pnum=0 \
+          file://cifs.patch;patch=1 \
           "
 
 INITSCRIPT_NAME = "samba"