[oe-commits] org.oe.dev merge of '3e30d03effd5d61bd64c55ec0e69214ced9039ca'

[koen commit]

merge of '3e30d03effd5d61bd64c55ec0e69214ced9039ca'
     and 'bf37569e4e207171af4ea9b1e9879b303cedf759'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: aa2078364e4ec412218f97604c7f2ace1d984103
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aa2078364e4ec412218f97604c7f2ace1d984103
Files:
1
conf/distro/angstrom-2008.1.conf
packages/angstrom/angstrom-x11-image.bb
Diffs:

#
# mt diff -r3e30d03effd5d61bd64c55ec0e69214ced9039ca -raa2078364e4ec412218f97604c7f2ace1d984103
#
# 
# 
# add_file "conf/distro/angstrom-2008.1.conf"
#  content [c74da6bbcd94b207b612bc10d48562fe6b3cd575]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	c74da6bbcd94b207b612bc10d48562fe6b3cd575
+++ conf/distro/angstrom-2008.1.conf	c74da6bbcd94b207b612bc10d48562fe6b3cd575
@@ -0,0 +1,36 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Angstrom <http://www.angstrom-distribution.org>
+#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
+#@MAINTAINER: Koen Kooi <koen at dominion.kabel.utwente.nl>
+#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille-media.de>
+#@--------------------------------------------------------------------
+
+# This is a testbed for unstable and/or untested things, while angstrom-2007.1 
+# is aiming for stability and a release.
+# Use this at your own risk, we welcome bugreports filed at 
+#    http://bugs.openembedded.org
+# In doubt, use DSITRO="angstrom-2007.1"
+
+require conf/distro/angstrom-2007.1.conf
+
+#DISTRO_VERSION = "2008.1"
+DISTRO_VERSION = "2008.1-test-${DATE}"
+DISTRO_REVISION = "0"
+
+PREFERRED_VERSION_gcc               ?= "4.2.1"
+PREFERRED_VERSION_gcc-cross         ?= "4.2.1"
+
+PREFERRED_VERSION_binutils          ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross    ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12"
+
+#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+
+#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
+PREFERRED_VERSION_glibc ?= "2.6"
+PREFERRED_VERSION_glibc-intermediate ?= "2.6"
+PREFERRED_VERSION_glibc-initial ?= "2.6"
+
+


#
# mt diff -rbf37569e4e207171af4ea9b1e9879b303cedf759 -raa2078364e4ec412218f97604c7f2ace1d984103
#
# 
# 
# patch "packages/angstrom/angstrom-x11-image.bb"
#  from [1b1ff2576e45aeb4cea7016dd081d42334955b36]
#    to [72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82]
# 
============================================================
--- packages/angstrom/angstrom-x11-image.bb	1b1ff2576e45aeb4cea7016dd081d42334955b36
+++ packages/angstrom/angstrom-x11-image.bb	72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82
@@ -9,7 +9,7 @@ ANGSTROM_EXTRA_INSTALL += " \
 PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
 
 ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer", "",d)} \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
 XSERVER ?= "xserver-kdrive-fbdev"