7 files changed, 17 insertions, 14 deletions
diff --git a/conf/distro/asusoe.conf b/conf/distro/asusoe.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/asusoe.conf
diff --git a/conf/distro/familiar-0.8.2.conf b/conf/distro/familiar-0.8.2.conf
index 8e4e70ce1c..42b812269f 100644
--- a/conf/distro/familiar-0.8.2.conf
+++ b/conf/distro/familiar-0.8.2.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
         base##http://familiar.handhelds.org/releases/v0.8.1/feed/base \
 	updates#http://familiar.handhelds.org/releases/v0.8.1/feed/updates"
 
-CVSDATE = 20050315
+#CVSDATE = 20050322
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index d0ce898056..936ff82511 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -4,6 +4,7 @@
 
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "1.7-beta"
+DISTRO_TYPE = "beta"
 
 TARGET_FPU = "soft"
 TARGET_OS = "linux"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index f8c6486f5d..3b7aa1994e 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
 	console##http://openzaurus.org/official/unstable/3.5.2/feed/console     \
 	devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
 
-CVSDATE = "20050313"
+CVSDATE = "20050320"
 
 #
 # Zaurus
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 2e47340a6e..0851c2e696 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -3,7 +3,7 @@
 #
 
 #work around some breakages
-CVSDATE_xserver-kdrive=20050207
+#CVSDATE_xserver-kdrive=20050207
 
 #specify versions, as the header says :)
 PREFERRED_VERSION_libmatchbox = "1.6"
@@ -25,6 +25,7 @@ PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
 PREFERRED_VERSION_rxvt-unicode = "5.3"
 PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
 PREFERRED_VERSION_xst = "0.14"
+PREFERRED_VERSION_xextensions = "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
 PREFERRED_VERSION_xhost = "0.0cvs20040413"
 PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
@@ -34,7 +35,7 @@ PREFERRED_VERSION_gpe-soundserver = "0.4-1"
 PREFERRED_VERSION_gpe-todo = "0.50"
 PREFERRED_VERSION_gpe-calendar = "0.61"
 PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.35"
+PREFERRED_VERSION_gpe-contacts = "0.36"
 PREFERRED_VERSION_gpe-today = "0.08"
 PREFERRED_VERSION_matchbox-panel-manager = "0.1"
 PREFERRED_VERSION_dbus = "0.23"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 8108b2b767..df20c0647a 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -4,6 +4,10 @@
 
 FEED_URIS_unslung = "unslung##http://ipkg.nslu2-linux.org/feeds/unslung/unstable"
 
+DISTRO_NAME = "Unslung"
+DISTRO_VERSION = "4.5-alpha"
+DISTRO_TYPE = "beta"
+
 TARGET_FPU = "soft"
 TARGET_OS = "linux"
 
@@ -20,17 +24,14 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEV
 EXTRA_IMAGEDEPENDS += 'unslung-switchbox-payload'
 NSLU2_SLUGIMAGE_ARGS = -l payload.tar.gz
 
-UNSLUNG_EXTRA_PACKAGES += 
-
-UNSLUNG_EXTRA_DEPENDS += 
+UNSLUNG_EXTRA_DEPENDS  ?= ""
+UNSLUNG_EXTRA_RDEPENDS ?= "\
+kernel-module-usbnet \
+kernel-module-pegasus kernel-module-kaweth \
+kernel-module-usbserial \
+kernel-module-pl2303 kernel-module-ftdi-sio"
 
-UNSLUNG_EXTRA_RDEPENDS += "kernel-module-ax8817x kernel-module-catc \
-kernel-module-cdcether kernel-module-kaweth kernel-module-pegasus \
-kernel-module-rtl8150 kernel-module-usbnet kernel-module-mii \
-kernel-module-md kernel-module-raid0 kernel-module-raid1 kernel-module-raid5 \
-kernel-module-usb-serial kernel-module-appletalk kernel-module-ipddp"
- 
-UNSLUNG_EXTRA_RRECOMMENDS += 
+UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}"
 
 PREFERRED_VERSION_glibc ?= "2.2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.2.5"
diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/wl500g.conf