r48 - in trunk/oe: conf/distro conf/distro/include packages/tasks

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Sat Sep 23 13:23:30 CEST 2006


Author: mickey
Date: 2006-09-23 11:23:29 +0000 (Sat, 23 Sep 2006)
New Revision: 48

Modified:
   trunk/oe/conf/distro/include/sane-srcdates.inc
   trunk/oe/conf/distro/openmoko.conf
   trunk/oe/packages/tasks/task-openmoko.bb
Log:
upgrade OpenMoko to using gcc 4.1.1, glibc 2.4 / NTPL, binutils 2.17


Modified: trunk/oe/conf/distro/include/sane-srcdates.inc
===================================================================
--- trunk/oe/conf/distro/include/sane-srcdates.inc	2006-09-16 20:20:02 UTC (rev 47)
+++ trunk/oe/conf/distro/include/sane-srcdates.inc	2006-09-23 11:23:29 UTC (rev 48)
@@ -44,6 +44,7 @@
 # GNOME
 SRCDATE_gconf-dbus ?= "20060719"
 SRCDATE_gnome-vfs-dbus ?= "20060119"
+#SRCDATE_gnome-vfs-dbus = "20060803"
 SRCDATE_gtkhtml2 ?= "20060323"
 
 #Misc apps, sorted by alphabet

Modified: trunk/oe/conf/distro/openmoko.conf
===================================================================
--- trunk/oe/conf/distro/openmoko.conf	2006-09-16 20:20:02 UTC (rev 47)
+++ trunk/oe/conf/distro/openmoko.conf	2006-09-23 11:23:29 UTC (rev 48)
@@ -31,13 +31,22 @@
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-# NOTE: 4.1.1 should be used eventually
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
+# EABI stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
+# Toolchain
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+# binutils 2.17 error out during kernel build (relocations in discarded sections)
+PREFERRED_VERSION_binutils ?= "2.17"
+PREFERRED_VERSION_binutils-cross ?= "2.17"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+PREFERRED_VERSION_glibc ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.4"
+
 #
 # Target OS & FPU system
 # 
@@ -46,7 +55,6 @@
 TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 
 #
 # Features
@@ -80,6 +88,7 @@
 PREFERRED_PROVIDER_gconf = "gconf-dbus"
 PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
 PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
+PREFERRED_VERSION_qemu-native = "0.8.2"
 
 #
 # Opie

Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb	2006-09-16 20:20:02 UTC (rev 47)
+++ trunk/oe/packages/tasks/task-openmoko.bb	2006-09-23 11:23:29 UTC (rev 48)
@@ -6,7 +6,7 @@
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 DEPENDS = "dropbear"
-PR = "r3"
+PR = "r6"
 
 PACKAGES = "\
   task-openmoko-core \
@@ -17,6 +17,7 @@
   task-openmoko-pim \
   \
   task-openmoko-devel \
+  task-openmoko-sdk-native \
 "
 
 RDEPENDS_task-openmoko-everything := "${PACKAGES}"
@@ -38,6 +39,7 @@
 
 #
 # task-openmoko-net
+#
 DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Networking"
 RDEPENDS_task-openmoko-net = "\
   bluez-utils \
@@ -51,7 +53,9 @@
   gtk+ \
   matchbox-wm \
   matchbox-themes-gtk \
+  matchbox-desktop \
   matchbox-panel-manager \
+  matchbox-panel \
   xserver-kdrive-fbdev \
 "
 
@@ -80,10 +84,10 @@
 #
 # task-openmoko-devel
 #
-DESCRIPTION_task-openmoko-devel = "OpenMoko: Development Tools"
+DESCRIPTION_task-openmoko-devel = "OpenMoko: Debugging Tools"
 RDEPENDS_task-openmoko-devel = "\
   strace \
-  ltrace \
+#  ltrace \
   gdb \
   gdbserver \
   tcpdump \
@@ -96,3 +100,20 @@
   uucp \
 "
 
+#
+# task-openmoko-sdk-native
+#
+DESCRIPTION_task-openmoko-sdk-native = "OpenMoko: Native SDK"
+RDEPENDS_task-openmoko-sdk-native = "\
+  binutils \
+  gcc \
+  gcc-symlinks \
+  cpp \
+  cpp-symlinks \
+  libc6-dev \
+  glibc-utils \
+  ldd \
+  g++ \
+  g++-symlinks \
+  libstdc++-dev \
+"





More information about the commitlog mailing list