merge of '452dd174691484101b95e30de9d1f28ba4615bcc'

     and 'e889f1ed6baf92f0a741781bad0574109afad57e'

9 files changed, 69 insertions, 5 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 60557325a9..cdf2970201 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -8,7 +8,7 @@
 
 
 # Use Xorg R7.3 release
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
 
 # This is a testbed for unstable and/or untested things, while angstrom-2007.1 
@@ -42,3 +42,6 @@ PREFERRED_VERSION_gtk+             	= "2.12.0"
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
 PREFERRED_VERSION_pango                 = "1.18.1"
 
+# prefer newest for speed and fun
+PREFERRED_VERSION_udev			= "115"
+
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/cm-x270.conf
index ff0eb42a11..c712c3728e 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/cm-x270.conf
@@ -1,12 +1,12 @@
 #@TYPE: Machine
-#@Name: Compulab PXA270 system
-#@DESCRIPTION: Machine configuration for Compulab PXA270 system
+#@Name: Compulab cm-x270
+#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module
 #OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
 PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 require conf/machine/include/tune-xscale.inc
@@ -21,7 +21,7 @@ CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
 
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting
-# the following is the for the cm-x270 L module
+# the following is the port for the cm-x270 L module
 # I think the W module would use ttyS0, but has
 # not been tested.  This can be overwritten in 
 # local.conf
diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty b/packages/llvm/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty
+++ b/packages/llvm/files/.mtn2git_empty
diff --git a/packages/llvm/llvm-gcc4-cross_svn.bb b/packages/llvm/llvm-gcc4-cross_svn.bb
new file mode 100644
index 0000000000..48302c371d
--- /dev/null
+++ b/packages/llvm/llvm-gcc4-cross_svn.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "The Low Level Virtual Machine - gcc4 frontend"
+HOMEPAGE = "http://llvm.org"
+LICENSE = "various"
+
+DEPENDS = "llvm-native"
+
+PV = "2.0+svnr${SRCREV}"
+
+inherit autotools cross
+
+SRC_URI = "svn://anonsvn.opensource.apple.com/svn/llvm/;module=trunk \
+	   "
+	   
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--disable-shared \
+                --enable-llvm=/data/build/koen/OE/build/tmp/angstrom/work/i686-linux/llvm-native-2.0-r0/llvm-2.0 \
+	       "
+
+do_configure() {
+	gnu-configize
+	libtoolize --force
+	oe_runconf
+}	
+
+PARALLEL_MAKE = ""
+
+#oe_runmake gets distracted by GNUMakefiles...
+# we also need to get an install.sh and config-ml.in in gcc/ as well somehow
+do_compile_prepend() {
+	rm -f ${S}/GNUmakefile
+}	
diff --git a/packages/llvm/llvm-gcc4_svn.bb b/packages/llvm/llvm-gcc4_svn.bb
new file mode 100644
index 0000000000..599e2ca183
--- /dev/null
+++ b/packages/llvm/llvm-gcc4_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "The Low Level Virtual Machine - gcc4 frontend"
+HOMEPAGE = "http://llvm.org"
+LICENSE = "various"
+
+DEPENDS = "llvm-native"
+
+PV = "2.0+svnr${SRCREV}"
+
+inherit autotools cross
+
+SRC_URI = "svn://anonsvn.opensource.apple.com/svn/llvm/;module=trunk \
+	   "
+	   
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--disable-shared \
+                --enable-llvm \
+	       "
+
diff --git a/packages/llvm/llvm-native_2.0.bb b/packages/llvm/llvm-native_2.0.bb
index 9507c989cd..03e344cc11 100644
--- a/packages/llvm/llvm-native_2.0.bb
+++ b/packages/llvm/llvm-native_2.0.bb
@@ -10,3 +10,7 @@ S = "${WORKDIR}/llvm-${PV}"
 do_stage() {
 	install -m 755 ${S}/Release/bin/* ${STAGING_BINDIR_NATIVE}/
 }
+
+do_rm_work() {
+        :
+}
diff --git a/packages/llvm/llvm_2.0.bb b/packages/llvm/llvm_2.0.bb
new file mode 100644
index 0000000000..7e80f245cc
--- /dev/null
+++ b/packages/llvm/llvm_2.0.bb
@@ -0,0 +1,6 @@
+require llvm.inc
+
+SRC_URI = "http://llvm.org/releases/2.0/llvm-${PV}.tar.gz"
+
+S = "${WORKDIR}/llvm-${PV}"
+
diff --git a/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine
index e27931cf6b..e27931cf6b 100644
--- a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine
+++ b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine