diff options
author | Jate Sujjavanich <jate.sujjavanich@myfuelmaster.com> | 2014-04-07 11:47:02 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-20 13:14:56 +0200 |
commit | 84d2791e40a359a8f6c360f6ed1d6476f4b8d46e (patch) | |
tree | a513710b160e1869fff5182a5573785b4123e0e1 /meta-oe/recipes-connectivity | |
parent | 229e641a97e66be3ef7f5f35c1f566c20060ca8f (diff) | |
download | meta-openembedded-84d2791e40a359a8f6c360f6ed1d6476f4b8d46e.tar.gz |
samba: Add talloc PACKAGECONFIG
* fix DEPENDS which was triggering rebuild
Use PACKAGECONFIG to properly provide the option for libtalloc
Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r-- | meta-oe/recipes-connectivity/samba/samba.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc index 87352a1cb..59c671276 100644 --- a/meta-oe/recipes-connectivity/samba/samba.inc +++ b/meta-oe/recipes-connectivity/samba/samba.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | SECTION = "console/network" | 1 | SECTION = "console/network" |
2 | LICENSE = "GPL-3.0" | 2 | LICENSE = "GPL-3.0" |
3 | DEPENDS = "readline virtual/libiconv talloc zlib popt" | 3 | DEPENDS = "readline virtual/libiconv zlib popt" |
4 | 4 | ||
5 | SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ | 5 | SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ |
6 | file://volatiles.03_samba \ | 6 | file://volatiles.03_samba \ |
@@ -35,7 +35,6 @@ EXTRA_OECONF='--disable-cups \ | |||
35 | --with-aio-support \ | 35 | --with-aio-support \ |
36 | --with-winbind \ | 36 | --with-winbind \ |
37 | --with-wbclient \ | 37 | --with-wbclient \ |
38 | --without-libtalloc \ | ||
39 | --without-acl-support \ | 38 | --without-acl-support \ |
40 | --disable-avahi \ | 39 | --disable-avahi \ |
41 | samba_cv_struct_timespec=yes \ | 40 | samba_cv_struct_timespec=yes \ |
@@ -44,6 +43,7 @@ EXTRA_OECONF='--disable-cups \ | |||
44 | PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 43 | PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" |
45 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" | 44 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" |
46 | PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin" | 45 | PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin" |
46 | PACKAGECONFIG[talloc] = "--with-libtalloc,--without-libtalloc,talloc" | ||
47 | 47 | ||
48 | INITSCRIPT_PACKAGES = "samba winbind" | 48 | INITSCRIPT_PACKAGES = "samba winbind" |
49 | INITSCRIPT_NAME_samba = "samba" | 49 | INITSCRIPT_NAME_samba = "samba" |