merge of '42072c537ac07457dac8a7dbd13cc1e1e288b4ca'

     and '454327ea0c22b470c4cee1218d4034e9be05e058'

6 files changed, 16 insertions, 12 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index e9dfd1dac8..c5e8d3249e 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "30"
+DISTRO_REVISION = "32"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -46,6 +46,10 @@ FEED_ARCH_poodle	= "armv5te"
 FEED_ARCH_spitz		= "armv5te"
 FEED_ARCH_tosa		= "armv5te"
 
+
+#i586 machines
+FEED_ARCH_epia		= "i586"
+
 #i686 machines
 
 FEED_ARCH_guinness	= "i686"
@@ -135,6 +139,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
 PREFERRED_PROVIDER_tslib ?= "tslib"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
 PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 662dfc386f..cbdaec0a21 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -7,7 +7,7 @@
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
 
 #specify versions, as the header says :)
 PREFERRED_VERSION_libmatchbox ?= "1.7"
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index bf00aa8d01..a246633e07 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -4,7 +4,7 @@
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
 
 PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 7d4efea06e..5db9d7f06a 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -7,7 +7,7 @@
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
 
 #specify versions, as the header says :)
 #PREFERRED_VERSION_libmatchbox ?= "1.6"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index f73fa22e34..866741479f 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -46,7 +46,7 @@ SRCDATE_gpesyncd ?= "20061128"
 
 # GNOME
 SRCDATE_gconf-dbus ?= "20060719"
-SRCDATE_gnome-vfs-dbus ?= "20060119"
+SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
 #Misc apps, sorted by alphabet
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 189021747a..86e9429506 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -1,13 +1,12 @@
 TARGET_ARCH = "i586"
-TARGET_VENDOR = "-oe"
+PACKAGE_EXTRA_ARCHS = "i386 i486"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPES = "ext2.gz"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules"
-udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-PACKAGE_EXTRA_ARCHS = "i386"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
 
 require conf/machine/include/tune-c3.conf