From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 3 Aug 2008 03:23:32 +0000 (+0000)
Subject: samba: Move cifs.patch from .inc to .bb as newer versions don't need this patch
X-Git-Tag: Release-2010-05/1~6375^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2b02623bec301743ef037687d1bbbf9bd87a778;p=openembedded.git

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 ab9ab42372..e7b92127a8 100644
--- 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 ef1359c79b..fdbc67d1bc 100644
--- 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"