[oe-commits] org.oe.dev merge of '452dd174691484101b95e30de9d1f28ba4615bcc'

[hrw commit]

merge of '452dd174691484101b95e30de9d1f28ba4615bcc'
     and 'e889f1ed6baf92f0a741781bad0574109afad57e'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 1071338fe9143d91f11215f627150ab1adc3a923
ViewMTN: http://monotone.openembedded.org/revision/info/1071338fe9143d91f11215f627150ab1adc3a923
Files:
1
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
packages/llvm/files
packages/llvm/llvm-gcc4-cross_svn.bb
packages/llvm/llvm-gcc4_svn.bb
packages/llvm/llvm_2.0.bb
conf/distro/angstrom-2008.1.conf
packages/llvm/llvm-native_2.0.bb
packages/tasks/task-boot.bb
Diffs:

#
# mt diff -r452dd174691484101b95e30de9d1f28ba4615bcc -r1071338fe9143d91f11215f627150ab1adc3a923
#
# 
# 
# 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"
# 
# add_dir "packages/llvm/files"
# 
# add_file "packages/llvm/llvm-gcc4-cross_svn.bb"
#  content [884f40c0da53dcbbb5f45f7872fdee34c10d45d6]
# 
# add_file "packages/llvm/llvm-gcc4_svn.bb"
#  content [5395442911ca3c74adab900d05567aa6edeff2aa]
# 
# add_file "packages/llvm/llvm_2.0.bb"
#  content [debb78dbdfb3f52c33d916c3c9d60be882490dbf]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [7cf6cf9abb330a4454395b20a82b0387f94dab20]
#    to [aa3a5caf95a0bb29ce59432c8870f9fceb2776fc]
# 
# patch "conf/machine/cm-x270.conf"
#  from [030387a4a7a870fe4a02783a30be65b1b9752695]
#    to [dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de]
# 
# patch "packages/llvm/llvm-native_2.0.bb"
#  from [ced3e88496cb6d6761a1f140a84df86765804bc5]
#    to [6f47db9782233e0bc95af6f34d8e61983666454e]
# 
============================================================
--- packages/llvm/llvm-gcc4-cross_svn.bb	884f40c0da53dcbbb5f45f7872fdee34c10d45d6
+++ packages/llvm/llvm-gcc4-cross_svn.bb	884f40c0da53dcbbb5f45f7872fdee34c10d45d6
@@ -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
+}	
============================================================
--- packages/llvm/llvm-gcc4_svn.bb	5395442911ca3c74adab900d05567aa6edeff2aa
+++ packages/llvm/llvm-gcc4_svn.bb	5395442911ca3c74adab900d05567aa6edeff2aa
@@ -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 \
+	       "
+
============================================================
--- packages/llvm/llvm_2.0.bb	debb78dbdfb3f52c33d916c3c9d60be882490dbf
+++ packages/llvm/llvm_2.0.bb	debb78dbdfb3f52c33d916c3c9d60be882490dbf
@@ -0,0 +1,6 @@
+require llvm.inc
+
+SRC_URI = "http://llvm.org/releases/2.0/llvm-${PV}.tar.gz"
+
+S = "${WORKDIR}/llvm-${PV}"
+
============================================================
--- 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"
+
============================================================
--- 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
============================================================
--- packages/llvm/llvm-native_2.0.bb	ced3e88496cb6d6761a1f140a84df86765804bc5
+++ packages/llvm/llvm-native_2.0.bb	6f47db9782233e0bc95af6f34d8e61983666454e
@@ -10,3 +10,7 @@ do_stage() {
 do_stage() {
 	install -m 755 ${S}/Release/bin/* ${STAGING_BINDIR_NATIVE}/
 }
+
+do_rm_work() {
+        :
+}


#
# mt diff -re889f1ed6baf92f0a741781bad0574109afad57e -r1071338fe9143d91f11215f627150ab1adc3a923
#
# 
# 
# patch "packages/tasks/task-boot.bb"
#  from [7ac26e95d7aaffe0b5e60aab60f1ddc2ffba85e1]
#    to [60ad04f700c75a0e13d10eb6be05890318c5b6ae]
# 
============================================================
--- packages/tasks/task-boot.bb	7ac26e95d7aaffe0b5e60aab60f1ddc2ffba85e1
+++ packages/tasks/task-boot.bb	60ad04f700c75a0e13d10eb6be05890318c5b6ae
@@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a devic
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r40"
+PR = "r41"
 
 inherit task
 
@@ -40,6 +40,7 @@ RDEPENDS_task-boot = "\
     base-passwd \
     busybox \
     initscripts \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
     modutils-initscripts \
     netbase \
     update-alternatives \