[oe-commits] [meta-openembedded] 13/19: proftpd: fix PACKAGECONFIG settings

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit d5cc5dce7c21f0d97aaf3693e1b29919dfcd50aa
Author: Joe Slater <jslater at windriver.com>
AuthorDate: Tue Jul 19 16:41:14 2016 -0700

    proftpd: fix PACKAGECONFIG settings
    
    When using '??=' to set a variable, '+=' will cause
    the '??=' value to be discarded.  We change how PACKAGECONFIG
    is defined.  We also do not make sia support a default
    since it is not likely to be available.
    
    Signed-off-by: Joe Slater <jslater at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
index 2a36083..c9dffee 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb
@@ -21,9 +21,10 @@ SRC_URI[sha256sum] = "a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67f
 
 inherit autotools-brokensep useradd update-rc.d systemd
 
-PACKAGECONFIG ??= "sia shadow"
-PACKAGECONFIG += " ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
-PACKAGECONFIG += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG ??= "shadow \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                  "
 
 PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses"
 PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl, openssl"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.