Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/28 16:46:36+00:00 nexus.co.uk!pb
blow away old staging/HOST_SYS/qt2 before re-populating it, to avoid permission problems with readonly files

BKrev: 4224bab3l6TVgLKY-ZRzSvvQIu1ppw

diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index f6777e0..cfd28ea 100644 (file)
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
           file://qpe.patch;patch=1 \
@@ -114,6 +114,7 @@ do_compile() {
 }
 
 do_stage() {
+       rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2
        install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib
        oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib
        rm -f include/qxt.h