summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-03 08:02:24 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-03 08:02:24 +0000
commit0cedbe2307e9309c1de41a9eaef5876226753017 (patch)
tree1ff3c38613cf46e26ae67edebe9e7c9fea7145a5
parent3aba955b28d6209ec2e3cf50316bd74db6817914 (diff)
parente2b02623bec301743ef037687d1bbbf9bd87a778 (diff)
merge of '12e8362ccf0740454595721a242cfb8e867eb512'
and 'e7f394edea22558fdbcb02929f1540784a5265f2'
-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"