Patchwork [meta-qt5] Fix file search paths for nativesdk packages.

login
register
mail settings
Submitter Gabe Johnson
Date Feb. 3, 2014, 8:14 p.m.
Message ID <EF93C63B81FE3D4F81C98317512457471295D9D477@agmail-mb1>
Download mbox | patch
Permalink /patch/66277/
State Accepted, archived
Headers show

Comments

Gabe Johnson - Feb. 3, 2014, 8:14 p.m.
Signed-off-by: Gabe Johnson
---
 recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb  |    2 ++
 recipes-qt/qt5/nativesdk-qttools_5.2.0.bb |    2 ++
 2 files changed, 4 insertions(+)

--
1.7.9.5
Martin Jansa - Feb. 4, 2014, 10:15 p.m.
On Mon, Feb 03, 2014 at 02:14:14PM -0600, Gabe Johnson wrote:
> Signed-off-by: Gabe Johnson

Is this really needed now when all local patches are in BPN directories?
It was needed before when there were patches in BPN-PV and we needed to
put them in FILESPATH before the BPN/override version IIRC, but that's
not the case anymore.

OE qemux86@ ~/build/oe-core $ grep ^FILESPATH= env.nativesdk-qtbase | sed "s/=\"/\n/g; s/:/\n/g"
FILESPATH
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/nodistro
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/nodistro
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/nodistro
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/qemux86
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/qemux86
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/qemux86
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/qemuall
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/qemuall
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/qemuall
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/x86
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/x86
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/x86
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/x86-64
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/x86-64
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/x86-64
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/"

> ---
>  recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb  |    2 ++
>  recipes-qt/qt5/nativesdk-qttools_5.2.0.bb |    2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
> index aca8dea..223baa3 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
> +++ b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
> @@ -1,5 +1,7 @@
>  require qt5-${PV}.inc
>  require ${PN}.inc
> 
> +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
> +
>  SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
>  SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
> diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
> index 0effa1b..3d2c05a 100644
> --- a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
> +++ b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
> @@ -1,5 +1,7 @@
>  require qt5-${PV}.inc
>  require ${PN}.inc
> 
> +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
> +
>  SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
>  SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"
> --
> 1.7.9.5
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Denys Dmytriyenko - Feb. 11, 2014, 5:50 p.m.
On Tue, Feb 04, 2014 at 11:15:59PM +0100, Martin Jansa wrote:
> On Mon, Feb 03, 2014 at 02:14:14PM -0600, Gabe Johnson wrote:
> > Signed-off-by: Gabe Johnson
> 
> Is this really needed now when all local patches are in BPN directories?
> It was needed before when there were patches in BPN-PV and we needed to
> put them in FILESPATH before the BPN/override version IIRC, but that's
> not the case anymore.

FWIW, that FILESPATH addition is still needed when you use meta-qt5 with past 
stable releases. Of course, it's not needed on master.


> OE qemux86@ ~/build/oe-core $ grep ^FILESPATH= env.nativesdk-qtbase | sed "s/=\"/\n/g; s/:/\n/g"
> FILESPATH
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/nodistro
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/nodistro
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/nodistro
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/qemux86
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/qemux86
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/qemux86
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/qemuall
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/qemuall
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/qemuall
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/x86
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/x86
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/x86
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/x86-64
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/x86-64
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/x86-64
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase-5.2.0/
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtbase/
> /OE/build/oe-core/meta-qt5/recipes-qt/qt5/files/"
> 
> > ---
> >  recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb  |    2 ++
> >  recipes-qt/qt5/nativesdk-qttools_5.2.0.bb |    2 ++
> >  2 files changed, 4 insertions(+)
> > 
> > diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
> > index aca8dea..223baa3 100644
> > --- a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
> > +++ b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
> > @@ -1,5 +1,7 @@
> >  require qt5-${PV}.inc
> >  require ${PN}.inc
> > 
> > +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
> > +
> >  SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
> >  SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
> > diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
> > index 0effa1b..3d2c05a 100644
> > --- a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
> > +++ b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
> > @@ -1,5 +1,7 @@
> >  require qt5-${PV}.inc
> >  require ${PN}.inc
> > 
> > +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
> > +
> >  SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
> >  SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"
> > --
> > 1.7.9.5
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
index aca8dea..223baa3 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
@@ -1,5 +1,7 @@ 
 require qt5-${PV}.inc
 require ${PN}.inc

+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
+
 SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
 SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
index 0effa1b..3d2c05a 100644
--- a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
+++ b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
@@ -1,5 +1,7 @@ 
 require qt5-${PV}.inc
 require ${PN}.inc

+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
+
 SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
 SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"