6 files changed, 11 insertions, 11 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
index d397babb88..0de7d7c2c8 100644
--- a/conf/distro/familiar-0.8.3.conf
+++ b/conf/distro/familiar-0.8.3.conf
@@ -40,9 +40,6 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
 CVSDATE_handhelds-pxa-2.6 = "20051221"
 CVSDATE_LAB-kernel = "20051221"
 
-#gomunicator version which adds support for iPAQ h6300.
-CVSDATE_gomunicator = "20060518"
-
 #The CSL compiler is unusable because
 # 1) certain programs stop to compile
 # 2) more programs segfault
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index aea603f33c..cc487d59fe 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -23,7 +23,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
 PREFERRED_VERSION_gtk+ ?= "2.6.10"
 PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.109"
+PREFERRED_VERSION_libgpewidget ?= "0.112"
 PREFERRED_VERSION_libgpepimc ?= "0.6"
 PREFERRED_VERSION_libgpevtype ?= "0.15"
 PREFERRED_VERSION_libschedule ?= "0.15"
@@ -44,7 +44,7 @@ PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_gpe-login ?= "0.86"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.55"
 PREFERRED_VERSION_gpe-calendar ?= "0.72"
@@ -57,7 +57,7 @@ PREFERRED_VERSION_gpe-beam ?= "0.2.8"
 PREFERRED_VERSION_gpe-bluetooth ?= "0.51"
 PREFERRED_VERSION_gpe-su ?= "0.19"
 PREFERRED_VERSION_gpe-conf ?= "0.1.30"
-PREFERRED_VERSION_gpe-clock ?= "0.23"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
 PREFERRED_VERSION_gpe-mininet ?= "0.7"
 PREFERRED_VERSION_gpe-mixer ?= "0.42"
 PREFERRED_VERSION_gpe-shield ?= "0.9"
@@ -80,7 +80,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.07"
 PREFERRED_VERSION_gpe-lights ?= "0.13"
 #PREFERRED_VERSION_gpe-nmf ?= "0.21"
 PREFERRED_VERSION_gpe-othello ?= "0.2-1"
-PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
 PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
 PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 146cf9e17c..b68eb32c2a 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -41,7 +41,7 @@ PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
 #PREFERRED_VERSION_gpe-calendar ?= "0.61"
 #PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
 #PREFERRED_VERSION_gpe-contacts ?= "0.36"
-#PREFERRED_VERSION_gpe-today ?= "0.11"
+#PREFERRED_VERSION_gpe-today ?= "0.08"
 #PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
 PREFERRED_VERSION_dbus ?= "0.23.4"
 #PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 7194eaf29f..76bf1eda9b 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -118,7 +118,7 @@ BBINCLUDELOGS = "yes"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://www.oesources.org/source/current/"
+CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/"
 
 # EDIT THIS FILE and then remove the line below before using!
 REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 15b7cdf706..ea81f8f536 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -39,3 +39,6 @@ GPE_EXTRA_DEPENDS += "gaim gpe-filemanager"
 GPE_EXTRA_INSTALL += "gaim gpe-filemanager"
 
 include conf/machine/tune-strongarm.conf
+
+# LAB can only resolve relative symlinks
+ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 821f71c31a..71dc9becce 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
-PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
+PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.15-hh1"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
@@ -35,7 +35,7 @@ include conf/machine/tune-strongarm.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
+                  hx4700_ts snd_hx4700_audio hx4700_power"
 
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"