summaryrefslogtreecommitdiff
path: root/packages/samba
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2008-08-03 13:19:54 +0000
committerGraeme Gregory <dp@xora.org.uk>2008-08-03 13:19:54 +0000
commitcd603fd0a22444dd788e4aae3947abc233abb50c (patch)
tree1411f62d17466e25190884a30a90f1ed996d399e /packages/samba
parentee562034d957731d6ff6eb8d22035e1c206890a3 (diff)
parent7461c2a07f46bcbd299ca5cb4ed1c101c64a4294 (diff)
merge of '5a52ab566d209c638ed43eed3f5755590d21a427'
and '6128e85206d625ee5acd908651baae6f4d58c8c3'
Diffstat (limited to 'packages/samba')
-rw-r--r--packages/samba/samba.inc4
-rw-r--r--packages/samba/samba_3.0.23c.bb1
2 files changed, 3 insertions, 2 deletions
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"