aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorChris Patterson <pattersonc@ainfosec.com>2015-12-18 15:49:40 -0500
committerMartin Jansa <Martin.Jansa@gmail.com>2016-01-14 11:22:08 +0100
commit5556fb4d26cd40b5bc49f8edfaa56c63ae7810b7 (patch)
tree85358faa66ab32fd0b5de2e53c2d1966934e4842 /meta-networking
parent896fac20c9cd1db3e8a87daa5d84a31b011fe1da (diff)
downloadmeta-openembedded-contrib-5556fb4d26cd40b5bc49f8edfaa56c63ae7810b7.tar.gz
strongswan: add additional PACKAGECONFIG flags
- Add aesni, charon, gmp, openssl, scep, stroke, swanctl, and systemd-charon. - Organize the packageconfig list alphabetically. - Update the default PACKAGECONFIG to match current defaults. - If swanctl is enabled, use strongswan-swanctl.service instead of strongswan.service. Signed-off-by: Chris Patterson <pattersonc@ainfosec.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb24
1 files changed, 17 insertions, 7 deletions
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
index a231a90ac9..df7b4966c0 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
@@ -14,21 +14,31 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c"
SRC_URI[sha256sum] = "a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225"
-EXTRA_OECONF = "--enable-gmp \
- --enable-openssl \
+EXTRA_OECONF = " \
--without-lib-prefix \
"
EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
-PACKAGECONFIG ??= "sqlite3 curl \
+
+PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \
${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \
"
-PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,"
-PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,"
+PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,"
+PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,"
-PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,"
+PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,"
+PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,"
PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
+PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,"
+PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient,"
+PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,"
+PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,"
+PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,"
+PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc"
+
+# requires swanctl
+PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd,"
inherit autotools systemd pkgconfig
@@ -42,4 +52,4 @@ FILES_${PN}-staticdev += "${libdir}/ipsec/*.a ${libdir}/ipsec/plugins/*.a"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}-swanctl.service', '${BPN}.service', d)}"