[meta-qt5,v2,2/2] qtwebkit-examples: add RDEPENDS for ca-certificates

Submitted by Andre McCurdy on Feb. 22, 2014, 5:30 a.m.

Details

Message ID 1393047007-20507-2-git-send-email-armccurdy@gmail.com
State Accepted, archived
Headers show

Commit Message

Andre McCurdy Feb. 22, 2014, 5:30 a.m.
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 recipes-qt/qt5/qt5.inc               | 2 ++
 recipes-qt/qt5/qtbase.inc            | 2 +-
 recipes-qt/qt5/qtwebkit-examples.inc | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 7e739c5..e2a1662 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -7,6 +7,8 @@  inherit qmake5
 ICU = "icu "
 ICU_powerpc = "pango"
 
+PACKAGECONFIG_OPENSSL ?= "openssl"
+
 QT_MODULE ?= "${BPN}"
 
 # we don't want conflicts with qt4
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 6a0149a..d805c47 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -47,7 +47,7 @@  PACKAGECONFIG ??= " \
     udev \
     evdev \
     widgets \
-    openssl \
+    ${PACKAGECONFIG_OPENSSL} \
     ${PACKAGECONFIG_GL} \
     ${PACKAGECONFIG_FB} \
     ${PACKAGECONFIG_X11} \
diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc
index 50c28cd..84f16a4 100644
--- a/recipes-qt/qt5/qtwebkit-examples.inc
+++ b/recipes-qt/qt5/qtwebkit-examples.inc
@@ -10,3 +10,4 @@  SRC_URI += " \
 
 DEPENDS += "qtwebkit"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
+RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"

Comments

Khem Raj Feb. 22, 2014, 5:35 a.m.
On Feb 21, 2014, at 9:30 PM, Andre McCurdy <armccurdy@gmail.com> wrote:

> If qtbase is configured with openssl support then the
> qtwebkit browser example apps require CA certificates.

looks ok now

> 
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
> recipes-qt/qt5/qt5.inc               | 2 ++
> recipes-qt/qt5/qtbase.inc            | 2 +-
> recipes-qt/qt5/qtwebkit-examples.inc | 1 +
> 3 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
> index 7e739c5..e2a1662 100644
> --- a/recipes-qt/qt5/qt5.inc
> +++ b/recipes-qt/qt5/qt5.inc
> @@ -7,6 +7,8 @@ inherit qmake5
> ICU = "icu "
> ICU_powerpc = "pango"
> 
> +PACKAGECONFIG_OPENSSL ?= "openssl"
> +
> QT_MODULE ?= "${BPN}"
> 
> # we don't want conflicts with qt4
> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> index 6a0149a..d805c47 100644
> --- a/recipes-qt/qt5/qtbase.inc
> +++ b/recipes-qt/qt5/qtbase.inc
> @@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \
>     udev \
>     evdev \
>     widgets \
> -    openssl \
> +    ${PACKAGECONFIG_OPENSSL} \
>     ${PACKAGECONFIG_GL} \
>     ${PACKAGECONFIG_FB} \
>     ${PACKAGECONFIG_X11} \
> diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc
> index 50c28cd..84f16a4 100644
> --- a/recipes-qt/qt5/qtwebkit-examples.inc
> +++ b/recipes-qt/qt5/qtwebkit-examples.inc
> @@ -10,3 +10,4 @@ SRC_URI += " \
> 
> DEPENDS += "qtwebkit"
> RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
> +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Martin Jansa Feb. 22, 2014, 6:39 a.m.
On Fri, Feb 21, 2014 at 09:30:07PM -0800, Andre McCurdy wrote:
> If qtbase is configured with openssl support then the
> qtwebkit browser example apps require CA certificates.
> 
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
>  recipes-qt/qt5/qt5.inc               | 2 ++
>  recipes-qt/qt5/qtbase.inc            | 2 +-
>  recipes-qt/qt5/qtwebkit-examples.inc | 1 +
>  3 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
> index 7e739c5..e2a1662 100644
> --- a/recipes-qt/qt5/qt5.inc
> +++ b/recipes-qt/qt5/qt5.inc
> @@ -7,6 +7,8 @@ inherit qmake5
>  ICU = "icu "
>  ICU_powerpc = "pango"
>  
> +PACKAGECONFIG_OPENSSL ?= "openssl"
> +
>  QT_MODULE ?= "${BPN}"
>  
>  # we don't want conflicts with qt4
> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> index 6a0149a..d805c47 100644
> --- a/recipes-qt/qt5/qtbase.inc
> +++ b/recipes-qt/qt5/qtbase.inc
> @@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \
>      udev \
>      evdev \
>      widgets \
> -    openssl \
> +    ${PACKAGECONFIG_OPENSSL} \
>      ${PACKAGECONFIG_GL} \
>      ${PACKAGECONFIG_FB} \
>      ${PACKAGECONFIG_X11} \
> diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc
> index 50c28cd..84f16a4 100644
> --- a/recipes-qt/qt5/qtwebkit-examples.inc
> +++ b/recipes-qt/qt5/qtwebkit-examples.inc
> @@ -10,3 +10,4 @@ SRC_URI += " \
>  
>  DEPENDS += "qtwebkit"
>  RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
> +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"

This should be checking PACKAGECONFIG variable (not
PACKAGECONFIG_OPENSSL).
Martin Jansa Feb. 22, 2014, 8:25 a.m.
On Sat, Feb 22, 2014 at 07:39:19AM +0100, Martin Jansa wrote:
> On Fri, Feb 21, 2014 at 09:30:07PM -0800, Andre McCurdy wrote:
> > If qtbase is configured with openssl support then the
> > qtwebkit browser example apps require CA certificates.
> > 
> > Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> > ---
> >  recipes-qt/qt5/qt5.inc               | 2 ++
> >  recipes-qt/qt5/qtbase.inc            | 2 +-
> >  recipes-qt/qt5/qtwebkit-examples.inc | 1 +
> >  3 files changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
> > index 7e739c5..e2a1662 100644
> > --- a/recipes-qt/qt5/qt5.inc
> > +++ b/recipes-qt/qt5/qt5.inc
> > @@ -7,6 +7,8 @@ inherit qmake5
> >  ICU = "icu "
> >  ICU_powerpc = "pango"
> >  
> > +PACKAGECONFIG_OPENSSL ?= "openssl"
> > +
> >  QT_MODULE ?= "${BPN}"
> >  
> >  # we don't want conflicts with qt4
> > diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> > index 6a0149a..d805c47 100644
> > --- a/recipes-qt/qt5/qtbase.inc
> > +++ b/recipes-qt/qt5/qtbase.inc
> > @@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \
> >      udev \
> >      evdev \
> >      widgets \
> > -    openssl \
> > +    ${PACKAGECONFIG_OPENSSL} \
> >      ${PACKAGECONFIG_GL} \
> >      ${PACKAGECONFIG_FB} \
> >      ${PACKAGECONFIG_X11} \
> > diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc
> > index 50c28cd..84f16a4 100644
> > --- a/recipes-qt/qt5/qtwebkit-examples.inc
> > +++ b/recipes-qt/qt5/qtwebkit-examples.inc
> > @@ -10,3 +10,4 @@ SRC_URI += " \
> >  
> >  DEPENDS += "qtwebkit"
> >  RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
> > +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
> 
> This should be checking PACKAGECONFIG variable (not
> PACKAGECONFIG_OPENSSL).

Please ignore my comment, I haven't noticed that you've added
PACKAGECONFIG_OPENSSL to qt5.inc and it's actually "from qtbase's
PACKAGECONFIG".

I've added comment in qtbase.inc and integrated this to master-next.

Thanks
Andre McCurdy Feb. 22, 2014, 10:06 a.m.
On Sat, Feb 22, 2014 at 12:25 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> I've added comment in qtbase.inc and integrated this to master-next.
>

Great! Thank-you Martin and Khem.

Andre
--
Nicolas Dechesne Feb. 24, 2014, 6:06 p.m.
On Sat, Feb 22, 2014 at 9:25 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Please ignore my comment, I haven't noticed that you've added
> PACKAGECONFIG_OPENSSL to qt5.inc and it's actually "from qtbase's
> PACKAGECONFIG".
>
> I've added comment in qtbase.inc and integrated this to master-next.

hmm. still i don't get it. openssl can be added to PACKAGECONFIG
without being added in PACKAGECONFIG_OPENSSL, right? so why don't we
test is openssl is in PACKAGECONFIG?

Am I missing anything?

nico
Martin Jansa Feb. 24, 2014, 6:28 p.m.
On Mon, Feb 24, 2014 at 07:06:29PM +0100, Nicolas Dechesne wrote:
> On Sat, Feb 22, 2014 at 9:25 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > Please ignore my comment, I haven't noticed that you've added
> > PACKAGECONFIG_OPENSSL to qt5.inc and it's actually "from qtbase's
> > PACKAGECONFIG".
> >
> > I've added comment in qtbase.inc and integrated this to master-next.
> 
> hmm. still i don't get it. openssl can be added to PACKAGECONFIG
> without being added in PACKAGECONFIG_OPENSSL, right? so why don't we
> test is openssl is in PACKAGECONFIG?
> 
> Am I missing anything?

because qtwebkit-examples is checking PACKAGECONFIG from qtbase recipe
Nicolas Dechesne Feb. 25, 2014, 2:26 p.m.
On Mon, Feb 24, 2014 at 7:28 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> because qtwebkit-examples is checking PACKAGECONFIG from qtbase recipe

right... this is quite ugly, no? I understand what we are trying to do
here. but do we really want to do it like this? is there a way we can
read the qtbase PACKAGECONFIG value from within qtwebkit recipe? even
if it's using some internals "sauce", that might be better than what's
currently done, no?

nico