From d7930d598de7bcac854fe7d2b087b9afcc40a371 Mon Sep 17 00:00:00 2001 From: Fahad Usman Date: Thu, 20 Dec 2012 07:58:23 +0000 Subject: 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 Signed-off-by: Martin Jansa --- meta-oe/recipes-connectivity/samba/samba.inc | 2 ++ meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc index 416334a5d0..a86c8be209 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 5722cb6e57..fc039b1d3e 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 \ -- cgit 1.2.3-korg