diff options
author | Fahad Usman <fahad_usman@mentor.com> | 2012-12-20 07:58:23 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-21 16:45:28 +0100 |
commit | a623fd942f6561a425278cf9f114d212d06e5982 (patch) | |
tree | c5322d58897ae6964b12f58d4f6498be9aeb0808 | |
parent | 38daf64fb87bbc34caad050e7295b910c9b80e7c (diff) | |
download | meta-openembedded-a623fd942f6561a425278cf9f114d212d06e5982.tar.gz |
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.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 |
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 \ | |||
34 | --with-swatdir=${datadir}/swat \ | 34 | --with-swatdir=${datadir}/swat \ |
35 | --with-aio-support \ | 35 | --with-aio-support \ |
36 | --without-libtalloc \ | 36 | --without-libtalloc \ |
37 | --without-acl-support \ | ||
38 | --disable-avahi \ | ||
37 | samba_cv_struct_timespec=yes \ | 39 | samba_cv_struct_timespec=yes \ |
38 | libreplace_cv_HAVE_MMAP=${SAMBAMMAP}' | 40 | libreplace_cv_HAVE_MMAP=${SAMBAMMAP}' |
39 | 41 | ||
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 | |||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
4 | LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | 5 | ||
6 | PR = "r4" | 6 | PR = "r5" |
7 | 7 | ||
8 | SRC_URI += "\ | 8 | SRC_URI += "\ |
9 | file://config-h.patch \ | 9 | file://config-h.patch \ |