| Submitter | Paul Eggleton |
|---|---|
| Date | June 18, 2011, 6:56 p.m. |
| Message ID | <11485e23dab6a284009ac850616899faf1005f1a.1308423290.git.paul.eggleton@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/6109/ |
| State | New, archived |
| Headers | show |
Comments
On 06/18/2011 11:56 AM, Paul Eggleton wrote: > FILESPATHPKG was being used to in order to bring in linux.conf and > g++.conf in this recipe, however this probably never worked since > FILESPATHPKG always has the MACHINE appended to it and these are not > machine-specific files. FILESPATHPKG is not supported in oe-core. Its an oe.dev feature for now. The only reason it built was that these two files > could be found within the "files" subdir until we removed Qt 4.6.3. > Using FILESEXTRAPATHS (as qt4-tools-native does) solves this. > > Signed-off-by: Paul Eggleton<paul.eggleton@linux.intel.com> > --- > meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc > index 5faf40c..d1f4b47 100644 > --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc > +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc > @@ -5,9 +5,10 @@ HOMEPAGE = "http://qt.nokia.com" > PRIORITY = "optional" > LICENSE = "LGPLv2.1 | GPLv3" > > -INC_PR = "r3" > +INC_PR = "r4" > + > +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" > > -FILESPATHPKG =. "qt-${PV}:" > inherit nativesdk qmake2 > > SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
On Tuesday 21 June 2011 00:56:48 Khem Raj wrote: > On 06/18/2011 11:56 AM, Paul Eggleton wrote: > > FILESPATHPKG was being used to in order to bring in linux.conf and > > g++.conf in this recipe, however this probably never worked since > > FILESPATHPKG always has the MACHINE appended to it and these are not > > machine-specific files. > > FILESPATHPKG is not supported in oe-core. Its an oe.dev feature for now. Right, but there's still a reference to it in utils.bbclass where it supposedly operates in the manner I described. This patch actually removes its usage in the qt4-tools-nativesdk recipe however. Cheers, Paull
Patch
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 5faf40c..d1f4b47 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc @@ -5,9 +5,10 @@ HOMEPAGE = "http://qt.nokia.com" PRIORITY = "optional" LICENSE = "LGPLv2.1 | GPLv3" -INC_PR = "r3" +INC_PR = "r4" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" -FILESPATHPKG =. "qt-${PV}:" inherit nativesdk qmake2 SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
FILESPATHPKG was being used to in order to bring in linux.conf and g++.conf in this recipe, however this probably never worked since FILESPATHPKG always has the MACHINE appended to it and these are not machine-specific files. The only reason it built was that these two files could be found within the "files" subdir until we removed Qt 4.6.3. Using FILESEXTRAPATHS (as qt4-tools-native does) solves this. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)