diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-05 22:23:37 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-05 22:29:07 +0100 |
commit | c2c3e2ed9d3a7ee2671a7c7ab140054d92090c4b (patch) | |
tree | 234822b84c8e566a5fdf433add56c03fe0e012d7 /recipes/qte | |
parent | e21f758fd4eeebba97339a00547fa7548b6d789d (diff) | |
download | openembedded-c2c3e2ed9d3a7ee2671a7c7ab140054d92090c4b.tar.gz |
qte: remove legacy staging
Removes legacy staging from QtE 2.3.10. Includes & libraries are now no
longer staged in a special location - they are as they would be installed
on the target system (/usr/include/qte and /usr/lib respectively).
qmake.bbclass has been updated to reflect this.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'recipes/qte')
-rw-r--r-- | recipes/qte/qte-common_2.3.10.inc | 11 | ||||
-rw-r--r-- | recipes/qte/qte-mt_2.3.10.bb | 2 | ||||
-rw-r--r-- | recipes/qte/qte_2.3.10.bb | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/recipes/qte/qte-common_2.3.10.inc b/recipes/qte/qte-common_2.3.10.inc index 40b8446508..75419ace21 100644 --- a/recipes/qte/qte-common_2.3.10.inc +++ b/recipes/qte/qte-common_2.3.10.inc @@ -136,20 +136,11 @@ do_compile() { oe_runmake src-mt sub-src } -do_stage() { - rm -rf ${STAGING_DIR_HOST}/qt2 - install -d ${STAGING_DIR_HOST}/qt2/lib - oe_libinstall -so -C lib lib${PN} ${STAGING_DIR_HOST}/qt2/lib - rm -f include/qxt.h - install -d ${STAGING_DIR_HOST}/qt2/include - cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include - cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/ -} - do_install() { oe_libinstall -so -C lib lib${PN} ${D}${libdir} install -d ${D}/${includedir}/qte + rm -f include/qxt.h install -m 0644 include/*.h ${D}/${includedir}/qte/ } diff --git a/recipes/qte/qte-mt_2.3.10.bb b/recipes/qte/qte-mt_2.3.10.bb index 58bb7c81c1..84467f5b0c 100644 --- a/recipes/qte/qte-mt_2.3.10.bb +++ b/recipes/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r30" +PR = "r31" EXTRA_OECONF += "-thread" diff --git a/recipes/qte/qte_2.3.10.bb b/recipes/qte/qte_2.3.10.bb index 88bc07f033..7a4376dd38 100644 --- a/recipes/qte/qte_2.3.10.bb +++ b/recipes/qte/qte_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r55" +PR = "r56" SRC_URI[md5sum] = "1f7ad30113afc500cab7f5b2f4dec0d7" |