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

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

2005/02/22 15:09:03+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/02/22 16:08:04+01:00 uni-frankfurt.de!mickeyl
use inline images for opie until we found out why decorations are dog-slow without 'em

2005/02/22 15:08:42+01:00 (none)!koen
sectest-gpe-image.bb, gpe-image.bb, familiar-0.8.1.conf:
  finalize familiar-0.8.1 and fix feed uris

BKrev: 421b4ad6jDkI5M0KkNlbmArQJIg-Yg

5 files changed, 14 insertions, 16 deletions

diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index 723804ade9..bb0eacb850 100644
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -2,16 +2,15 @@ include conf/distro/familiar.conf
 
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "v0.8.1-snapshot-${DATE}"
+DISTRO_VERSION = "v0.8.1"
 
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+DISTRO_TYPE = "release"
 
-#fix before release to use DISTRO_VERSION
 FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/v0.8/base"
+        base##http://familiar.handhelds.org/releases/v0.8.1/feed/base"
 
-#CVSDATE = 20050105
+CVSDATE = 20050222
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index a02bdcfb7c..befa5fbd11 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "uicmoc-native qte"
 PROVIDES = "virtual/libqpe"
 PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
 	file://nomax.patch;patch=1;pnum=1"
@@ -16,7 +16,8 @@ inherit qmake
 
 QMAKE_PROFILES = "library.pro"
 EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
-EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
+# EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
+EXTRA_QMAKEVARS_POST = "DESTDIR="
 
 CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"
 CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 49f3502b2a..8bf03689df 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -2,10 +2,9 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
 
-PR = "r10"
+PR = "r11"
 
 export IMAGE_BASENAME = "gpe-image"
 
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index 27777975ec..0d1dbfbcbb 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -3,10 +3,9 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
 
-PR = "r4"
+PR = "r5"
 
 export IMAGE_BASENAME = "sectest-gpe-image"
 
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 107d42bb42..5809134398 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/pics-hires"
 S = "${WORKDIR}"
 
-SHIP_INLINE_PICS = "yes"
+SHIP_INLINE_PICS = "no"
 INLINE_PICS = "pics/inline"
 INLINE_PICS_tosa = "pics-hires/inline"
 INLINE_PICS_c7x0 = "pics-hires/inline"