summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-04-03 16:06:34 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-04-03 16:06:34 +0000
commit95c9c953d4dd5650e4bfa8dc93184c2bbae21458 (patch)
tree071f057340d65cec42fe3351e142295886e8fba0 /conf
parent768872e9379a11d7c4c8c3fa3b1dc6a0a28ab0d2 (diff)
parent5f72d5a8d7c068e2b3420e765be27c1a4a9435c3 (diff)
merge of '36aafe8bf796c1a22dbb0f206a98273975012f86'
and '97edb3a78d8b0c88ded6a2d1fc1b78a15c1d5b14'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/netvista.conf35
1 files changed, 17 insertions, 18 deletions
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index f5787e6448..b19558bd97 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -1,23 +1,22 @@
#@TYPE: Machine
-#@NAME: IBM Netvista
-#@DESCRIPTION: Machine configuration for the IBM Netvista thin client
+#@NAME: X86
+#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
-TARGET_ARCH = "i386"
-PREFERRED_PROVIDER_xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils"
-#BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules"
-#IMAGE_FSTYPES = "cramfs"
-EXTRA_IMAGEDEPENDS = ""
-SERIAL_CONSOLE = "ttyS0 115200 vt100"
+# 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 = "netvista"
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+# todo: convert to task-base
+# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-TARGET_VENDOR = "-oe"
-PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
-IMAGE_FSTYPES = "ext2"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword"
-
-#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
-#udevdir = "/dev"
+MACHINE_TASK_PROVIDER = "task-base"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa"
+ROOT_FLASH_SIZE = "32"
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"