From 4d7108f7afd3940da4597b2ad694754d0fe0b9d1 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 15 Jun 2011 15:56:16 +0100 Subject: qt4-tools-nativesdk: fix unpack failure due to missing g++.conf 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. (From OE-Core rev: 49102f3728425cacfaeb384491b9355bfa2a4230) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 5faf40c33a..d1f4b47a6e 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 \ -- cgit v1.2.3-54-g00ecf