s/GPE_MACHINE_CLASS/GUI_MACHINE_CLASS

BKrev: 41af1313bIHIjKXoMCGcKPx8G-pbSw

7 files changed, 32 insertions, 6 deletions

diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 75151b0f83..32186963d5 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -28,7 +28,7 @@ USE_VT = "0"
 include conf/machine/ipaq-common.conf
 include conf/machine/handheld-common.conf
 
-GPE_MACHINE_CLASS = "smallscreen"
+GUI_MACHINE_CLASS = "smallscreen"
 
 # not using tune-xscale so as to retain backwards compatibility
 include conf/machine/tune-strongarm.conf
diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf
index 7cde4217aa..68873bdb31 100644
--- a/conf/machine/ipaq-pxa-2.6.conf
+++ b/conf/machine/ipaq-pxa-2.6.conf
@@ -7,5 +7,5 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral module-init-tools"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules modutils-collateral module-init-tools"
 include conf/machine/handheld-common.conf
 
-GPE_MACHINE_CLASS = "smallscreen"
+GUI_MACHINE_CLASS = "smallscreen"
 
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index e69de29bb2..567cee8ba1 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@NAME: IBM Netvista
+#@DESCRIPTION: Machine configuration for the IBM Netvista thin client
+
+TARGET_ARCH = "i386"
+IPKG_ARCHS = "all i386 ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils"
+#BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules"
+#IMAGE_FSTYPE = "cramfs"
+EXTRA_IMAGEDEPENDS = ""
+SERIAL_CONSOLE = "ttyS0 115200 vt100"
+
+TARGET_VENDOR = "-oe"
+PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
+IMAGE_FSTYPE = "ext2"
+GUI_MACHINE_CLASS = "bigscreen"
+
+#BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
+#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
+#udevdir = "/dev"
+
+
+include conf/thinclient-common.conf
diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf
index b0f1170ada..187ff8bf49 100644
--- a/conf/machine/ramses.conf
+++ b/conf/machine/ramses.conf
@@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
 
 
 USE_DEVFS = "1"
-GPE_MACHINE_CLASS = "smallscreen"
+GUI_MACHINE_CLASS = "smallscreen"
 
 # For sysvinit:
 USE_VT = "0"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 96f39b3a8c..10c108fbc7 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -21,7 +21,7 @@ EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "ttySA0 115200 vt100"
 
 USE_DEVFS = "1"
-GPE_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 USE_VT = "0"
 
 include conf/machine/handheld-common.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index a705dcdb05..0868abf9a2 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -18,7 +18,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-GPE_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS = "gaim"
 
 include conf/machine/handheld-common.conf
diff --git a/conf/machine/zaurus-pxa.conf b/conf/machine/zaurus-pxa.conf
index 62c8e1f7ba..94d63bf3a6 100644
--- a/conf/machine/zaurus-pxa.conf
+++ b/conf/machine/zaurus-pxa.conf
@@ -17,7 +17,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > \
 	           ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
-GPE_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS = "gaim sylpheed"
 GPE_EXTRA_INSTALL = "gaim sylpheed"