[meta-networking,1/4] strongswan: provide PACKAGECONFIG for cureve25519

Message ID 20211227025025.1211176-1-akuster808@gmail.com
State New
Headers show
Series [meta-networking,1/4] strongswan: provide PACKAGECONFIG for cureve25519 | expand

Commit Message

akuster808 Dec. 27, 2021, 2:50 a.m. UTC
Not everyone wants this to be installed by default. Enable to remove
cureve25519 is someone wants to.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-support/strongswan/strongswan_5.9.4.bb            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Anders Montonen Dec. 27, 2021, 8:39 a.m. UTC | #1
Hi,

s/cureve25519/curve25519/g

-a

> On 27 Dec 2021, at 4:50, Armin Kuster <akuster808@gmail.com> wrote:
> 
> Not everyone wants this to be installed by default. Enable to remove
> cureve25519 is someone wants to.
> 
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
> .../recipes-support/strongswan/strongswan_5.9.4.bb            | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
> index 45500df01..a031c54f5 100644
> --- a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
> +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
> @@ -23,7 +23,7 @@ EXTRA_OECONF = " \
> 
> EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
> 
> -PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl \
> +PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl cureve25519\
>         ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \
> "
> PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni"
> @@ -41,6 +41,7 @@ PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-sou
> PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite"
> PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke"
> PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc"
> +PACKAGECONFIG[cureve25519] = "--enable-curve25519,--disable-curve25519,, ${PN}-plugin-curve25519"
> 
> # requires swanctl
> PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd,"
> @@ -130,7 +131,6 @@ RDEPENDS:${PN} += "\
>     ${PN}-plugin-x509 \
>     ${PN}-plugin-xauth-generic \
>     ${PN}-plugin-xcbc \
> -    ${PN}-plugin-curve25519 \
>     "
> 
> RPROVIDES:${PN} += "${PN}-systemd"
> -- 
> 2.25.1
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#94500): https://lists.openembedded.org/g/openembedded-devel/message/94500
> Mute This Topic: https://lists.openembedded.org/mt/87972450/3618057
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [Anders.Montonen@iki.fi]
> -=-=-=-=-=-=-=-=-=-=-=-
>
akuster808 Dec. 27, 2021, 8:14 p.m. UTC | #2
On 12/27/21 12:39 AM, Anders Montonen wrote:
> Hi,
>
> s/cureve25519/curve25519/g
thanks for the review.

V2 out shortly.

- armin
> -a
>
>> On 27 Dec 2021, at 4:50, Armin Kuster <akuster808@gmail.com> wrote:
>>
>> Not everyone wants this to be installed by default. Enable to remove
>> cureve25519 is someone wants to.
>>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>> .../recipes-support/strongswan/strongswan_5.9.4.bb            | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
>> index 45500df01..a031c54f5 100644
>> --- a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
>> +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
>> @@ -23,7 +23,7 @@ EXTRA_OECONF = " \
>>
>> EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
>>
>> -PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl \
>> +PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl cureve25519\
>>         ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \
>> "
>> PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni"
>> @@ -41,6 +41,7 @@ PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-sou
>> PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite"
>> PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke"
>> PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc"
>> +PACKAGECONFIG[cureve25519] = "--enable-curve25519,--disable-curve25519,, ${PN}-plugin-curve25519"
>>
>> # requires swanctl
>> PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd,"
>> @@ -130,7 +131,6 @@ RDEPENDS:${PN} += "\
>>     ${PN}-plugin-x509 \
>>     ${PN}-plugin-xauth-generic \
>>     ${PN}-plugin-xcbc \
>> -    ${PN}-plugin-curve25519 \
>>     "
>>
>> RPROVIDES:${PN} += "${PN}-systemd"
>> -- 
>> 2.25.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#94500): https://lists.openembedded.org/g/openembedded-devel/message/94500
>> Mute This Topic: https://lists.openembedded.org/mt/87972450/3618057
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [Anders.Montonen@iki.fi]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

Patch

diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
index 45500df01..a031c54f5 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb
@@ -23,7 +23,7 @@  EXTRA_OECONF = " \
 
 EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
-PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl \
+PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl cureve25519\
         ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \
 "
 PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni"
@@ -41,6 +41,7 @@  PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-sou
 PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite"
 PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke"
 PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc"
+PACKAGECONFIG[cureve25519] = "--enable-curve25519,--disable-curve25519,, ${PN}-plugin-curve25519"
 
 # requires swanctl
 PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd,"
@@ -130,7 +131,6 @@  RDEPENDS:${PN} += "\
     ${PN}-plugin-x509 \
     ${PN}-plugin-xauth-generic \
     ${PN}-plugin-xcbc \
-    ${PN}-plugin-curve25519 \
     "
 
 RPROVIDES:${PN} += "${PN}-systemd"