Re: [oe-commits] Paul Eggleton : qt4: allow recipes building commercial edition

Re: [oe-commits] Paul Eggleton : qt4: allow recipes building commercial edition

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1852 bytes --]

On Tue, Jul 31, 2012 at 07:05:17AM +0000, git@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 2be0058fc4acddab611637656183accd052b40eb
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2be0058fc4acddab611637656183accd052b40eb
> 
> Author: Paul Eggleton <paul.eggleton@linux.intel.com>
> Date:   Tue Jul 31 00:31:00 2012 +0100
> 
> qt4: allow recipes building commercial edition
> 
> To enable building the commercial edition of Qt (through additional
> recipes that are *not* provided by OE-Core) we need to tweak a few
> things:
> 
> * Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
>   - instead add qt4-x11 to DEPENDS and then have qt4-x11-free include
>   this in its PROVIDES. A commercial equivalent recipe should do the
>   same.
> * Add a QT_LICENSE_FILE variable that can be used to specify the license
>   file required by the commercial edition.
> * Add a QT_LICENSE_FLAGS variable which the recipe can set to select the
>   license option being used. The default of "-opensource" retains the
>   current behaviour; a commercial recipe should set it to "-commercial".
> 
> Fixes [YOCTO #2505].
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

After this patch I see, libdummy.prl created again
OE @ ~/projects/shr-chroot $ ll include/WebCore/libdummy.prl
-rw-r--r-- 1 bitbake bitbake 651 Aug  2 19:23 include/WebCore/libdummy.prl

originally fixed by:
http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2

Do you have any idea why it's broken again? If you still have log.do_configure logs, can you check for
WARNING: DESTDIR: Cannot access directory '/include/WebCore'
?

Cheers,

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [oe-commits] Paul Eggleton : qt4: allow recipes building commercial edition

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2407 bytes --]

On Fri, Aug 03, 2012 at 12:15:26AM +0200, Martin Jansa wrote:
> On Tue, Jul 31, 2012 at 07:05:17AM +0000, git@git.openembedded.org wrote:
> > Module: openembedded-core.git
> > Branch: master
> > Commit: 2be0058fc4acddab611637656183accd052b40eb
> > URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2be0058fc4acddab611637656183accd052b40eb
> > 
> > Author: Paul Eggleton <paul.eggleton@linux.intel.com>
> > Date:   Tue Jul 31 00:31:00 2012 +0100
> > 
> > qt4: allow recipes building commercial edition
> > 
> > To enable building the commercial edition of Qt (through additional
> > recipes that are *not* provided by OE-Core) we need to tweak a few
> > things:
> > 
> > * Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
> >   - instead add qt4-x11 to DEPENDS and then have qt4-x11-free include
> >   this in its PROVIDES. A commercial equivalent recipe should do the
> >   same.
> > * Add a QT_LICENSE_FILE variable that can be used to specify the license
> >   file required by the commercial edition.
> > * Add a QT_LICENSE_FLAGS variable which the recipe can set to select the
> >   license option being used. The default of "-opensource" retains the
> >   current behaviour; a commercial recipe should set it to "-commercial".
> > 
> > Fixes [YOCTO #2505].
> > 
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> After this patch I see, libdummy.prl created again
> OE @ ~/projects/shr-chroot $ ll include/WebCore/libdummy.prl
> -rw-r--r-- 1 bitbake bitbake 651 Aug  2 19:23 include/WebCore/libdummy.prl
> 
> originally fixed by:
> http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2
> 
> Do you have any idea why it's broken again? If you still have log.do_configure logs, can you check for
> WARNING: DESTDIR: Cannot access directory '/include/WebCore'
> ?
> 
> Cheers,

Hmm even more this time:
ISIS_OUT/
ISIS_OUT/include
ISIS_OUT/include/webkit
ISIS_OUT/include/webkit/npapi
ISIS_OUT/include/webkit/npapi/nptypes.h
ISIS_OUT/include/webkit/npapi/npapi.h
ISIS_OUT/include/webkit/npapi/npupp.h
ISIS_OUT/include/webkit/npapi/npruntime.h

Created in dir one level above dir from where bitbake was started.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [oe-commits] Paul Eggleton : qt4: allow recipes building commercial edition

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3024 bytes --]

On Fri, Aug 03, 2012 at 09:17:30AM +0200, Martin Jansa wrote:
> On Fri, Aug 03, 2012 at 12:15:26AM +0200, Martin Jansa wrote:
> > On Tue, Jul 31, 2012 at 07:05:17AM +0000, git@git.openembedded.org wrote:
> > > Module: openembedded-core.git
> > > Branch: master
> > > Commit: 2be0058fc4acddab611637656183accd052b40eb
> > > URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2be0058fc4acddab611637656183accd052b40eb
> > > 
> > > Author: Paul Eggleton <paul.eggleton@linux.intel.com>
> > > Date:   Tue Jul 31 00:31:00 2012 +0100
> > > 
> > > qt4: allow recipes building commercial edition
> > > 
> > > To enable building the commercial edition of Qt (through additional
> > > recipes that are *not* provided by OE-Core) we need to tweak a few
> > > things:
> > > 
> > > * Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
> > >   - instead add qt4-x11 to DEPENDS and then have qt4-x11-free include
> > >   this in its PROVIDES. A commercial equivalent recipe should do the
> > >   same.
> > > * Add a QT_LICENSE_FILE variable that can be used to specify the license
> > >   file required by the commercial edition.
> > > * Add a QT_LICENSE_FLAGS variable which the recipe can set to select the
> > >   license option being used. The default of "-opensource" retains the
> > >   current behaviour; a commercial recipe should set it to "-commercial".
> > > 
> > > Fixes [YOCTO #2505].
> > > 
> > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > 
> > After this patch I see, libdummy.prl created again
> > OE @ ~/projects/shr-chroot $ ll include/WebCore/libdummy.prl
> > -rw-r--r-- 1 bitbake bitbake 651 Aug  2 19:23 include/WebCore/libdummy.prl
> > 
> > originally fixed by:
> > http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2
> > 
> > Do you have any idea why it's broken again? If you still have log.do_configure logs, can you check for
> > WARNING: DESTDIR: Cannot access directory '/include/WebCore'
> > ?
> > 
> > Cheers,
> 

Ah, this isn't from qt4-x11-free, only that /include/WebCore should be,
but I've tried to reproduce it again and even after rebuilding
qt4-x11-free, qt4-x11-embedded, qt-mobility-embedded, qt-mobility-x11
it's not created now.

Will try for different arch, because last time I've seen it also only
for arm* and not x86 (which I was rebuilding now).

Cheers,

> Hmm even more this time:
> ISIS_OUT/
> ISIS_OUT/include
> ISIS_OUT/include/webkit
> ISIS_OUT/include/webkit/npapi
> ISIS_OUT/include/webkit/npapi/nptypes.h
> ISIS_OUT/include/webkit/npapi/npapi.h
> ISIS_OUT/include/webkit/npapi/npupp.h
> ISIS_OUT/include/webkit/npapi/npruntime.h
> 
> Created in dir one level above dir from where bitbake was started.
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCH] qt4-native: fix creating /include directory in build host root

[Martin Jansa]

* same fix as
  http://git.openembedded.org/openembedded-core/commit/?id=7d3fd68480d54a8ef0d91a772df3506cd45ef2c2
  is needed for native too

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/qt4-native.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 90ea63c..e00a1f3 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                     file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
-INC_PR = "r15"
+INC_PR = "r16"
 
 inherit native
 
@@ -18,6 +18,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://g++.conf \
            file://linux.conf \
            file://fix_qkbdtty_qws.patch \
+           file://set-OUTPUT_DIR-if-empty.patch \
 	"
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
-- 
1.7.8.6