This commit brings my tree in line with Rene's tree for the familiar

0.8.4 release.

5 files changed, 29 insertions, 11 deletions

diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 66d155f690..7d37c4f4fc 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -1,9 +1,17 @@
 FEED_URIS_append_openzaurus = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 "
 FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
 
-PR = "r23"
+DISTRO_FEEDS_append_familiar () {
+
+# x11 - additional packages specific to the x11 graphical environment
+src/gz x11 ${DISTRO_FEED_PREFIX}/x11
+src/gz x11-${MACHINE} ${DISTRO_FEED_PREFIX}/x11/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/x11"
+
+PR = "r21"
 
 export IMAGE_BASENAME = "gpe-image"
 
@@ -23,6 +31,7 @@ GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
 #ship more stuff with devices with >16MB of flash
 GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
         gpe-theme-clearlooks \
+	sylpheed \
         figment \
 ",d)}'
 
@@ -54,7 +63,6 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \
 		       ${XSERVER} \
 		       ${GPE_EXTRA_INSTALL}"
 
-IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp "
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index ecbcbcec20..2c01c268bf 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
 PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r44"
+PR = "r45"
 
 ALLOW_EMPTY = "1"
 
@@ -91,8 +91,10 @@ gpe-task-apps = "\
     gpe-what \
     matchbox-panel-hacks \
     gpe-aerial \
-    gpe-soundbite \
-    rosetta"
+    gpe-soundbite"
+    
+# causes a >15 secs delay on initial boot
+#    rosetta"
 
 RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
 DEPENDS += " ${gpe-task-apps}"
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index f82a69f367..6cc4ccbf98 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -118,7 +118,7 @@ task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \
                   opie-console opie-dagger opie-embeddedkonsole \
                   opie-euroconv opie-eye opie-ftp opie-gutenbrowser \
                   opie-helpbrowser opie-irc opie-keypebble opie-odict \
-                  opie-oxygen opie-rdesktop opie-reader opie-remote \
+                  opie-oxygen opie-reader opie-remote \
                   opie-sheet opie-tableviewer opie-tinykate \
                   opie-wellenreiter opie-write opie-zsafe"
 
@@ -181,7 +181,7 @@ task-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
 #
 
 task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \
-                        opie-rdesktop opie-wellenreiter opie-irc \
+                        opie-wellenreiter opie-irc \
                         opie-mediaplayer2 \
                         konqueror-embedded qpdf2"
 
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index e012b2c34f..5c30876dec 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -3,7 +3,15 @@ export IMAGE_LINGUAS = ""
 
 FEED_URIS_append_openzaurus = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
 FEED_URIS_append_opensimpad = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
-FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
+
+DISTRO_FEEDS_append_familiar () {
+
+# opie - additional packages specific to the opie graphical environment
+src/gz opie ${DISTRO_FEED_PREFIX}/opie
+src/gz opie-${MACHINE} ${DISTRO_FEED_PREFIX}/opie/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/opie"
 
 LICENSE = "MIT"
 PR = "r19"
@@ -66,6 +74,6 @@ merge_feeds() {
 }
 
 # merge feed-sources into ipkg.conf and create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+IMAGE_PREPROCESS_COMMAND = "merge_feeds; "
 
 inherit image_ipk
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 31920135d4..1583e9976c 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r25"
+PR = "r26"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.