r214 - in trunk/oe: . classes conf conf/distro/include

[mickey at gta01.hmw-consulting.de]

Author: mickey
Date: 2006-11-12 14:32:14 +0000 (Sun, 12 Nov 2006)
New Revision: 214

Added:
   trunk/oe/classes/
   trunk/oe/classes/openmoko-base.bbclass
   trunk/oe/classes/openmoko.bbclass
Modified:
   trunk/oe/conf/distro/include/openmoko.inc
   trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
   trunk/oe/conf/site.conf
Log:
oe: add openmoko build classes and sync. preferred openmoko versions


Added: trunk/oe/classes/openmoko-base.bbclass
===================================================================
--- trunk/oe/classes/openmoko-base.bbclass	2006-11-12 14:31:52 UTC (rev 213)
+++ trunk/oe/classes/openmoko-base.bbclass	2006-11-12 14:32:14 UTC (rev 214)
@@ -0,0 +1,16 @@
+HOMEPAGE ?= "http://www.openmoko.org"
+LICENSE ?= "GPL"
+OPENMOKO_RELEASE ?= "OM-2007"
+OPENMOKO_MIRROR ?= "svn://svn.gta01.hmw-consulting.de/trunk"
+
+def openmoko_base_get_subdir(d):
+    import bb
+    openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    if section == 'base' or section == 'libs': return ""
+    else: return section
+
+SUBDIR = "${@openmoko_base_get_subdir(d)}"
+
+SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+

Added: trunk/oe/classes/openmoko.bbclass
===================================================================
--- trunk/oe/classes/openmoko.bbclass	2006-11-12 14:31:52 UTC (rev 213)
+++ trunk/oe/classes/openmoko.bbclass	2006-11-12 14:32:14 UTC (rev 214)
@@ -0,0 +1,3 @@
+inherit openmoko-base autotools pkgconfig
+
+DEPENDS_prepend = "${@["openmoko-libs ", ""][(bb.data.getVar('PN', d, 1) == 'openmoko-libs')]}"

Modified: trunk/oe/conf/distro/include/openmoko.inc
===================================================================
--- trunk/oe/conf/distro/include/openmoko.inc	2006-11-12 14:31:52 UTC (rev 213)
+++ trunk/oe/conf/distro/include/openmoko.inc	2006-11-12 14:32:14 UTC (rev 214)
@@ -66,6 +66,38 @@
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 #
+# Gnome
+#
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+PREFERRED_PROVIDER_gconf = "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
+
+PREFERRED_VERSION_dbus-native = "0.92"
+PREFERRED_VERSION_dbus = "0.92"
+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.6.4"
+PREFERRED_VERSION_gtk+ = "2.6.10"
+PREFERRED_VERSION_gtk-engines = "2.6.5"
+
+#
+# OHand
+#
+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"
@@ -78,7 +110,7 @@
 require conf/distro/include/preferred-e-versions.inc
 
 #
-# Versions for OpenMoko
+# OpenMoko
 #
 require conf/distro/include/preferred-openmoko-versions.inc
 

Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2006-11-12 14:31:52 UTC (rev 213)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc	2006-11-12 14:32:14 UTC (rev 214)
@@ -1,42 +1,25 @@
 #
-# Specify which versions of packages to build
+# Specify which versions of OpenMoko packages to build
 #
 
-#work around some breakages
-#SRCDATE_minimo=20050401
+#
+# Base
+#
 
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
-
-# dbus / Gtk+
-
-PREFERRED_VERSION_dbus-native = "0.92"
-PREFERRED_VERSION_dbus = "0.92"
-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.6.4"
-PREFERRED_VERSION_gtk+ = "2.6.10" 
-PREFERRED_VERSION_gtk-engines = "2.6.5"
-
-# Gnome
-
-# Development
-PREFERRED_PROVIDER_qemu-native = "qemu-native"
-PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}"
-
-# O-Hand
-PREFERRED_VERSION_dates = "0.1"
-PREFERRED_VERSION_contacts = "0.1"
-
-# OpenMoko
-
 SRCDATE_gsm = "now"
 SRCDATE_openmoko-session = "now"
 SRCDATE_openmoko-common = "now"
 SRCDATE_openmoko-theme-standard = "now"
+SRCDATE_openmoko-libs = "now"
 
+#
+# Examples
+#
+SRCDATE_openmoko-paned-demo = "now"
+SRCDATE_openmoko-finger-demo = "now"
+
+#
+# Applications
+#
+SRCDATE_openmoko-chordmaster = "now"
+

Modified: trunk/oe/conf/site.conf
===================================================================
--- trunk/oe/conf/site.conf	2006-11-12 14:31:52 UTC (rev 213)
+++ trunk/oe/conf/site.conf	2006-11-12 14:32:14 UTC (rev 214)
@@ -22,6 +22,3 @@
 PARALLEL_MAKE = ""
 
 SRCDATE = "20060814"
-
-OPENMOKO_MIRROR = "svn://svn.gta01.hmw-consulting.de/trunk/src/target/OM-2007"
-