From 85d96d1ceab43f5646fb403e29756e83ee021963 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Tue, 19 Jul 2016 16:41:14 -0700 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-networking/recipes-daemons') 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 2a360831d..c9dffeeb2 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" -- cgit v1.2.3-54-g00ecf