diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2019-06-24 12:49:59 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-06-25 14:21:48 -0700 |
| commit | 8d119c80fb6fa18a78f9506e46eaace5439c1c5e (patch) | |
| tree | d6f46bfc134dfb17302d972518aa62af6285108c /meta-networking | |
| parent | 5fc4c10a19d1430a96a4b589bd3aeef70120aa2a (diff) | |
| download | meta-openembedded-contrib-8d119c80fb6fa18a78f9506e46eaace5439c1c5e.tar.gz | |
strongswan: upgrade 5.7.1 -> 5.8.0
Rename systemd service units since it uses strongswan-starter.service
for the legacy unit and strongswan.service for the modern one.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/strongswan/strongswan_5.8.0.bb (renamed from meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb) | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb b/meta-networking/recipes-support/strongswan/strongswan_5.8.0.bb index 5a4e2d36f8..fa1bd975ce 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.8.0.bb @@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "86b7e9321cde075cf382268fd282e0b0" -SRC_URI[sha256sum] = "006f9c9126e2a2f4e7a874b5e1bd2abec1bbbb193c8b3b3a4c6ccd8c2d454bec" +SRC_URI[md5sum] = "e05f2d16a7479a2a9591609c256d523a" +SRC_URI[sha256sum] = "15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" @@ -23,7 +23,6 @@ EXTRA_OECONF = " \ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \ " @@ -48,7 +47,7 @@ inherit autotools systemd pkgconfig RRECOMMENDS_${PN} = "kernel-module-ipsec" FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la" FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" @@ -131,4 +130,4 @@ RDEPENDS_${PN} += "\ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}-swanctl.service', '${BPN}.service', d)}" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} ${BPN}-starter.service" |