[oe-commits] org.oe.dev merge of '590d553c33bb0be5913ed85157e07a6b2896b7bc'

[ifaistos commit]

merge of '590d553c33bb0be5913ed85157e07a6b2896b7bc'
     and 'd3d2de82071747b03daf36c862b44f3b362a7753'

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 50f5006af4ca730c27c32ca507151f7be0efe736
ViewMTN: http://monotone.openembedded.org/revision.psp?id=50f5006af4ca730c27c32ca507151f7be0efe736
Files:
1
classes/magicbox-image.bbclass
packages/clutter/clutter_svn.bb
packages/clutter/clutter-glx_svn.bb
conf/distro/angstrom-2007.1.conf
conf/distro/openmoko.conf
Diffs:

#
# mt diff -r590d553c33bb0be5913ed85157e07a6b2896b7bc -r50f5006af4ca730c27c32ca507151f7be0efe736
#
# 
# 
# patch "classes/magicbox-image.bbclass"
#  from [d3416edd542deec7e6b5436728ae0648919ba530]
#    to [18813cb17b723bff3f9969d1653a7d3aa6d8cac8]
# 
============================================================
--- classes/magicbox-image.bbclass	d3416edd542deec7e6b5436728ae0648919ba530
+++ classes/magicbox-image.bbclass	18813cb17b723bff3f9969d1653a7d3aa6d8cac8
@@ -1,6 +1,6 @@ magicbox_gen_images() {
 magicbox_gen_images() {
         # find latest kernel
-        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -n 1`
         if [ -z "$KERNEL" ]; then
                 oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Exiting !"
                 exit 1


#
# mt diff -rd3d2de82071747b03daf36c862b44f3b362a7753 -r50f5006af4ca730c27c32ca507151f7be0efe736
#
# 
# 
# rename "packages/clutter/clutter_svn.bb"
#     to "packages/clutter/clutter-glx_svn.bb"
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [d0ff9dfe336a5f4d55a70405d1161d104bd79ef9]
#    to [40f554d7fbbdf20605bcbb5422656b302721e245]
# 
# patch "conf/distro/openmoko.conf"
#  from [dc1779d7738b8b9c44357bc8d5f3e939e630389a]
#    to [fb009383a61be983899d01b4c7a8a16126bf43f9]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	d0ff9dfe336a5f4d55a70405d1161d104bd79ef9
+++ conf/distro/angstrom-2007.1.conf	40f554d7fbbdf20605bcbb5422656b302721e245
@@ -41,7 +41,9 @@ FEED_ARCH_h6300		= "armv4t"
 
 FEED_ARCH_ep93xx 	= "armv4t"
 FEED_ARCH_h6300		= "armv4t"
-FEED_ARCH_fic-gta01     = "armv4t"
+FEED_ARCH_fic-gta01	= "armv4t"
+FEED_ARCH_fic-gta02 = "armv4t"
+FEED_ARCH_fic-hxd8	= "armv4t"
 
 #armv5t machines
 
@@ -152,7 +154,7 @@ PREFERRED_VERSION_gtk+             = "2.
 
 # newer poppler cvs breaks some apps, fix until popper 6 and apps
 # catch up with api changes
-PREFERRED_VERSION_poppler          = "0.5.4"
+# PREFERRED_VERSION_poppler          = "0.5.4"
 
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
============================================================
--- conf/distro/openmoko.conf	dc1779d7738b8b9c44357bc8d5f3e939e630389a
+++ conf/distro/openmoko.conf	fb009383a61be983899d01b4c7a8a16126bf43f9
@@ -1,9 +1,11 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: OpenMoKo
-#@DESCRIPTION: Linux Distribution Configuration for the FIC GTA01 Project
+#@NAME: OpenMoko
+#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
 #-----------------------------------------------------------------------------
 
+require conf/distro/angstrom-2007.1.conf
+
 #
 # Header
 #
@@ -11,18 +13,3 @@ DISTRO_TYPE = "debug"
 DISTRO_VERSION = ".dev-snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
-
-require conf/distro/include/openmoko.inc
-
-# Toolchain
-PREFERRED_VERSION_gcc ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
-# 2.5 has less bugs, but crashes dropbear :/
-PREFERRED_VERSION_glibc ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.4"
-
-PREFERRED_VERSION_lmsensors-apps ?= "2.10.1"