Patchwork [5/5] wpa-supplicant-0.7.3: depend on openssl

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 11, 2011, 12:58 p.m.
Message ID <1297429080-3986-5-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/535/
State Accepted
Commit efb86c94efa4fa9270982c83cb116e21a9f11f30
Headers show

Comments

Andreas Oberritter - Feb. 11, 2011, 12:58 p.m.
* let defconfig decide which crypto library to use

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Stefan Schmidt - Feb. 11, 2011, 2:41 p.m.
Hello.

On Fri, 2011-02-11 at 12:58, Andreas Oberritter wrote:
> * let defconfig decide which crypto library to use
> 
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
>  recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> index f64eb79..e01d1ef 100644
> --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> @@ -6,7 +6,7 @@ LICENSE = "GPLv2 | BSD"
>  LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
>                      file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
>                      file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
> -DEPENDS = "gnutls dbus libnl2 ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
> +DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
>  RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"

Hmm, that one I don't really like. We now build gnutls _and_ openssl even if we
only need one of it. As the config may be overriden for distros/machines I have
no good idea how to check for it during dependency calculation though. Anyone
else an idea?

regards
Stefan Schmidt
Andreas Oberritter - Feb. 11, 2011, 2:54 p.m.
Hello Stefan,

On 02/11/2011 03:41 PM, Stefan Schmidt wrote:
> On Fri, 2011-02-11 at 12:58, Andreas Oberritter wrote:
>> * let defconfig decide which crypto library to use
>>
>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
>> ---
>>  recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
>> index f64eb79..e01d1ef 100644
>> --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
>> +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
>> @@ -6,7 +6,7 @@ LICENSE = "GPLv2 | BSD"
>>  LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
>>                      file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
>>                      file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
>> -DEPENDS = "gnutls dbus libnl2 ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
>> +DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
>>  RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
> 
> Hmm, that one I don't really like. We now build gnutls _and_ openssl even if we
> only need one of it. As the config may be overriden for distros/machines I have
> no good idea how to check for it during dependency calculation though. Anyone
> else an idea?

In general, in OE we build a whole lot of packages that aren't required
by the target image. Here, we already build dbus, even though it might
be disabled by an overridden config. Since both gnutls and openssl are
likely to be used by other packages, this adds no cost at all for many
targets, especially because only the library that actually gets linked
to is going to end up in RDEPENDS_${PN}.

Regards,
Andreas
Stefan Schmidt - Feb. 11, 2011, 3:18 p.m.
Hello.

On Fri, 2011-02-11 at 15:54, Andreas Oberritter wrote:
> 
> On 02/11/2011 03:41 PM, Stefan Schmidt wrote:
> > On Fri, 2011-02-11 at 12:58, Andreas Oberritter wrote:
> >> * let defconfig decide which crypto library to use
> >>
> >> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> >> ---
> >>  recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> >> index f64eb79..e01d1ef 100644
> >> --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> >> +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> >> @@ -6,7 +6,7 @@ LICENSE = "GPLv2 | BSD"
> >>  LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
> >>                      file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
> >>                      file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
> >> -DEPENDS = "gnutls dbus libnl2 ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
> >> +DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
> >>  RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
> > 
> > Hmm, that one I don't really like. We now build gnutls _and_ openssl even if we
> > only need one of it. As the config may be overriden for distros/machines I have
> > no good idea how to check for it during dependency calculation though. Anyone
> > else an idea?
> 
> In general, in OE we build a whole lot of packages that aren't required
> by the target image. Here, we already build dbus, even though it might
> be disabled by an overridden config. Since both gnutls and openssl are
> likely to be used by other packages, this adds no cost at all for many
> targets, especially because only the library that actually gets linked
> to is going to end up in RDEPENDS_${PN}.

You have very valid pount here about dbus. I still would like to have better
solution that sets the dependency from the given config but thats a bit dreaming
I think. So:

Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>

regards
Stefan Schmidt

Patch

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
index f64eb79..e01d1ef 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -6,7 +6,7 @@  LICENSE = "GPLv2 | BSD"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
                     file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
                     file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
-DEPENDS = "gnutls dbus libnl2 ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
+DEPENDS = "gnutls dbus libnl2 openssl ${@base_contains("COMBINED_FEATURES", "madwifi", "madwifi-ng", "",d)}"
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \