diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2008-07-25 10:04:40 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2008-07-25 10:04:40 +0000 |
| commit | 9391c47983f98bba03c84a94d407177a5cbb6890 (patch) | |
| tree | b5588a7806d3c2d511d540415452e0e873686793 /classes | |
| parent | d65f1724834111db986f7a13807a809c57b71496 (diff) | |
| parent | d6bc4e97a03ac861f27cb3a2afafa374ccebe6ae (diff) | |
merge of 'c0b80d25e48faf3cabe4d83d5586401a0a5e1188'
and 'c5251d02ae821f28febfb91fb76af9cd01b8f3fd'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/packaged-staging.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake.bbclass | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 77fd8a92c3..70550c1a7d 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -67,7 +67,7 @@ python () { bb.data.setVar("PSTAGING_ACTIVE", "0", d) } -DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" +DEPLOY_DIR_PSTAGE ?= "${DEPLOY_DIR}/pstage" PSTAGE_MACHCONFIG = "${DEPLOY_DIR_PSTAGE}/opkg.conf" PSTAGE_PKGMANAGER = "stage-manager-ipkg" diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index 34f59ef9f7..7dfe459349 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -2,6 +2,7 @@ inherit qmake_base DEPENDS_prepend = "qmake-native " +export QMAKESPEC export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" |