* [meta-qt5][PATCH v2 1/2] qtbase: configure with -openssl-linked instead of -openssl
@ 2014-02-22 5:30 Andre McCurdy
2014-02-22 5:30 ` [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates Andre McCurdy
0 siblings, 1 reply; 9+ messages in thread
From: Andre McCurdy @ 2014-02-22 5:30 UTC (permalink / raw)
To: openembedded-devel
Configure qtbase with -openssl-linked (instead of -openssl) to ensure
that run-time dependencies on libcryto and libssl are detected.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
recipes-qt/qt5/qtbase.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 116c86f..6a0149a 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -112,7 +112,8 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}"
PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
-PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl"
+# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
+PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
PACKAGECONFIG[nis] = "-nis,-no-nis"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-22 5:30 [meta-qt5][PATCH v2 1/2] qtbase: configure with -openssl-linked instead of -openssl Andre McCurdy
@ 2014-02-22 5:30 ` Andre McCurdy
2014-02-22 5:35 ` Khem Raj
2014-02-22 6:39 ` Martin Jansa
0 siblings, 2 replies; 9+ messages in thread
From: Andre McCurdy @ 2014-02-22 5:30 UTC (permalink / raw)
To: openembedded-devel
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)}"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-22 5:30 ` [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates Andre McCurdy
@ 2014-02-22 5:35 ` Khem Raj
2014-02-22 6:39 ` Martin Jansa
1 sibling, 0 replies; 9+ messages in thread
From: Khem Raj @ 2014-02-22 5:35 UTC (permalink / raw)
To: openembeded-devel
[-- Attachment #1: Type: text/plain, Size: 1895 bytes --]
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
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-22 5:30 ` [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates Andre McCurdy
2014-02-22 5:35 ` Khem Raj
@ 2014-02-22 6:39 ` Martin Jansa
2014-02-22 8:25 ` Martin Jansa
1 sibling, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2014-02-22 6:39 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1802 bytes --]
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 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-22 6:39 ` Martin Jansa
@ 2014-02-22 8:25 ` Martin Jansa
2014-02-22 10:06 ` Andre McCurdy
2014-02-24 18:06 ` Nicolas Dechesne
0 siblings, 2 replies; 9+ messages in thread
From: Martin Jansa @ 2014-02-22 8:25 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2192 bytes --]
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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-22 8:25 ` Martin Jansa
@ 2014-02-22 10:06 ` Andre McCurdy
2014-02-24 18:06 ` Nicolas Dechesne
1 sibling, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2014-02-22 10:06 UTC (permalink / raw)
To: openembedded-devel
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
--
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-22 8:25 ` Martin Jansa
2014-02-22 10:06 ` Andre McCurdy
@ 2014-02-24 18:06 ` Nicolas Dechesne
2014-02-24 18:28 ` Martin Jansa
1 sibling, 1 reply; 9+ messages in thread
From: Nicolas Dechesne @ 2014-02-24 18:06 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-24 18:06 ` Nicolas Dechesne
@ 2014-02-24 18:28 ` Martin Jansa
2014-02-25 14:26 ` Nicolas Dechesne
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2014-02-24 18:28 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-24 18:28 ` Martin Jansa
@ 2014-02-25 14:26 ` Nicolas Dechesne
0 siblings, 0 replies; 9+ messages in thread
From: Nicolas Dechesne @ 2014-02-25 14:26 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-02-25 14:26 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-22 5:30 [meta-qt5][PATCH v2 1/2] qtbase: configure with -openssl-linked instead of -openssl Andre McCurdy
2014-02-22 5:30 ` [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates Andre McCurdy
2014-02-22 5:35 ` Khem Raj
2014-02-22 6:39 ` Martin Jansa
2014-02-22 8:25 ` Martin Jansa
2014-02-22 10:06 ` Andre McCurdy
2014-02-24 18:06 ` Nicolas Dechesne
2014-02-24 18:28 ` Martin Jansa
2014-02-25 14:26 ` Nicolas Dechesne
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.