merge of '971d18af52c7881e09c9f5ffa43d9bf33216ce83'

     and 'cc76392ac5a7b1ccde5981fd2e02094b88a5240a'

4 files changed, 226 insertions, 2 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0fbe7d19cc..b367b3f142 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,14 +8,23 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "32"
+DISTRO_REVISION = "33"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
 
-DISTRO_TYPE = "debug"
+DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
 
+# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
+# shipping some adhoc subset will be still useless and size burden for
+# users of all other languages/countries. Instead, worth to make it easy
+# to install additional languages: installer/wizard + metapackages which
+# will RRECOMMEND as much as possible content for a given language
+# (locales, UI transalations, help, etc. - useless for pros, but really 
+# helpful for common users).
+IMAGE_LINGUAS = "en-gb"
+
 #Set the right arch for the feeds
 #Alphabetically sorted
 
diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc
new file mode 100644
index 0000000000..0a86870b2c
--- /dev/null
+++ b/conf/distro/include/openmoko.inc
@@ -0,0 +1,127 @@
+#
+# Header
+#
+DISTRO_NAME = "OpenMoKo"
+
+#
+# Naming schemes
+#
+PARALLEL_INSTALL_MODULES = "1"
+INHERIT += "debian multimachine"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
+IMAGE_FSTYPES_x86 = "tar.gz"
+IMAGE_ROOTFS_SIZE_ext2 = "131072"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+# 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"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_VERSION_linux-libc-headers_x86 = "2.6.15.99"
+PREFERRED_VERSION_linux-libc_headers = "2.6.18"
+#
+# Features
+#
+DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget usbhost"
+
+#
+# Bootstrap & Init
+#
+MACHINE_TASK_PROVIDER = "task-base"
+require conf/distro/include/sane-srcdates.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
+PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
+PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+
+#
+# Gnome
+#
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+PREFERRED_PROVIDER_gconf = "gconf-dbus"
+#new
+#PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs"
+#old
+PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
+
+PREFERRED_VERSION_dbus-native = "1.0.2"
+PREFERRED_VERSION_dbus = "1.0.2"
+PREFERRED_VERSION_dbus-glib-native = "0.71"
+PREFERRED_VERSION_dbus-glib = "0.71"
+PREFERRED_VERSION_atk = "1.9.0"
+PREFERRED_VERSION_pango = "1.8.2"
+PREFERRED_VERSION_glib-2.0 = "2.12.3"
+PREFERRED_VERSION_gtk+ = "2.6.10"
+PREFERRED_VERSION_gtk-engines = "2.6.5"
+#PREFERRED_VERSION_gnome-vfs = "2.16.3"
+
+PREFERRED_VERSION_fontconfig = "2.4.1"
+
+#
+# GPE
+#
+PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
+
+#
+# O-Hand
+#
+PREFERRED_VERSION_contacts = "0.1"
+PREFERRED_VERSION_dates = "0.1"
+# PREFERRED_VERSION_web = "???"
+
+#
+# Development
+#
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}"
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+require conf/distro/include/preferred-opie-versions.inc
+
+#
+# Enlightenment
+#
+require conf/distro/include/preferred-e-versions.inc
+
+#
+# OpenMoko
+#
+
+#We comment this out since external developers don't needs to use SRCDATE="now" as that generated unneed traffic
+#require conf/distro/include/preferred-openmoko-versions.inc
+
diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc
new file mode 100644
index 0000000000..263406c90b
--- /dev/null
+++ b/conf/distro/include/preferred-openmoko-versions.inc
@@ -0,0 +1,60 @@
+#
+# Specify which versions of OpenMoko packages to build
+#
+
+#
+# Base
+#
+
+SRCDATE_uboot = "now"
+SRCDATE_uboot-gta01 = "now"
+SRCDATE_kernel = "now"
+SRCDATE_linux-gta01 = "now"
+SRCDATE_linux-gta01-nobbt = "now"
+SRCDATE_libgsmd = "now"
+SRCDATE_openmoko-session = "now"
+SRCDATE_openmoko-common = "now"
+SRCDATE_openmoko-theme-standard = "now"
+SRCDATE_openmoko-libs = "now"
+
+#
+# Examples
+#
+SRCDATE_openmoko-stylus-demo = "now"
+SRCDATE_openmoko-stylus-demo-simple = "now"
+SRCDATE_openmoko-finger-demo = "now"
+SRCDATE_openmoko-panel-demo = "now"
+SRCDATE_openmoko-panel-demo-simple = "now"
+
+#
+# PIM
+#
+SRCDATE_openmoko-contacts = "now"
+SRCDATE_openmoko-dates = "now"
+
+#
+# Applications
+#
+SRCDATE_openmoko-appmanager = "now"
+SRCDATE_openmoko-chordmaster = "now"
+SRCDATE_openmoko-dialer = "now"
+SRCDATE_openmoko-footer = "now"
+SRCDATE_openmoko-phone = "now"
+SRCDATE_openmoko-mainmenu = "now"
+SRCDATE_openmoko-taskmanager = "now"
+
+#
+# Multimedia
+#
+SRCDATE_openmoko-simplemediaplayer = "now"
+
+#
+# Panel Plugins
+#
+SRCDATE_openmoko-panel-clock = "now"
+SRCDATE_openmoko-panel-battery = "now"
+SRCDATE_openmoko-panel-mainmenu = "now"
+SRCDATE_openmoko-panel-gsm = "now"
+SRCDATE_openmoko-panel-gps = "now"
+SRCDATE_openmoko-panel-bt = "now"
+SRCDATE_openmoko-panel-usb = "now"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
new file mode 100644
index 0000000000..6e33867aa9
--- /dev/null
+++ b/conf/distro/openmoko.conf
@@ -0,0 +1,28 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: OpenMoKo
+#@DESCRIPTION: Linux Distribution Configuration for the FIC GTA01 Project
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "OpenMoKo"
+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"