[oe-commits] org.oe.dev merge of '439e88dbf769d76561150772ce1e5a9f63623d35'

[hrw commit]

merge of '439e88dbf769d76561150772ce1e5a9f63623d35'
     and 'ac39391bb7e64aa48f58a13b7174c19918cec7d8'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e889f1ed6baf92f0a741781bad0574109afad57e
ViewMTN: http://monotone.openembedded.org/revision/info/e889f1ed6baf92f0a741781bad0574109afad57e
Files:
1
conf/distro/angstrom-2008.1.conf
conf/machine/compulab-pxa270.conf
conf/machine/cm-x270.conf
packages/uclibc/uclibc-0.9.29/compulab-pxa270
packages/uclibc/uclibc-0.9.29/cm-x270
Diffs:

#
# mt diff -r439e88dbf769d76561150772ce1e5a9f63623d35 -re889f1ed6baf92f0a741781bad0574109afad57e
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [7cf6cf9abb330a4454395b20a82b0387f94dab20]
#    to [aa3a5caf95a0bb29ce59432c8870f9fceb2776fc]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	7cf6cf9abb330a4454395b20a82b0387f94dab20
+++ conf/distro/angstrom-2008.1.conf	aa3a5caf95a0bb29ce59432c8870f9fceb2776fc
@@ -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_pango                 
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
 PREFERRED_VERSION_pango                 = "1.18.1"
 
+# prefer newest for speed and fun
+PREFERRED_VERSION_udev			= "115"
+


#
# mt diff -rac39391bb7e64aa48f58a13b7174c19918cec7d8 -re889f1ed6baf92f0a741781bad0574109afad57e
#
# 
# 
# rename "conf/machine/compulab-pxa270.conf"
#     to "conf/machine/cm-x270.conf"
# 
# rename "packages/uclibc/uclibc-0.9.29/compulab-pxa270"
#     to "packages/uclibc/uclibc-0.9.29/cm-x270"
# 
# patch "conf/machine/cm-x270.conf"
#  from [030387a4a7a870fe4a02783a30be65b1b9752695]
#    to [dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de]
# 
============================================================
--- conf/machine/compulab-pxa270.conf	030387a4a7a870fe4a02783a30be65b1b9752695
+++ conf/machine/cm-x270.conf	dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de
@@ -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