4 files changed, 10 insertions, 8 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index e7f4fdc654..86e87f31d6 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.4"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "39"
+DISTRO_REVISION = "41"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -133,7 +133,7 @@ PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.3.1"
 PREFERRED_VERSION_freetype-native = "2.2.1"
 PREFERRED_VERSION_cairo = "1.4.2"
-PREFERRED_VERSION_glib-2.0 = "2.12.10"
+PREFERRED_VERSION_glib-2.0 = "2.12.11"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -198,8 +198,8 @@ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uc
 
 #use EABI toolchain
 PREFERRED_VERSION_gcc ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
 
 PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 17d7d657b1..a9d667372f 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -25,7 +25,7 @@ INHERIT += "debian multimachine"
 # Packaging and output format
 #
 INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
+IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2"
 
 #
 # Kernel
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index df16ad557f..bc1a6fbfdd 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -133,8 +133,8 @@ INHERIT += "nslu2-mirrors"
 
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+PREFERRED_VERSION_ipkg ?= "0.99.163"
+PREFERRED_VERSION_ipkg-native ?= "0.99.163"
 
 #FIXME: HACK: REMOVE THIS
 IGNORE_STRIP_ERRORS = ""
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 25bf6649bd..65a797c680 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -7,6 +7,8 @@ TARGET_ARCH = "i486"
 # TARGET_VENDOR = "-oe"
 PACKAGE_EXTRA_ARCHS = "netvista"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+XSERVER = "xserver-kdrive-vesa"
+
 # todo: convert to task-base
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
@@ -14,7 +16,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
 MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa"
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "64"
 GUI_MACHINE_CLASS = "bigscreen"
 
 udevdir = "/dev"