3 files changed, 10 insertions, 11 deletions
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index f2a1869b99..c7007023f8 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -9,15 +9,15 @@ TARGET_ARCH = "i586"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486"
 
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
-OLDEST_KERNEL = "2.6.18"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
 
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-IMAGE_FSTYPES = "ext2.gz"
+IMAGE_FSTYPES ?= "ext2.gz"
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 5399316cd5..9fb8872d8e 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -8,15 +8,14 @@
 TARGET_ARCH = "i686"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
-OLDEST_KERNEL = "2.6.20"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-IMAGE_FSTYPES = "ext2.gz"
+IMAGE_FSTYPES ?= "ext2.gz"
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index c35e7ad389..c486f1bd2e 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -1,18 +1,18 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@NAME: X86
 #@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
 
 # i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i486"
-# TARGET_VENDOR = "-oe"
 PACKAGE_EXTRA_ARCHS = "x86"
-PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 KERNEL_IMAGETYPE = "bzImage"
-# todo: convert to task-base
-# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86"
 
 udevdir = "/dev"