aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFahad Usman <fahad_usman@mentor.com>2012-12-20 07:58:23 +0000
committerEric BĂ©nard <eric@eukrea.com>2013-02-15 12:16:54 +0100
commitd7930d598de7bcac854fe7d2b087b9afcc40a371 (patch)
tree41933f07f9212e562f203cd2b5040a38a3e323ba
parenta4eac0d18323b405002c53c289a13ef2afe610ed (diff)
downloadmeta-openembedded-d7930d598de7bcac854fe7d2b087b9afcc40a371.tar.gz
meta-openembedded-d7930d598de7bcac854fe7d2b087b9afcc40a371.tar.bz2
meta-openembedded-d7930d598de7bcac854fe7d2b087b9afcc40a371.zip
samba: disable avahi and build without acl
disable avahi and acl to avoid some random build failures. We do not want samba to auto-detect the presence of avahi and/or acl, explicitly disabling or enabling them guarantees a more predictable build process Signed-off-by: Fahad Usman <fahad_usman@mentor.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/samba/samba.inc2
-rw-r--r--meta-oe/recipes-connectivity/samba/samba_3.6.8.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index 416334a5d..a86c8be20 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -34,6 +34,8 @@ EXTRA_OECONF='--disable-cups \
--with-swatdir=${datadir}/swat \
--with-aio-support \
--without-libtalloc \
+ --without-acl-support \
+ --disable-avahi \
samba_cv_struct_timespec=yes \
libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'
diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
index 5722cb6e5..fc039b1d3 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -3,7 +3,7 @@ require samba-basic.inc
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r4"
+PR = "r5"
SRC_URI += "\
file://config-h.patch \