r433 - in trunk: oe/conf/distro/include oe/conf/machine oe/packages/tasks src/target/OM-2007/applications

[mickey at gta01.hmw-consulting.de]

Author: mickey
Date: 2006-12-19 18:45:01 +0100 (Tue, 19 Dec 2006)
New Revision: 433

Removed:
   trunk/oe/conf/machine/x86-sdk.conf
Modified:
   trunk/oe/conf/distro/include/openmoko.inc
   trunk/oe/conf/machine/armzone-qt2410.conf
   trunk/oe/conf/machine/fic-gta01.conf
   trunk/oe/packages/tasks/task-openmoko.bb
   trunk/src/target/OM-2007/applications/applications.pro
Log:
oe: update openmoko to use current OE snaphost


Modified: trunk/oe/conf/distro/include/openmoko.inc
===================================================================
--- trunk/oe/conf/distro/include/openmoko.inc	2006-12-19 16:49:30 UTC (rev 432)
+++ trunk/oe/conf/distro/include/openmoko.inc	2006-12-19 17:45:01 UTC (rev 433)
@@ -85,6 +85,8 @@
 PREFERRED_VERSION_gtk+ = "2.6.10"
 PREFERRED_VERSION_gtk-engines = "2.6.5"
 
+PREFERRED_VERSION_fontconfig = "2.4.1"
+
 #
 # OHand
 #

Modified: trunk/oe/conf/machine/armzone-qt2410.conf
===================================================================
--- trunk/oe/conf/machine/armzone-qt2410.conf	2006-12-19 16:49:30 UTC (rev 432)
+++ trunk/oe/conf/machine/armzone-qt2410.conf	2006-12-19 17:45:01 UTC (rev 433)
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4t"
+PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "qt2410-kernel"
 

Modified: trunk/oe/conf/machine/fic-gta01.conf
===================================================================
--- trunk/oe/conf/machine/fic-gta01.conf	2006-12-19 16:49:30 UTC (rev 432)
+++ trunk/oe/conf/machine/fic-gta01.conf	2006-12-19 17:45:01 UTC (rev 433)
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4t"
+PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "gta01-kernel"
 

Deleted: trunk/oe/conf/machine/x86-sdk.conf
===================================================================
--- trunk/oe/conf/machine/x86-sdk.conf	2006-12-19 16:49:30 UTC (rev 432)
+++ trunk/oe/conf/machine/x86-sdk.conf	2006-12-19 17:45:01 UTC (rev 433)
@@ -1,34 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Machine
-#@NAME: x86-sdk
-#@DESCRIPTION: Machine configuration for x86 SDK
-#-----------------------------------------------------------------------------
-
-TARGET_ARCH = "i486"
-TARGET_VENDOR = "-oe"
-IPKG_EXTRA_ARCHS = "x86"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget"
-
-MACHINE_EXTRA_RDEPENDS = ""
-MACHINE_EXTRA_RRECOMMENDS = ""
-
-MACHINE_TASK_PROVIDER = "task-base"
-
-# used by sysvinit_2
-SERIAL_CONSOLE = "-h 115200 ttyS0"
-
-# used by some images
-ROOT_FLASH_SIZE = "60M"
-# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
-
-# build tools
-EXTRA_IMAGEDEPENDS += "s3c2410-boot-usb-native sjf2410-linux-native"
-
-udevdir = "/dev"
-OLDEST_KERNEL = "2.6.5"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"

Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb	2006-12-19 16:49:30 UTC (rev 432)
+++ trunk/oe/packages/tasks/task-openmoko.bb	2006-12-19 17:45:01 UTC (rev 433)
@@ -5,7 +5,7 @@
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 DEPENDS = "dropbear"
-PR = "r16"
+PR = "r17"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -17,6 +17,7 @@
   task-openmoko-pim \
   \
   task-openmoko-demo \
+  task-openmoko-examples \
   task-openmoko-devel \
   task-openmoko-native-sdk \
 "
@@ -144,6 +145,16 @@
 "
 
 #
+# task-openmoko-examples
+#
+DESCRIPTION_task-openmoko-examples = "OpenMoko: Example Applications"
+RDEPENDS_task-openmoko-examples = "\
+  openmoko-stylus-demo-simple \
+  openmoko-stylus-demo \
+  openmoko-finger-demo \
+  openmoko-chordmaster"
+
+#
 # task-openmoko-devel
 #
 DESCRIPTION_task-openmoko-devel = "OpenMoko: Debugging Tools"

Modified: trunk/src/target/OM-2007/applications/applications.pro
===================================================================
--- trunk/src/target/OM-2007/applications/applications.pro	2006-12-19 16:49:30 UTC (rev 432)
+++ trunk/src/target/OM-2007/applications/applications.pro	2006-12-19 17:45:01 UTC (rev 433)
@@ -1,4 +1,8 @@
 TEMPLATE = subdirs
-SUBDIRS = openmoko-chordmaster 
+SUBDIRS = \
+  openmoko-chordmaster \
+  openmoko-footer \
+  openmoko-mainmenu \
+
 #openmoko-appmanager openmoko-dialer