summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/alsa/alsa-state.bb3
-rw-r--r--packages/base-files/base-files/openmoko/issue2
-rw-r--r--packages/base-files/base-files/openmoko/issue.net2
-rw-r--r--packages/binutils/binutils-2.18/binutils-uclibc-gas-needs-libm.patch38
-rw-r--r--packages/binutils/binutils_2.18.bb3
-rw-r--r--packages/classpath/classpath-minimal_0.97.1.bb7
-rw-r--r--packages/classpath/classpath_0.97.1.bb8
-rw-r--r--packages/classpath/files/SimpleName.diff66
-rw-r--r--packages/classpath/files/netif_16.patch263
-rw-r--r--packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch14
-rw-r--r--packages/dbus/dbus_1.2.1.bb2
-rw-r--r--packages/espeak/espeak-data_1.37.bb (renamed from packages/espeak/espeak-data_1.35.bb)0
-rw-r--r--packages/espeak/espeak.inc2
-rw-r--r--packages/espeak/espeak_1.37.bb (renamed from packages/espeak/espeak_1.35.bb)4
-rw-r--r--packages/exalt/.mtn2git_empty0
-rw-r--r--packages/exalt/exalt-daemon/.mtn2git_empty0
-rw-r--r--packages/exalt/exalt-daemon/init37
-rw-r--r--packages/exalt/exalt-daemon_svn.bb13
-rw-r--r--packages/exalt/exalt-module/.mtn2git_empty0
-rw-r--r--packages/exalt/exalt-module/autotools-fix.patch12
-rw-r--r--packages/exalt/exalt-module_svn.bb19
-rw-r--r--packages/exalt/exalt.inc12
-rw-r--r--packages/exalt/exalt_svn.bb4
-rw-r--r--packages/exalt/libexalt-dbus_svn.bb9
-rw-r--r--packages/exalt/libexalt_svn.bb8
-rw-r--r--packages/gcc/gcc-configure-cross.inc6
-rw-r--r--packages/gcc/gcc-cross_4.1.1.bb2
-rw-r--r--packages/gcc/gcc-cross_4.1.2.bb2
-rw-r--r--packages/gcc/gcc-cross_4.2.1.bb2
-rw-r--r--packages/gcc/gcc-cross_4.2.2.bb2
-rw-r--r--packages/gcc/gcc-cross_4.3.0.bb2
-rw-r--r--packages/gsm/files/gsmd1
-rw-r--r--packages/gsm/gsmd.inc2
-rw-r--r--packages/images/minimal-openmoko-image.bb2
-rw-r--r--packages/images/openmoko-image.bb2
-rw-r--r--packages/images/openmoko-minimal-image.bb4
-rw-r--r--packages/linux/linux-2.6.25/kilauea/.mtn2git_empty0
-rw-r--r--packages/linux/linux-2.6.25/kilauea/defconfig1061
-rw-r--r--packages/linux/linux.inc4
-rw-r--r--packages/linux/linux_2.6.25.bb1
-rw-r--r--packages/meta/openmoko-feed.bb2
-rw-r--r--packages/mozilla/firefox.inc5
-rw-r--r--packages/mozilla/firefox_1.0.7.bb2
-rw-r--r--packages/openmoko-apps/openmoko-appmanager_svn.bb2
-rw-r--r--packages/openmoko-apps/openmoko-calculator_svn.bb2
-rw-r--r--packages/openmoko-apps/openmoko-dialer_svn.bb2
-rw-r--r--packages/openmoko-apps/openmoko-footer_svn.bb2
-rw-r--r--packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb4
-rw-r--r--packages/openmoko-apps/openmoko-messages_svn.bb2
-rw-r--r--packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb2
-rw-r--r--packages/openmoko-apps/openmoko-taskmanager_svn.bb2
-rw-r--r--packages/openmoko-apps/openmoko-terminal_svn.bb2
-rw-r--r--packages/openmoko-base/openmoko-common_svn.bb2
-rw-r--r--packages/openmoko-base/openmoko-icon-theme-standard_svn.bb2
-rw-r--r--packages/openmoko-base/openmoko-session_svn.bb2
-rw-r--r--packages/openmoko-base/openmoko-sound-system_0.1.0.bb2
-rw-r--r--packages/openmoko-base/openmoko-sound-theme-standard_svn.bb2
-rw-r--r--packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb2
-rw-r--r--packages/openmoko-base/openmoko-theme-standard_svn.bb2
-rw-r--r--packages/openmoko-examples/openmoko-finger-demo_svn.bb2
-rw-r--r--packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb2
-rw-r--r--packages/openmoko-examples/openmoko-panel-demo_svn.bb2
-rw-r--r--packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb2
-rw-r--r--packages/openmoko-examples/openmoko-stylus-demo_svn.bb2
-rw-r--r--packages/openmoko-inputmethods/openmoko-keyboard_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb6
-rw-r--r--packages/openmoko-pim/openmoko-contacts_svn.bb2
-rw-r--r--packages/openmoko-pim/openmoko-dates_svn.bb2
-rw-r--r--packages/openmoko-pim/openmoko-tasks_svn.bb2
-rw-r--r--packages/openmoko-pim/openmoko-today_svn.bb2
-rw-r--r--packages/openmoko-projects/diversity-nav_svn.bb6
-rw-r--r--packages/openmoko-projects/openmoko-agpsui_svn.bb13
-rw-r--r--packages/openmoko-projects/tangogps/.mtn2git_empty0
-rw-r--r--packages/openmoko-projects/tangogps/global-config-h.patch30
-rw-r--r--packages/openmoko-projects/tangogps_0.7.bb17
-rw-r--r--packages/openmoko-tools/openmoko-chordmaster_svn.bb2
-rw-r--r--packages/openmoko2/neod_svn.bb4
-rw-r--r--packages/openmoko2/openmoko-alsa-scenarios.bb21
-rw-r--r--packages/openmoko2/openmoko-appearance_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-appmanager2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-browser2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-calculator2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-common2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-contacts2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-dates2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-feed-configs.bb23
-rw-r--r--packages/openmoko2/openmoko-feedreader2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-firststart2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-mediaplayer2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-messages2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-sample2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-session2.bb8
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session4
-rw-r--r--packages/openmoko2/openmoko-sound-system2_0.1.0.bb2
-rw-r--r--packages/openmoko2/openmoko-sound-theme-standard2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-tasks2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-terminal2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-theme-standard2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-today2-folders_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-today2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-worldclock2_svn.bb2
-rw-r--r--packages/openmoko2/settingsgui_0.7+0.8-beta.bb2
-rw-r--r--packages/openmoko2/settingsgui_0.8.bb2
-rw-r--r--packages/python/python-openmoko_0.1.bb2
-rwxr-xr-xpackages/settings-daemon/files/70settings-daemon2
-rw-r--r--packages/settings-daemon/settings-daemon_svn.bb2
-rw-r--r--packages/speex/speex_1.2-beta3.bb4
-rw-r--r--packages/tasks/task-base.bb4
-rw-r--r--packages/tasks/task-mokogateway.bb2
-rw-r--r--packages/tasks/task-nas-server.bb2
-rw-r--r--packages/tasks/task-openmoko-base.bb11
-rw-r--r--packages/tasks/task-openmoko-debug.bb2
-rw-r--r--packages/tasks/task-openmoko-examples.bb2
-rw-r--r--packages/tasks/task-openmoko-feed.bb2
-rw-r--r--packages/tasks/task-openmoko-games.bb4
-rw-r--r--packages/tasks/task-openmoko-linux.bb4
-rw-r--r--packages/tasks/task-openmoko-native-sdk.bb2
-rw-r--r--packages/tasks/task-openmoko-net.bb4
-rw-r--r--packages/tasks/task-openmoko-phone.bb4
-rw-r--r--packages/tasks/task-openmoko-pim.bb4
-rw-r--r--packages/tasks/task-openmoko-python-devel.bb2
-rw-r--r--packages/tasks/task-openmoko-toolchain-host.bb2
-rw-r--r--packages/tasks/task-openmoko-toolchain-target.bb2
-rw-r--r--packages/tasks/task-openmoko-ui.bb8
-rw-r--r--packages/tasks/task-openmoko.bb2
-rw-r--r--packages/tslib/tslib/om-gta02/.mtn2git_empty0
-rw-r--r--packages/tslib/tslib/om-gta02/ts.conf25
-rw-r--r--packages/tslib/tslib_1.0.bb2
-rw-r--r--packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb2
-rw-r--r--packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb8
-rw-r--r--packages/u-boot/u-boot_1.3.2.bb7
-rw-r--r--packages/upnp/libupnp_1.6.5.bb (renamed from packages/upnp/libupnp_1.4.2.bb)0
-rw-r--r--packages/wordlist/.mtn2git_empty0
-rw-r--r--packages/wordlist/files/.mtn2git_empty0
-rw-r--r--packages/wordlist/files/rules218
-rw-r--r--packages/wordlist/scowl_6.bb37
-rw-r--r--packages/xorg-driver/xf86-video-geode_2.8.0.bb2
149 files changed, 2100 insertions, 160 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 1d31bd765e..7d57364292 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -7,8 +7,9 @@
DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
+RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
PV = "0.1.0"
-PR = "r11"
+PR = "r12"
SRC_URI = " \
file://asoundrc \
diff --git a/packages/base-files/base-files/openmoko/issue b/packages/base-files/base-files/openmoko/issue
index fb0d224f9f..75124726f0 100644
--- a/packages/base-files/base-files/openmoko/issue
+++ b/packages/base-files/base-files/openmoko/issue
@@ -7,5 +7,5 @@
-' |
'---'
-The OpenMoko Distribution -- powered by Angstrom \n \l
+The Openmoko Distribution -- powered by Angstrom \n \l
diff --git a/packages/base-files/base-files/openmoko/issue.net b/packages/base-files/base-files/openmoko/issue.net
index 1f19e8da8f..13050854cc 100644
--- a/packages/base-files/base-files/openmoko/issue.net
+++ b/packages/base-files/base-files/openmoko/issue.net
@@ -7,6 +7,6 @@
-' |
'---'
-The OpenMoko Distribution -- powered by Angstrom %h
+The Openmoko Distribution -- powered by Angstrom %h
diff --git a/packages/binutils/binutils-2.18/binutils-uclibc-gas-needs-libm.patch b/packages/binutils/binutils-2.18/binutils-uclibc-gas-needs-libm.patch
new file mode 100644
index 0000000000..db838cf20c
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-uclibc-gas-needs-libm.patch
@@ -0,0 +1,38 @@
+Source: Khem Raj <raj.khem@gmail.com>
+Disposition: submit upstream.
+
+Description:
+
+We do not need to have the libtool patch anymore for binutils after
+libtool has been updated upstream it include support for it. However
+for building gas natively on uclibc systems we have to link it with
+-lm so that it picks up missing symbols.
+
+/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_from_double':
+floatformat.c:(.text+0x1ec): undefined reference to `frexp'
+floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
+/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_to_double':
+floatformat.c:(.text+0x38a): undefined reference to `ldexp'
+floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
+floatformat.c:(.text+0x43e): undefined reference to `ldexp' floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
+collect2: ld returned 1 exit status
+make[4]: *** [as-new] Error 1
+
+Index: binutils-2.17.50/gas/configure.tgt
+===================================================================
+--- binutils-2.17.50.orig/gas/configure.tgt
++++ binutils-2.17.50/gas/configure.tgt
+@@ -408,6 +408,12 @@ case ${generic_target} in
+ *-*-netware) fmt=elf em=netware ;;
+ esac
+
++case ${generic_target} in
++ arm-*-*uclibc*)
++ need_libm=yes
++ ;;
++esac
++
+ case ${cpu_type} in
+ alpha | arm | i386 | ia64 | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
+ bfd_gas=yes
+
diff --git a/packages/binutils/binutils_2.18.bb b/packages/binutils/binutils_2.18.bb
index de13f88142..ada367fe70 100644
--- a/packages/binutils/binutils_2.18.bb
+++ b/packages/binutils/binutils_2.18.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
require binutils.inc
@@ -11,6 +11,7 @@ SRC_URI = "\
file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+ file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
"
# powerpc patches
diff --git a/packages/classpath/classpath-minimal_0.97.1.bb b/packages/classpath/classpath-minimal_0.97.1.bb
index 31abce59c7..131dc3fac5 100644
--- a/packages/classpath/classpath-minimal_0.97.1.bb
+++ b/packages/classpath/classpath-minimal_0.97.1.bb
@@ -1,6 +1,11 @@
require classpath.inc
-PR = "r0"
+SRC_URI += "\
+ file://netif_16.patch;patch=1;pnum=0 \
+ file://SimpleName.diff;patch=1;pnum=0 \
+ "
+
+PR = "r1"
PROVIDES = "${PN} classpath"
diff --git a/packages/classpath/classpath_0.97.1.bb b/packages/classpath/classpath_0.97.1.bb
index b8cd02084a..1d677687d7 100644
--- a/packages/classpath/classpath_0.97.1.bb
+++ b/packages/classpath/classpath_0.97.1.bb
@@ -1,6 +1,11 @@
require classpath.inc
-PR = "r0"
+SRC_URI += "\
+ file://netif_16.patch;patch=1;pnum=0 \
+ file://SimpleName.diff;patch=1;pnum=0 \
+ "
+
+PR = "r1"
DEPENDS += "gtk+ gconf libxtst"
@@ -15,4 +20,3 @@ EXTRA_OECONF += "\
--with-vm=java \
"
-
diff --git a/packages/classpath/files/SimpleName.diff b/packages/classpath/files/SimpleName.diff
new file mode 100644
index 0000000000..ff2bec0f1c
--- /dev/null
+++ b/packages/classpath/files/SimpleName.diff
@@ -0,0 +1,66 @@
+Index: vm/reference/java/lang/VMClass.java
+===================================================================
+RCS file: /sources/classpath/classpath/vm/reference/java/lang/VMClass.java,v
+retrieving revision 1.20
+diff -u -r1.20 VMClass.java
+--- vm/reference/java/lang/VMClass.java 18 Sep 2007 21:52:38 -0000 1.20
++++ vm/reference/java/lang/VMClass.java 19 Apr 2008 15:19:00 -0000
+@@ -296,27 +296,43 @@
+ */
+ static String getSimpleName(Class klass)
+ {
++ int arrayCount = 0;
++ while (klass.isArray())
++ {
++ klass = klass.getComponentType();
++ ++arrayCount;
++ }
++ // now klass is the component type
++
++ String simpleComponentName = null;
+ if (isAnonymousClass(klass))
+- return "";
+- if (isArray(klass))
+ {
+- return getComponentType(klass).getSimpleName() + "[]";
++ simpleComponentName = "";
+ }
+- String fullName = getName(klass);
+- int pos = fullName.lastIndexOf("$");
+- if (pos == -1)
+- pos = 0;
+ else
+ {
+- ++pos;
+- while (Character.isDigit(fullName.charAt(pos)))
+- ++pos;
++ String fullName = getName(klass);
++ int pos = fullName.lastIndexOf("$");
++ if (pos != -1)
++ { //inner class or local class
++ // skip digits of local classes
++ while (Character.isDigit(fullName.charAt(pos+1)))
++ pos++;
++ }
++ else
++ {
++ pos = fullName.lastIndexOf(".");
++ }
++ simpleComponentName = fullName.substring(pos+1);
+ }
+- int packagePos = fullName.lastIndexOf(".", pos);
+- if (packagePos == -1)
+- return fullName.substring(pos);
+- else
+- return fullName.substring(packagePos + 1);
++
++ if (arrayCount == 0)
++ return simpleComponentName;
++
++ StringBuffer sb = new StringBuffer(simpleComponentName);
++ while (arrayCount-- > 0)
++ sb.append("[]");
++ return sb.toString();
+ }
+
+ /**
diff --git a/packages/classpath/files/netif_16.patch b/packages/classpath/files/netif_16.patch
new file mode 100644
index 0000000000..9b5e425ee9
--- /dev/null
+++ b/packages/classpath/files/netif_16.patch
@@ -0,0 +1,263 @@
+Index: java/net/NetworkInterface.java
+===================================================================
+RCS file: /sources/classpath/classpath/java/net/NetworkInterface.java,v
+retrieving revision 1.23
+diff -u -r1.23 NetworkInterface.java
+--- java/net/NetworkInterface.java 18 Dec 2006 21:37:39 -0000 1.23
++++ java/net/NetworkInterface.java 21 Apr 2008 10:38:25 -0000
+@@ -1,5 +1,5 @@
+ /* NetworkInterface.java --
+- Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+@@ -265,4 +265,50 @@
+
+ return result.toString();
+ }
++
++ /**
++ * Determines whether this interface is ready to transfer data.
++ *
++ * @return whether the interface is up
++ */
++ public boolean isUp()
++ throws SocketException
++ {
++ return VMNetworkInterface.isUp(netif.name);
++ }
++
++ /**
++ * Determines whether this interface does point to point
++ * transmission.
++ *
++ * @return whether the interface does point to point transmission
++ */
++ public boolean isPointToPoint()
++ throws SocketException
++ {
++ return VMNetworkInterface.isPointToPoint(netif.name);
++ }
++
++ /**
++ * Determines whether this interface is the loopback interface.
++ *
++ * @return whether the interface is the loopback interface
++ */
++ public boolean isLoopback()
++ throws SocketException
++ {
++ return VMNetworkInterface.isLoopback(netif.name);
++ }
++
++ /**
++ * Determines whether this interface supports multicast transmission.
++ *
++ * @return whether the interface supports multicast transmission.
++ */
++ public boolean supportsMulticast()
++ throws SocketException
++ {
++ return VMNetworkInterface.supportsMulticast(netif.name);
++ }
++
+ }
+Index: vm/reference/java/net/VMNetworkInterface.java
+===================================================================
+RCS file: /sources/classpath/classpath/vm/reference/java/net/VMNetworkInterface.java,v
+retrieving revision 1.7
+diff -u -r1.7 VMNetworkInterface.java
+--- vm/reference/java/net/VMNetworkInterface.java 18 Dec 2006 21:37:39 -0000 1.7
++++ vm/reference/java/net/VMNetworkInterface.java 21 Apr 2008 10:38:25 -0000
+@@ -1,5 +1,5 @@
+ /* VMNetworkInterface.java --
+- Copyright (C) 2005 Free Software Foundation, Inc.
++ Copyright (C) 2005, 2008 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+@@ -119,4 +119,13 @@
+ else
+ throw new SocketException("invalid interface address");
+ }
++
++ static native boolean isUp(String name) throws SocketException;
++
++ static native boolean isLoopback(String name) throws SocketException;
++
++ static native boolean isPointToPoint(String name) throws SocketException;
++
++ static native boolean supportsMulticast(String name) throws SocketException;
++
+ }
+Index: native/jni/java-net/java_net_VMNetworkInterface.c
+===================================================================
+RCS file: /sources/classpath/classpath/native/jni/java-net/java_net_VMNetworkInterface.c,v
+retrieving revision 1.6
+diff -u -r1.6 java_net_VMNetworkInterface.c
+--- native/jni/java-net/java_net_VMNetworkInterface.c 5 Apr 2007 12:34:19 -0000 1.6
++++ native/jni/java-net/java_net_VMNetworkInterface.c 21 Apr 2008 10:38:25 -0000
+@@ -1,5 +1,5 @@
+ /* VMNetworkInterface.c - Native methods for NetworkInterface class
+- Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
++ Copyright (C) 2003, 2005, 2006, 2008 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+@@ -50,11 +50,18 @@
+ #include <stdio.h>
+ #include <string.h>
+
++#include <net/if.h>
++#include <sys/ioctl.h>
++
+ #include <jni.h>
+ #include <jcl.h>
+
++#include <cpnative.h>
++#include <cpnet.h>
++
+ #include "java_net_VMNetworkInterface.h"
+
++int iff_flags(JNIEnv *, jstring, jint *);
+
+ static jmethodID java_net_VMNetworkInterface_init;
+ static jmethodID java_net_VMNetworkInterface_addAddress;
+@@ -251,4 +258,136 @@
+ #endif /* HAVE_IFADDRS_H && HAVE_GETIFADDRS */
+ }
+
++int iff_flags(JNIEnv *env, jstring name, jint *flags)
++{
++ struct ifreq iff;
++ const char *iff_name;
++ jint socket;
++ int error, retval;
++
++ if ((error = cpnet_openSocketDatagram(env, &socket, AF_INET)))
++ {
++ return error;
++ }
++
++ iff_name = JCL_jstring_to_cstring(env, name);
++ memset(&iff, 0, sizeof(iff));
++ strcpy(iff.ifr_name, iff_name);
++
++ if (ioctl(socket, SIOCGIFFLAGS, &iff) >= 0)
++ {
++ *flags = (jint) iff.ifr_flags;
++
++ retval = 0;
++ }
++ else
++ {
++ retval = errno;
++ }
++
++ cpnet_close(env, socket);
++
++ JCL_free_cstring(env, name, iff_name);
++
++ return retval;
++}
++
++JNIEXPORT jboolean JNICALL
++Java_java_net_VMNetworkInterface_isUp (JNIEnv *env, jclass class UNUSED,
++ jstring name)
++{
++ jint flags;
++ int error;
++ jboolean retval;
++
++ if ((error = iff_flags(env, name, &flags)))
++ {
++ JCL_ThrowException(env, "java/net/SocketException",
++ cpnative_getErrorString(error));
++
++ retval = JNI_FALSE;
++ }
++ else
++ {
++ retval = (flags & (IFF_UP | IFF_RUNNING))
++ ? JNI_TRUE
++ : JNI_FALSE;
++ }
++
++ return retval;
++}
++
++JNIEXPORT jboolean JNICALL
++Java_java_net_VMNetworkInterface_isPointToPoint (JNIEnv *env,
++ jclass class UNUSED,
++ jstring name)
++{
++ jint flags;
++ int error;
++ jboolean retval;
++
++ if ((error = iff_flags(env, name, &flags)))
++ {
++ JCL_ThrowException(env, "java/net/SocketException",
++ cpnative_getErrorString(error));
++
++ retval = JNI_FALSE;
++ }
++ else
++ {
++ retval = (flags & IFF_POINTOPOINT) ? JNI_TRUE
++ : JNI_FALSE;
++ }
++
++ return retval;
++}
++
++JNIEXPORT jboolean JNICALL
++Java_java_net_VMNetworkInterface_isLoopback (JNIEnv *env,
++ jclass class UNUSED,
++ jstring name)
++{
++ jint flags;
++ int error;
++ jboolean retval;
++
++ if ((error = iff_flags(env, name, &flags)))
++ {
++ JCL_ThrowException(env, "java/net/SocketException",
++ cpnative_getErrorString(error));
++
++ retval = JNI_FALSE;
++ }
++ else
++ {
++ retval = (flags & IFF_LOOPBACK) ? JNI_TRUE : JNI_FALSE;
++ }
++
++ return retval;
++}
++
++JNIEXPORT jboolean JNICALL
++Java_java_net_VMNetworkInterface_supportsMulticast (JNIEnv *env,
++ jclass class UNUSED,
++ jstring name)
++{
++ jint flags;
++ int error;
++ jboolean retval;
++
++ if ((error = iff_flags(env, name, &flags)))
++ {
++ JCL_ThrowException(env, "java/net/SocketException",
++ cpnative_getErrorString(error));
++
++ retval = JNI_FALSE;
++ }
++ else
++ {
++ retval = (flags & IFF_MULTICAST) ? JNI_TRUE : JNI_FALSE;
++ }
++
++ return retval;
++}
++
+ /* end of file */
diff --git a/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch b/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch
deleted file mode 100644
index 20c8d1b501..0000000000
--- a/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: dbus-1.1.20/tools/dbus-launch.c
-===================================================================
---- dbus-1.1.20.orig/tools/dbus-launch.c
-+++ dbus-1.1.20/tools/dbus-launch.c
-@@ -966,7 +966,9 @@ main (int argc, char **argv)
- char write_pid_fd_as_string[MAX_FD_LEN];
- char write_address_fd_as_string[MAX_FD_LEN];
-
-+#ifdef DBUS_BUILD_X11
- xdisplay = NULL;
-+#endif
-
- if (close_stderr)
- do_close_stderr ();
diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb
index ffbdbdd7bf..f331b140aa 100644
--- a/packages/dbus/dbus_1.2.1.bb
+++ b/packages/dbus/dbus_1.2.1.bb
@@ -1,5 +1,3 @@
include dbus.inc
PR = "r0"
-
-#SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
diff --git a/packages/espeak/espeak-data_1.35.bb b/packages/espeak/espeak-data_1.37.bb
index 4dc9aa9882..4dc9aa9882 100644
--- a/packages/espeak/espeak-data_1.35.bb
+++ b/packages/espeak/espeak-data_1.37.bb
diff --git a/packages/espeak/espeak.inc b/packages/espeak/espeak.inc
index c0502b6ca3..9a31dfdadd 100644
--- a/packages/espeak/espeak.inc
+++ b/packages/espeak/espeak.inc
@@ -5,3 +5,5 @@ LICENSE = "GPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
S = "${WORKDIR}/espeak-${PV}-source"
+
+DEPENDS = "portaudio-v19"
diff --git a/packages/espeak/espeak_1.35.bb b/packages/espeak/espeak_1.37.bb
index f7dacf54bc..4ea82e14b4 100644
--- a/packages/espeak/espeak_1.35.bb
+++ b/packages/espeak/espeak_1.37.bb
@@ -1,9 +1,9 @@
require espeak.inc
EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be", "espeak-data (= ${PV})", "", d)}'
-RDEPENDS = "portaudio-v19 ${EXTRA_PHONEMES}"
+RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
-PR = "r1"
+PR = "r0"
CXXFLAGS += "-DUSE_PORTAUDIO"
diff --git a/packages/exalt/.mtn2git_empty b/packages/exalt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/exalt/.mtn2git_empty
diff --git a/packages/exalt/exalt-daemon/.mtn2git_empty b/packages/exalt/exalt-daemon/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/exalt/exalt-daemon/.mtn2git_empty
diff --git a/packages/exalt/exalt-daemon/init b/packages/exalt/exalt-daemon/init
new file mode 100644
index 0000000000..cbceed1793
--- /dev/null
+++ b/packages/exalt/exalt-daemon/init
@@ -0,0 +1,37 @@
+#!/bin/sh
+set -e
+
+#need dbus and hald
+
+start() {
+ echo -n "Starting Exalt daemon..."
+ start-stop-daemon --start --exec /usr/sbin/exalt-daemon \
+ --pidfile /var/run/exaltd.pid
+ echo "done."
+}
+
+stop() {
+ echo -n "Stopping Exalt daemon..."
+ start-stop-daemon --stop --exec /usr/sbin/exalt-daemon \
+ --pidfile /var/run/exaltd.pid
+ echo "done."
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ sleep 2
+ start
+ ;;
+ *)
+ echo "Usage: $(basename $0) {start|stop|restart}"
+ exit 1
+esac
+
+exit 0
diff --git a/packages/exalt/exalt-daemon_svn.bb b/packages/exalt/exalt-daemon_svn.bb
new file mode 100644
index 0000000000..8f5e9afa29
--- /dev/null
+++ b/packages/exalt/exalt-daemon_svn.bb
@@ -0,0 +1,13 @@
+require exalt.inc
+
+DEPENDS = "evas edbus libexalt"
+
+SRC_URI += "file://init"
+
+do_install_append() {
+ install -D -m 0755 "${WORKDIR}/init" "${D}${sysconfdir}/dbus-1/event.d/40exaltd"
+}
+
+FILES_${PN} += "${sysconfdir}/dbus-1/event.d/"
+
+EXALT_MODULE = "daemon"
diff --git a/packages/exalt/exalt-module/.mtn2git_empty b/packages/exalt/exalt-module/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/exalt/exalt-module/.mtn2git_empty
diff --git a/packages/exalt/exalt-module/autotools-fix.patch b/packages/exalt/exalt-module/autotools-fix.patch
new file mode 100644
index 0000000000..8f3b3deb51
--- /dev/null
+++ b/packages/exalt/exalt-module/autotools-fix.patch
@@ -0,0 +1,12 @@
+Index: module/Makefile.am
+===================================================================
+--- module.orig/Makefile.am 2008-04-16 17:39:03.000000000 +0800
++++ module/Makefile.am 2008-04-16 17:39:05.000000000 +0800
+@@ -26,7 +26,6 @@
+ # the module .so file
+ INCLUDES = -I. \
+ -I$(top_srcdir) \
+- -I$(includedir) \
+ @EXALT_CFLAGS@ \
+ @e_cflags@
+
diff --git a/packages/exalt/exalt-module_svn.bb b/packages/exalt/exalt-module_svn.bb
new file mode 100644
index 0000000000..0a28a1a206
--- /dev/null
+++ b/packages/exalt/exalt-module_svn.bb
@@ -0,0 +1,19 @@
+require exalt.inc
+
+DEPENDS = "edbus libexalt-dbus"
+RDEPENDS_${PN} = "exalt"
+
+SRC_URI += "file://autotools-fix.patch;patch=1;minrev=78"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+FILES_${PN} += "${libdir}/enlightenment/modules/module_exalt/*.edj \
+ ${libdir}/enlightenment/modules/module_exalt/*/*.so \
+ ${libdir}/enlightenment/modules/module_exalt/*.desktop \
+ ${libdir}/enlightenment/modules/module_exalt/module_exalt"
+FILES_${PN}-dev += "${libdir}/enlightenment/modules/module_exalt/*/*.a \
+ ${libdir}/enlightenment/modules/module_exalt/*/*.la"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/module_exalt/*/.debug"
+FILES_${PN}-locale += "${libdir}/enlightenment/modules/module_exalt/locale"
+
+EXALT_MODULE = "module"
diff --git a/packages/exalt/exalt.inc b/packages/exalt/exalt.inc
new file mode 100644
index 0000000000..2e82be2d82
--- /dev/null
+++ b/packages/exalt/exalt.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17."
+AUTHOR = "John Lee <john_lee@openmoko.com>"
+HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt"
+PV = "0.0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.berlios.de/exalt/trunk;module=${EXALT_MODULE};proto=svn"
+
+S = "${WORKDIR}/${EXALT_MODULE}"
+
+inherit autotools pkgconfig
+
+EXALT_MODULE ?= "${PN}"
diff --git a/packages/exalt/exalt_svn.bb b/packages/exalt/exalt_svn.bb
new file mode 100644
index 0000000000..0ed46a2e96
--- /dev/null
+++ b/packages/exalt/exalt_svn.bb
@@ -0,0 +1,4 @@
+require exalt.inc
+
+DEPENDS = "ecore etk edbus libexalt libexalt-dbus"
+RDEPENDS_${PN} = "exalt-daemon"
diff --git a/packages/exalt/libexalt-dbus_svn.bb b/packages/exalt/libexalt-dbus_svn.bb
new file mode 100644
index 0000000000..e40766bfe5
--- /dev/null
+++ b/packages/exalt/libexalt-dbus_svn.bb
@@ -0,0 +1,9 @@
+require exalt.inc
+
+DEPENDS = "ecore edbus libexalt"
+
+do_stage() {
+ autotools_stage_all
+}
+
+EXALT_MODULE = "libexalt_dbus"
diff --git a/packages/exalt/libexalt_svn.bb b/packages/exalt/libexalt_svn.bb
new file mode 100644
index 0000000000..cd70d52c77
--- /dev/null
+++ b/packages/exalt/libexalt_svn.bb
@@ -0,0 +1,8 @@
+require exalt.inc
+
+DEPENDS = "ecore eet ecore edbus evas wpa-supplicant dhcp"
+RDEPENDS_${PN} = "wpa-supplicant dhclient"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/gcc/gcc-configure-cross.inc b/packages/gcc/gcc-configure-cross.inc
index 9fc3b77fea..333cb8f9bf 100644
--- a/packages/gcc/gcc-configure-cross.inc
+++ b/packages/gcc/gcc-configure-cross.inc
@@ -49,7 +49,9 @@ do_stage_append () {
done
#fix up libsupc++ and libstdc++ la files
- sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la || true
- sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la || true
+ for d in lib lib/nof; do
+ sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libsupc++.la || true
+ sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libstdc++.la || true
+ done
}
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index c480db791e..a40cbc8bef 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r19"
+PR = "r20"
require gcc-${PV}.inc
require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 070a1e30c8..43f21735e7 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
require gcc-${PV}.inc
require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 901c87cce8..daf42672dc 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
require gcc-${PV}.inc
require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 72f72835c3..4149179d8e 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
require gcc-${PV}.inc
require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.0.bb b/packages/gcc/gcc-cross_4.3.0.bb
index cac2550f0e..f51e60ce13 100644
--- a/packages/gcc/gcc-cross_4.3.0.bb
+++ b/packages/gcc/gcc-cross_4.3.0.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
require gcc-${PV}.inc
require gcc-cross4.inc
diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd
index 31dbd34caf..dc10e63098 100644
--- a/packages/gsm/files/gsmd
+++ b/packages/gsm/files/gsmd
@@ -13,7 +13,6 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
case "$1" in
start)
- [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 )
[ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
[ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
[ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc
index 5e47847d74..4ce23d51f5 100644
--- a/packages/gsm/gsmd.inc
+++ b/packages/gsm/gsmd.inc
@@ -5,7 +5,7 @@ SECTION = "libs/gsm"
PROVIDES += "gsmd"
RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
PV = "0.1+svnr${SRCREV}"
-PR = "r42"
+PR = "r44"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
diff --git a/packages/images/minimal-openmoko-image.bb b/packages/images/minimal-openmoko-image.bb
index 6ab4935c24..70658fd86f 100644
--- a/packages/images/minimal-openmoko-image.bb
+++ b/packages/images/minimal-openmoko-image.bb
@@ -1,5 +1,5 @@
#------------------------------------------------------
-# Minimal OpenMoko Image Recipe
+# Minimal Openmoko Image Recipe
# This should only have the base system + dialer
# #------------------------------------------------------
diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 6600d8436c..48b0d7da4f 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -1,5 +1,5 @@
#------------------------------------------------------
-# OpenMoko Image Recipe
+# Openmoko Image Recipe
#------------------------------------------------------
require openmoko-minimal-image.bb
diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb
index 15506c42e3..678400f756 100644
--- a/packages/images/openmoko-minimal-image.bb
+++ b/packages/images/openmoko-minimal-image.bb
@@ -1,5 +1,5 @@
#------------------------------------------------------
-# OpenMoko Minimal Image Recipe
+# Openmoko Minimal Image Recipe
# other openmoko images should include this.
# -----------------------------------------------------
@@ -18,4 +18,4 @@ DEPENDS = "\
inherit image
-ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
+ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp;"
diff --git a/packages/linux/linux-2.6.25/kilauea/.mtn2git_empty b/packages/linux/linux-2.6.25/kilauea/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-2.6.25/kilauea/.mtn2git_empty
diff --git a/packages/linux/linux-2.6.25/kilauea/defconfig b/packages/linux/linux-2.6.25/kilauea/defconfig
new file mode 100644
index 0000000000..67f0a25fc1
--- /dev/null
+++ b/packages/linux/linux-2.6.25/kilauea/defconfig
@@ -0,0 +1,1061 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25
+# Tue Apr 22 08:27:03 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+CONFIG_40x=y
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_4xx=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC_DCR_NATIVE=y
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_PPC_DCR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+CONFIG_PPC4xx_PCI_EXPRESS=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_EP405 is not set
+CONFIG_KILAUEA=y
+# CONFIG_MAKALU is not set
+# CONFIG_WALNUT is not set
+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
+CONFIG_405EX=y
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
+# CONFIG_MAC80211_RC_DEFAULT_NONE is not set
+
+#
+# Selecting 'y' for an algorithm will
+#
+
+#
+# build the algorithm into mac80211.
+#
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_PID=y
+# CONFIG_MAC80211_RC_SIMPLE is not set
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
+# CONFIG_MAC80211_DEBUG is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=35000
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_XILINX_SYSACE is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_IBM_NEW_EMAC=y
+CONFIG_IBM_NEW_EMAC_RXB=256
+CONFIG_IBM_NEW_EMAC_TXB=256
+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+CONFIG_IBM_NEW_EMAC_RGMII=y
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+CONFIG_IBM_NEW_EMAC_EMAC4=y
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_RSA is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_BLKCIPHER=y
+# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 2757ad520d..a13ace3fac 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -21,8 +21,10 @@ CMDLINE_append = " ${CMDLINE_DEBUG} "
# Support for binary device tree generation
KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
+KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts"
+
+KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000"
python __anonymous () {
diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb
index 6cb9ae95c1..4c84ffe7ac 100644
--- a/packages/linux/linux_2.6.25.bb
+++ b/packages/linux/linux_2.6.25.bb
@@ -3,6 +3,7 @@ require linux.inc
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
+DEFAULT_PREFERENCE_kilauea = "1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
file://defconfig"
diff --git a/packages/meta/openmoko-feed.bb b/packages/meta/openmoko-feed.bb
index b191f715c4..9cc227c62e 100644
--- a/packages/meta/openmoko-feed.bb
+++ b/packages/meta/openmoko-feed.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Meta-package for OpenMoko Misc. Feed Items"
+DESCRIPTION = "Meta-package for Openmoko Misc. Feed Items"
LICENSE = "MIT"
RDEPENDS = "\
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index f5e020dc68..cff49e9542 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -1,5 +1,7 @@
SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
+PARALLEL_MAKE = ""
+
PACKAGES =+ "firefox-inspector"
FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \
@@ -31,8 +33,5 @@ pkg_postinst_firefox() {
do_stage() {
autotools_stage_all
-
-
-
}
diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb
index b82dbda91e..1b091bef64 100644
--- a/packages/mozilla/firefox_1.0.7.bb
+++ b/packages/mozilla/firefox_1.0.7.bb
@@ -15,7 +15,7 @@ inherit autotools mozilla
require firefox.inc
-EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../"
+EXTRA_OECONF += " --with-gssapi=${STAGING_LIBDIR}/../"
do_compile_prepend() {
cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
diff --git a/packages/openmoko-apps/openmoko-appmanager_svn.bb b/packages/openmoko-apps/openmoko-appmanager_svn.bb
index a38341016b..7acc872bc1 100644
--- a/packages/openmoko-apps/openmoko-appmanager_svn.bb
+++ b/packages/openmoko-apps/openmoko-appmanager_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Application Manager"
+DESCRIPTION = "The Openmoko Application Manager"
SECTION = "openmoko/applications"
DEPENDS += "ipkg"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-calculator_svn.bb b/packages/openmoko-apps/openmoko-calculator_svn.bb
index 4650af0da0..39c180cc05 100644
--- a/packages/openmoko-apps/openmoko-calculator_svn.bb
+++ b/packages/openmoko-apps/openmoko-calculator_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Calculator Application"
+DESCRIPTION = "The Openmoko Calculator Application"
SECTION = "openmoko/applications"
AUTHOR = "Rodolphe Ortalo <rodolphe.ortalo@free.fr>"
diff --git a/packages/openmoko-apps/openmoko-dialer_svn.bb b/packages/openmoko-apps/openmoko-dialer_svn.bb
index 04baaba393..8a0f3fd999 100644
--- a/packages/openmoko-apps/openmoko-dialer_svn.bb
+++ b/packages/openmoko-apps/openmoko-dialer_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Dialer"
+DESCRIPTION = "The Openmoko Dialer"
SECTION = "openmoko/applications"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-footer_svn.bb b/packages/openmoko-apps/openmoko-footer_svn.bb
index c606bb6be8..83ab7ab045 100644
--- a/packages/openmoko-apps/openmoko-footer_svn.bb
+++ b/packages/openmoko-apps/openmoko-footer_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Footer"
+DESCRIPTION = "The Openmoko Footer"
SECTION = "openmoko/applications"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
index b85411db3c..71a9f3cdb6 100644
--- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
+++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
@@ -7,8 +7,8 @@
# Filename: openmoko-gps_svn.bb
# Date: 20080101 (YMD)
-DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform."
-HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS"
+DESCRIPTION = "A tiny GPS output parser for the Openmoko platform."
+HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenmokoGPS"
SECTION = "base"
LICENSE = "GPL"
diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb
index 729cd4df80..a79353b603 100644
--- a/packages/openmoko-apps/openmoko-messages_svn.bb
+++ b/packages/openmoko-apps/openmoko-messages_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Messaging Application"
+DESCRIPTION = "The Openmoko Messaging Application"
SECTION = "openmoko/applications"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
index 2378c8ce44..c90d35e3d5 100644
--- a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
+++ b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Media Player"
+DESCRIPTION = "The Openmoko Media Player"
SECTION = "openmoko/applications"
DEPENDS += "alsa-lib dbus-glib id3lib libvorbis"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-taskmanager_svn.bb b/packages/openmoko-apps/openmoko-taskmanager_svn.bb
index f81bae1c88..e7725bee44 100644
--- a/packages/openmoko-apps/openmoko-taskmanager_svn.bb
+++ b/packages/openmoko-apps/openmoko-taskmanager_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Task Manager"
+DESCRIPTION = "The Openmoko Task Manager"
SECTION = "openmoko/applications"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-apps/openmoko-terminal_svn.bb b/packages/openmoko-apps/openmoko-terminal_svn.bb
index 85e8ea777f..1a33b03598 100644
--- a/packages/openmoko-apps/openmoko-terminal_svn.bb
+++ b/packages/openmoko-apps/openmoko-terminal_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Command Line Console"
+DESCRIPTION = "The Openmoko Command Line Console"
SECTION = "openmoko/applications"
RDEPENDS += "gtkterm2"
PV = "1.0.0"
diff --git a/packages/openmoko-base/openmoko-common_svn.bb b/packages/openmoko-base/openmoko-common_svn.bb
index 8dc1cae549..dc5d24abe1 100644
--- a/packages/openmoko-base/openmoko-common_svn.bb
+++ b/packages/openmoko-base/openmoko-common_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Common files for the OpenMoko distribution"
+DESCRIPTION = "Common files for the Openmoko distribution"
SECTION = "openmoko/base"
PV = "0.0+svnr${SRCREV}"
PR = "r1"
diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
index e98d0076c8..0961d74162 100644
--- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko distribution"
SECTION = "openmoko/base"
PV = "0.1+svnr${SRCREV}"
PR = "r1"
diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index 128473eae3..1baa1d68b0 100644
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Matchbox session files for OpenMoko"
+DESCRIPTION = "Matchbox session files for Openmoko"
SECTION = "openmoko/base"
RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf"
PV = "0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
index ddb5053f3e..67fe16c858 100644
--- a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
+++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Sound System"
+DESCRIPTION = "Openmoko Sound System"
SECTION = "openmoko/base"
RDEPENDS = "\
pulseaudio-server \
diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
index 9ce0929f0d..bb500dbeb5 100644
--- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+DESCRIPTION = "Standard sound theme for the Openmoko distribution"
SECTION = "openmoko/base"
PV = "0.1+svnr${SRCREV}"
PR = "r2"
diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
index 0c2c8da9a8..5cb7042c92 100644
--- a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution, qvga version"
SECTION = "openmoko/base"
PV = "0.0+svnr${SRCREV}"
PR = "r0"
diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb
index 542e80fc7e..e5e54934dc 100644
--- a/packages/openmoko-base/openmoko-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution"
SECTION = "openmoko/base"
PV = "0.0+svnr${SRCREV}"
PR = "r5"
diff --git a/packages/openmoko-examples/openmoko-finger-demo_svn.bb b/packages/openmoko-examples/openmoko-finger-demo_svn.bb
index 7d0af4c04f..5d55180aa1 100644
--- a/packages/openmoko-examples/openmoko-finger-demo_svn.bb
+++ b/packages/openmoko-examples/openmoko-finger-demo_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "An example finger application for OpenMoko"
+DESCRIPTION = "An example finger application for Openmoko"
SECTION = "openmoko/examples"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
index 0df3a1968a..2f87b0c41c 100644
--- a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
+++ b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A simple example panel plugin for OpenMoko"
+DESCRIPTION = "A simple example panel plugin for Openmoko"
SECTION = "openmoko/examples"
DEPENDS += "libmatchbox"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-examples/openmoko-panel-demo_svn.bb b/packages/openmoko-examples/openmoko-panel-demo_svn.bb
index 5c346f8bb9..bf2d306ca3 100644
--- a/packages/openmoko-examples/openmoko-panel-demo_svn.bb
+++ b/packages/openmoko-examples/openmoko-panel-demo_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "An example panel plugin for OpenMoko"
+DESCRIPTION = "An example panel plugin for Openmoko"
SECTION = "openmoko/examples"
DEPENDS += "libmatchbox"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
index 8701cc18e8..659f0c7636 100644
--- a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
+++ b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A simple stylus application example for OpenMoko"
+DESCRIPTION = "A simple stylus application example for Openmoko"
SECTION = "openmoko/examples"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb
index 6ba32215a5..4032cfceb6 100644
--- a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb
+++ b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "An example stylus application for OpenMoko"
+DESCRIPTION = "An example stylus application for Openmoko"
SECTION = "openmoko/examples"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
index 2231e22db1..e5dc9264d0 100644
--- a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
+++ b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork"
+DESCRIPTION = "Matchbox virtual keyboard for X11 - Openmoko fork"
LICENSE = "GPL"
DEPENDS = "libfakekey expat libxft"
SECTION = "openmoko/inputmethods"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
index 38bab21c0e..c3ab1305e6 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel"
+DESCRIPTION = "Shows the battery/AC status in the Openmoko panel"
DEPENDS = "apmd"
PV = "0.1.0+svn${SVNREV}"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
index abd2654ce9..336a7f8541 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel"
+DESCRIPTION = "Shows the bluetooth status in the Openmoko panel"
DEPENDS = "bluez-libs libnotify"
PV = "0.1.0+svn${SVNREV}"
PR = "r1"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
index 3aa328a7cf..f5066b1c69 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the current time in the OpenMoko panel"
+DESCRIPTION = "Shows the current time in the Openmoko panel"
PV = "0.1.0+svn${SVNREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
index fd2e9a1685..bf4eef5463 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the GPS status in the OpenMoko panel"
+DESCRIPTION = "Shows the GPS status in the Openmoko panel"
DEPENDS = "gpsd"
PV = "0.1.0+svn${SVNREV}"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
index a932473ed3..d90c6a4de7 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
+DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel"
DEPENDS = "libgsmd libnotify"
PV = "0.1.0+svn${SVNREV}"
PR = "r1"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
index 7ae04ca0a8..19c278596d 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Main menu applet for the OpenMoko panel"
+DESCRIPTION = "Main menu applet for the Openmoko panel"
DEPENDS += "pulseaudio startup-notification"
PV = "0.1.0+svn${SVNREV}"
PR = "r1"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
index 8e8af7a086..2b1d2b03bd 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"
+DESCRIPTION = "Shows an out-of-memory warning in the Openmoko panel"
DEPENDS = "libnotify"
RDEPENDS = "openmoko-dialer2"
PV = "0.0.0+svn${SVNREV}"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
index eac9d0c211..5d00ab4b02 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "USB applet for the OpenMoko panel"
+DESCRIPTION = "USB applet for the Openmoko panel"
PV = "0.1.0+svn${SVNREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb
new file mode 100644
index 0000000000..0b7aac3d2a
--- /dev/null
+++ b/packages/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "Shows the wifi status in the Openmoko panel"
+DEPENDS = "libmokopanelui2"
+PV = "0.0.0+svn${SVNREV}"
+
+inherit openmoko-panel-plugin
+
diff --git a/packages/openmoko-pim/openmoko-contacts_svn.bb b/packages/openmoko-pim/openmoko-contacts_svn.bb
index bdcbeaf519..49177e1c4d 100644
--- a/packages/openmoko-pim/openmoko-contacts_svn.bb
+++ b/packages/openmoko-pim/openmoko-contacts_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko address book"
+DESCRIPTION = "The Openmoko address book"
LICENSE = "GPL"
SECTION = "openmoko/pim"
DEPENDS += "glib-2.0 gtk+ libglade eds-dbus gnome-vfs openmoko-libs"
diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb
index 7bfd42c3b6..b43b738131 100644
--- a/packages/openmoko-pim/openmoko-dates_svn.bb
+++ b/packages/openmoko-pim/openmoko-dates_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Dates Application"
+DESCRIPTION = "The Openmoko Dates Application"
SECTION = "openmoko/pim"
LICENSE = "GPL"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
diff --git a/packages/openmoko-pim/openmoko-tasks_svn.bb b/packages/openmoko-pim/openmoko-tasks_svn.bb
index ca2385ff78..08acf4e9d3 100644
--- a/packages/openmoko-pim/openmoko-tasks_svn.bb
+++ b/packages/openmoko-pim/openmoko-tasks_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Tasks Application"
+DESCRIPTION = "The Openmoko Tasks Application"
SECTION = "openmoko/pim"
LICENSE = "GPL"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb
index 4e2b2ef374..b26a2e8156 100644
--- a/packages/openmoko-pim/openmoko-today_svn.bb
+++ b/packages/openmoko-pim/openmoko-today_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Today application."
+DESCRIPTION = "Openmoko Today application."
SECTION = "openmoko/pim"
LICENSE = "GPL"
DEPENDS = "openmoko-libs eds-dbus startup-notification"
diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb
index 4e8dbdbceb..8d1af02d3a 100644
--- a/packages/openmoko-projects/diversity-nav_svn.bb
+++ b/packages/openmoko-projects/diversity-nav_svn.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
HOMEPAGE = "http://diversity.projects.openmoko.org/"
SECTION = "openmoko/applications"
LICENSE = "GPL"
-DEPENDS = "evas edje ecore edbus"
-RDEPENDS_${PN} = "diversity-daemon"
+DEPENDS = "evas edje ecore edbus ewl"
+RDEPENDS_${PN} = "diversity-daemon ewl-themes"
PV = "0.0.1+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
diff --git a/packages/openmoko-projects/openmoko-agpsui_svn.bb b/packages/openmoko-projects/openmoko-agpsui_svn.bb
new file mode 100644
index 0000000000..b9b2de2de7
--- /dev/null
+++ b/packages/openmoko-projects/openmoko-agpsui_svn.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPS diagnostic tool"
+HOMEPAGE = "http://openmoko-agpsui.projects.openmoko.org/"
+SECTION = "openmoko/apps"
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/openmoko-agpsui;module=trunk;proto=https"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
diff --git a/packages/openmoko-projects/tangogps/.mtn2git_empty b/packages/openmoko-projects/tangogps/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects/tangogps/.mtn2git_empty
diff --git a/packages/openmoko-projects/tangogps/global-config-h.patch b/packages/openmoko-projects/tangogps/global-config-h.patch
new file mode 100644
index 0000000000..973710c942
--- /dev/null
+++ b/packages/openmoko-projects/tangogps/global-config-h.patch
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c 2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c 2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+ * License GPLv2
+ ****************************************************************************/
+
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h 2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h 2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+
diff --git a/packages/openmoko-projects/tangogps_0.7.bb b/packages/openmoko-projects/tangogps_0.7.bb
new file mode 100644
index 0000000000..63513ffe00
--- /dev/null
+++ b/packages/openmoko-projects/tangogps_0.7.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "tangoGPS map"
+AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "openmoko/pim"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "curl gtk+ gpsd"
+PR = "r1"
+
+SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
+ file://global-config-h.patch;patch=1"
+
+S = "${WORKDIR}/tangoGPS-0.7"
+
+inherit autotools
+
+CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"
diff --git a/packages/openmoko-tools/openmoko-chordmaster_svn.bb b/packages/openmoko-tools/openmoko-chordmaster_svn.bb
index 5dd6056239..9c6716c929 100644
--- a/packages/openmoko-tools/openmoko-chordmaster_svn.bb
+++ b/packages/openmoko-tools/openmoko-chordmaster_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A guitar chord database for OpenMoko"
+DESCRIPTION = "A guitar chord database for Openmoko"
SECTION = "openmoko/tools"
PV = "0.0.1+svn${SRCDATE}"
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index 9dbe35c790..00fc49fdf9 100644
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -1,9 +1,9 @@
DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
SECTION = "openmoko/daemons"
-DEPENDS = "gtk+ pulseaudio"
+DEPENDS = "gtk+ pulseaudio apmd"
RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
inherit openmoko2 gconf
diff --git a/packages/openmoko2/openmoko-alsa-scenarios.bb b/packages/openmoko2/openmoko-alsa-scenarios.bb
new file mode 100644
index 0000000000..7aa76a8443
--- /dev/null
+++ b/packages/openmoko2/openmoko-alsa-scenarios.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Package for the different scenarios used by OpenMoko"
+SECTION = "openmoko/base"
+PV = "1.0+svnr${SRCREV}"
+PR = "r1"
+
+COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
+
+SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
+
+S = "${WORKDIR}/${MACHINE_ARCH}"
+
+do_install() {
+ install -d ${D}${datadir}/openmoko/scenarios/
+ install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
+ install -d ${D}${sysconfdir}/
+ install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
+FILES_${PN} += "${datadir}/openmoko"
diff --git a/packages/openmoko2/openmoko-appearance_svn.bb b/packages/openmoko2/openmoko-appearance_svn.bb
index 1e8fe2e0bd..a6f5c11171 100644
--- a/packages/openmoko2/openmoko-appearance_svn.bb
+++ b/packages/openmoko2/openmoko-appearance_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Appearance Editor"
+DESCRIPTION = "The Openmoko Appearance Editor"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 gconf gtk+"
RDEPENDS = "libedata-cal openmoko-today2-folders"
diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb
index 3929f7e964..c299564205 100644
--- a/packages/openmoko2/openmoko-appmanager2_svn.bb
+++ b/packages/openmoko2/openmoko-appmanager2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Application Manager"
+DESCRIPTION = "The Openmoko Application Manager"
SECTION = "openmoko/applications"
DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm ipkg"
PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
index b0b56d3e71..6d8349313f 100644
--- a/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/packages/openmoko2/openmoko-browser2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Webbrowser"
+DESCRIPTION = "The Openmoko Webbrowser"
SECTION = "openmoko/apps"
DEPENDS += "intltool libmokoui2 check webkit-gtk"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
index 8e0c9ad6da..ba202bcec9 100644
--- a/packages/openmoko2/openmoko-calculator2_svn.bb
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A Calculator for OpenMoko"
+DESCRIPTION = "A Calculator for Openmoko"
SECTION = "openmoko/tools"
DEPENDS = "libmokoui2"
PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index b0aed4c0e0..0ea381437c 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Common files for the OpenMoko framework"
+DESCRIPTION = "Common files for the Openmoko framework"
SECTION = "openmoko/base"
PV = "0.1.0+svnr${SRCREV}"
PR = "r0"
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index a6202e5284..ed6faf80be 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Address Book"
+DESCRIPTION = "The Openmoko Address Book"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
RDEPENDS = "libedata-book"
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index f9c04f8f92..ff3bfa62a6 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Calendar"
+DESCRIPTION = "The Openmoko Calendar"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
RDEPENDS = "libedata-cal"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index 7ef548bc15..7c6ea6b86e 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Dialer"
+DESCRIPTION = "The Openmoko Dialer"
SECTION = "openmoko/pim"
DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-feed-configs.bb b/packages/openmoko2/openmoko-feed-configs.bb
new file mode 100644
index 0000000000..81d7ad4223
--- /dev/null
+++ b/packages/openmoko2/openmoko-feed-configs.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Configuration files for online package repositories aka feeds"
+PR = "r0"
+
+do_compile() {
+ mkdir -p ${S}/${sysconfdir}/opkg
+ for feed in all armv4t neo1973 ${MACHINE_ARCH}; do
+ echo "src/gz daily-${feed} ${OPENMOKO_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
+ done
+}
+do_install () {
+ install -d ${D}${sysconfdir}/opkg
+ install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CONFFILES_${PN} += "${sysconfdir}/opkg/all-feed.conf \
+ ${sysconfdir}/opkg/armv4t-feed.conf \
+ ${sysconfdir}/opkg/neo1973-feed.conf \
+ ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \
+ "
+
+OPENMOKO_URI = "http://buildhost.openmoko.org/daily-feed"
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index c9a36312cf..5fb7dab619 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Feed Reader"
+DESCRIPTION = "The Openmoko Feed Reader"
SECTION = "openmoko/apps"
DEPENDS += "libmokoui2 libmrss check webkit-gtk"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-firststart2_svn.bb b/packages/openmoko2/openmoko-firststart2_svn.bb
index 2796a60df2..ce2c181736 100644
--- a/packages/openmoko2/openmoko-firststart2_svn.bb
+++ b/packages/openmoko2/openmoko-firststart2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko First Start Wizard"
+DESCRIPTION = "The Openmoko First Start Wizard"
SECTION = "openmoko/apps"
DEPENDS += "libmokoui2 libglade"
PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
index a02e05c1d2..acbf3da7b9 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework, QVGA edition"
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework, QVGA edition"
SECTION = "openmoko/base"
DEPENDS = "imagemagick-native librsvg-native"
PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
index ddc87abced..e145fb2d98 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework"
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
SECTION = "openmoko/base"
PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 4406c410dd..79a8163328 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A media player for OpenMoko"
+DESCRIPTION = "A media player for Openmoko"
SECTION = "openmoko/tools"
DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb
index 8ec0a9103a..59165f08c1 100644
--- a/packages/openmoko2/openmoko-messages2_svn.bb
+++ b/packages/openmoko2/openmoko-messages2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Message application"
+DESCRIPTION = "The Openmoko Message application"
SECTION = "openmoko/pim"
DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb
index 9118f89e8a..b944e79b45 100644
--- a/packages/openmoko2/openmoko-sample2_svn.bb
+++ b/packages/openmoko2/openmoko-sample2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Sample Project"
+DESCRIPTION = "The Openmoko Sample Project"
SECTION = "openmoko/applications"
DEPENDS = "libmokoui2 intltool gconf"
PV = "0.0.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 507f85835e..588449c10f 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "Custom Matchbox session files for OpenMoko"
+DESCRIPTION = "Custom Matchbox session files for Openmoko"
LICENSE = "GPL"
SECTION = "x11"
-RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory"
+RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r66"
+PR = "r68"
SRC_URI = "\
file://etc \
@@ -32,7 +32,7 @@ if [ "x$D" != "x" ]; then
exit 1
fi
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index f4d1ee9b11..732cce9d3f 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -4,9 +4,9 @@ SHOWCURSOR="no"
openmoko-today &
phone-kit &
-matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
+matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ &
matchbox-panel-2 --start-applets systray,startup \
- --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,keyboard --titlebar &
+ --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,openmoko-panel-wifi --titlebar &
exec neod
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index ac281dad76..33cd5648d4 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Sound System"
+DESCRIPTION = "Openmoko Sound System"
SECTION = "openmoko/base"
RDEPENDS = "\
pulseaudio-server \
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
index f200b58cb2..3096da4813 100644
--- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard sound theme for the OpenMoko framework"
+DESCRIPTION = "Standard sound theme for the Openmoko framework"
SECTION = "openmoko/base"
RREPLACES = "openmoko-sound-theme-standard"
RPROVIDES = "openmoko-sound-theme-standard"
diff --git a/packages/openmoko2/openmoko-tasks2_svn.bb b/packages/openmoko2/openmoko-tasks2_svn.bb
index 48ec113884..b18c269814 100644
--- a/packages/openmoko2/openmoko-tasks2_svn.bb
+++ b/packages/openmoko2/openmoko-tasks2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Agenda"
+DESCRIPTION = "The Openmoko Agenda"
SECTION = "openmoko/pim"
DEPENDS = "dbus-glib eds-dbus libmokoui2"
RDEPENDS = "libedata-cal"
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
index 2273ddd88f..b917c5ca84 100644
--- a/packages/openmoko2/openmoko-terminal2_svn.bb
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Command Line Terminal"
+DESCRIPTION = "The Openmoko Command Line Terminal"
SECTION = "openmoko/applications"
DEPENDS = "vala-native vte libmokoui2"
RDEPENDS = "ttf-liberation-mono"
diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
index ec0af53763..4a41079059 100644
--- a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework, QVGA edition"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework, QVGA edition"
SECTION = "openmoko/base"
RCONFLICTS = "openmoko-theme-standard"
RPROVIDES = "openmoko-theme-standard-2"
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index a7812455cd..d4d23d11d6 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
SECTION = "openmoko/base"
RCONFLICTS = "openmoko-theme-standard"
PV = "0.1.1+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
index baf60d877b..4b9f245c3c 100644
--- a/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Today2 vfolder files"
+DESCRIPTION = "The Openmoko Today2 vfolder files"
SECTION = "openmoko/misc"
PV = "0.1.0+svnr${SRCREV}"
PR = "r3"
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index 998d22e308..efd281a95e 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Application Launcher"
+DESCRIPTION = "The Openmoko Application Launcher"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
RDEPENDS = "libedata-cal openmoko-today2-folders"
diff --git a/packages/openmoko2/openmoko-worldclock2_svn.bb b/packages/openmoko2/openmoko-worldclock2_svn.bb
index 5857dde982..5b3956ee23 100644
--- a/packages/openmoko2/openmoko-worldclock2_svn.bb
+++ b/packages/openmoko2/openmoko-worldclock2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "A World-Clock for OpenMoko"
+DESCRIPTION = "A World-Clock for Openmoko"
SECTION = "openmoko/tools"
DEPENDS = "libmokoui2 libjana"
PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/settingsgui_0.7+0.8-beta.bb b/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
index 502fad7309..f0d6f84ce6 100644
--- a/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
+++ b/packages/openmoko2/settingsgui_0.7+0.8-beta.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Settings GUI"
+DESCRIPTION = "Openmoko Settings GUI"
AUTHOR = "Kristian M."
SECTION = "openmoko/applications"
RDEPENDS = "python-pygtk python-subprocess python-threading"
diff --git a/packages/openmoko2/settingsgui_0.8.bb b/packages/openmoko2/settingsgui_0.8.bb
index 314348b0b8..e8ac48247c 100644
--- a/packages/openmoko2/settingsgui_0.8.bb
+++ b/packages/openmoko2/settingsgui_0.8.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko Settings GUI"
+DESCRIPTION = "Openmoko Settings GUI"
AUTHOR = "Kristian M."
SECTION = "openmoko/applications"
RDEPENDS = "python-pygtk python-subprocess python-threading"
diff --git a/packages/python/python-openmoko_0.1.bb b/packages/python/python-openmoko_0.1.bb
index 6755d4dca8..b55794598a 100644
--- a/packages/python/python-openmoko_0.1.bb
+++ b/packages/python/python-openmoko_0.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Python Bindings for the OpenMoko Platform"
+DESCRIPTION = "Python Bindings for the Openmoko Platform"
AUTHOR = "Holger 'Zecke' Freyther"
LICENSE = "LGPL"
DEPENDS = "python-pygtk libmokoui2 libmokojournal2 libmokogsmd2"
diff --git a/packages/settings-daemon/files/70settings-daemon b/packages/settings-daemon/files/70settings-daemon
index e687dabe4b..044d88ace5 100755
--- a/packages/settings-daemon/files/70settings-daemon
+++ b/packages/settings-daemon/files/70settings-daemon
@@ -1,3 +1,3 @@
#!/bin/sh
-/usr/bin/settings-daemon &
+/usr/bin/settings-daemon
diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb
index eaffbfebb4..27931dcd32 100644
--- a/packages/settings-daemon/settings-daemon_svn.bb
+++ b/packages/settings-daemon/settings-daemon_svn.bb
@@ -5,7 +5,7 @@ RDEPENDS = "xrdb"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://70settings-daemon"
diff --git a/packages/speex/speex_1.2-beta3.bb b/packages/speex/speex_1.2-beta3.bb
index 5f060c2321..a2aa6652f7 100644
--- a/packages/speex/speex_1.2-beta3.bb
+++ b/packages/speex/speex_1.2-beta3.bb
@@ -24,8 +24,8 @@ LEAD_SONAME = "libspeex.so"
#
EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point --disable-float-api --disable-vbr "
-EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --diable-vbr "
-EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --diable-vbr "
+EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --disable-vbr "
EXTRA_OECONF_append_arm = " --enable-fixed-point --disable-float-api --disable-vbr "
EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point --disable-float-api --disable-vbr "
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index a55d5dd504..c3ada840e2 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r66"
+PR = "r67"
inherit task
@@ -372,7 +372,7 @@ RDEPENDS_task-base-screen = "\
"
#
-# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
+# GPE/OPIE/Openmoko provide own touchscreen calibration utils
#
RDEPENDS_task-base-touchscreen = "\
tslib-tests \
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index c07ba1672f..3df3f1fd03 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
+DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
LICENSE = "MIT"
PROVIDES = "task-mokogateway-everything"
PR = "r4"
diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb
index f46a3306fe..6924ff5388 100644
--- a/packages/tasks/task-nas-server.bb
+++ b/packages/tasks/task-nas-server.bb
@@ -56,7 +56,7 @@ RRECOMMENDS_task-nas-server-iptables = "\
kernel-module-ipt-masquerade \
"
-DESCRIPTION_task-nas-server-openmoko = "NAS-Server: OpenMoko Support"
+DESCRIPTION_task-nas-server-openmoko = "NAS-Server: Openmoko Support"
RDEPENDS_task-nas-server-openmoko = "\
dfu-util \
"
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index 310d3f07c3..34739285ec 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,14 +1,14 @@
-DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r72"
+PR = "r73"
inherit task
#
# task-openmoko-base
#
-DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
+DESCRIPTION_task-openmoko-base = "Openmoko: Top Panel, Application Launcher, Application Manager"
RDEPENDS_task-openmoko-base = "\
matchbox-panel-2 \
matchbox-panel-2-applets \
@@ -20,10 +20,11 @@ RDEPENDS_task-openmoko-base = "\
openmoko-terminal2 \
# openmoko-keyboard \
openmoko-panel-battery \
- openmoko-panel-bt \
openmoko-panel-clock \
openmoko-panel-usb \
- ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+ ${@base_contains('MACHINE_FEATURES', 'bluetooth', 'openmoko-panel-bt', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'wifi', 'openmoko-panel-wifi', '', d)} \
\
openmoko-today2 \
# openmoko-appmanager \
diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 0c2342183e..964b623dca 100644
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Debugging and Benchmarking Tools"
+DESCRIPTION = "Openmoko: Debugging and Benchmarking Tools"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r59"
diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb
index c5dbfb6f04..b8efd5e01e 100644
--- a/packages/tasks/task-openmoko-examples.bb
+++ b/packages/tasks/task-openmoko-examples.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Examples for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Examples for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r71"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index beb72cd4b0..989b9b5348 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Misc. Feed Items"
+DESCRIPTION = "Openmoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r26"
diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb
index 0fdf3cac33..f2c5d6ff36 100644
--- a/packages/tasks/task-openmoko-games.bb
+++ b/packages/tasks/task-openmoko-games.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Games for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Games for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r71"
@@ -8,7 +8,7 @@ inherit task
#
# task-openmoko-games
#
-DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
+DESCRIPTION_task-openmoko-games = "Openmoko: Games"
RDEPENDS_task-openmoko-games = "\
oh-puzzles \
"
diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb
index 59e6f24094..da787c62c0 100644
--- a/packages/tasks/task-openmoko-linux.bb
+++ b/packages/tasks/task-openmoko-linux.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Core system for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Core system for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r71"
@@ -8,7 +8,7 @@ inherit task
#
# task-openmoko-core
#
-DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
+DESCRIPTION_task-openmoko-linux = "Openmoko: Linux Core Services"
RDEPENDS_task-openmoko-linux = "\
task-base \
netbase \
diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb
index 6a5c2c2aa5..56f6824df4 100644
--- a/packages/tasks/task-openmoko-native-sdk.bb
+++ b/packages/tasks/task-openmoko-native-sdk.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Native SDK"
+DESCRIPTION = "Openmoko: Native SDK"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r58"
diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb
index e75dc4b4ff..d58b05aa62 100644
--- a/packages/tasks/task-openmoko-net.bb
+++ b/packages/tasks/task-openmoko-net.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Networking for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Networking for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r71"
@@ -8,7 +8,7 @@ inherit task
#
# task-openmoko-net
#
-DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
+DESCRIPTION_task-openmoko-net = "Openmoko: Linux Advanced Networking"
RDEPENDS_task-openmoko-net = "\
bluez-utils \
bridge-utils \
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
index 474efff79d..306ff058dd 100644
--- a/packages/tasks/task-openmoko-phone.bb
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r73"
@@ -8,7 +8,7 @@ inherit task
#
# task-openmoko-phone
#
-DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
+DESCRIPTION_task-openmoko-phone = "Openmoko: GSM and GPRS Phone Services"
RDEPENDS_task-openmoko-phone = "\
gsmd \
libgsmd-tools \
diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb
index cef9a25931..eb3195dffb 100644
--- a/packages/tasks/task-openmoko-pim.bb
+++ b/packages/tasks/task-openmoko-pim.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: PIM for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PR = "r72"
@@ -8,7 +8,7 @@ inherit task
#
# task-openmoko-pim
#
-DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
+DESCRIPTION_task-openmoko-pim = "Openmoko: Personal Information Management Suite"
RDEPENDS_task-openmoko-pim = "\
eds-dbus \
openmoko-calculator2 \
diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb
index a5baed0024..a493183865 100644
--- a/packages/tasks/task-openmoko-python-devel.bb
+++ b/packages/tasks/task-openmoko-python-devel.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Python Development Tools"
+DESCRIPTION = "Openmoko: Python Development Tools"
SECTION = "openmoko/devel"
LICENSE = "MIT"
PR = "r3"
diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
index 788152c6ca..d243481010 100644
--- a/packages/tasks/task-openmoko-toolchain-host.bb
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -1,6 +1,6 @@
require task-sdk-host.bb
-DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-openmoko-toolchain-target.bb b/packages/tasks/task-openmoko-toolchain-target.bb
index 281884d051..142990602c 100644
--- a/packages/tasks/task-openmoko-toolchain-target.bb
+++ b/packages/tasks/task-openmoko-toolchain-target.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb
index 33eab591ed..71020afef6 100644
--- a/packages/tasks/task-openmoko-ui.bb
+++ b/packages/tasks/task-openmoko-ui.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: GUI for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r72"
+PR = "r73"
inherit task
@@ -10,7 +10,7 @@ XSERVER ?= "xserver-kdrive-fbdev"
#
# task-openmoko-ui
#
-DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
+DESCRIPTION_task-openmoko-ui = "Openmoko: The X11/Gtk+2 based native User Interface"
PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
RDEPENDS_task-openmoko-ui = "\
gdk-pixbuf-loader-png \
@@ -45,7 +45,7 @@ RDEPENDS_task-openmoko-ui = "\
# taking into account not only size but also PPI! Ultimately this might
# need recomputing some theme files and images on-the-fly :/ SVG and logical
# theme description anyone? Or simply Edje to the rescue! :D
-THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES = "openmoko-icon-theme-standard2 moko-gtk-engine"
THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 730ea339aa..6c195ba078 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
diff --git a/packages/tslib/tslib/om-gta02/.mtn2git_empty b/packages/tslib/tslib/om-gta02/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/om-gta02/.mtn2git_empty
diff --git a/packages/tslib/tslib/om-gta02/ts.conf b/packages/tslib/tslib/om-gta02/ts.conf
new file mode 100644
index 0000000000..82f712ef41
--- /dev/null
+++ b/packages/tslib/tslib/om-gta02/ts.conf
@@ -0,0 +1,25 @@
+# Uncomment if you wish to use the linux input layer event interface
+module_raw input grab_events=1
+
+# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
+# module_raw collie
+
+# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
+# module_raw corgi
+
+# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
+# module_raw ucb1x00
+
+# Uncomment if you're using an HP iPaq h3600 or similar
+# module_raw h3600
+
+# Uncomment if you're using a Hitachi Webpad
+# module_raw mk712
+
+# Uncomment if you're using an IBM Arctic II
+# module_raw arctic2
+
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 598e60fe4d..725e067a0b 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -4,7 +4,7 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
SECTION = "base"
LICENSE = "LGPL"
-PR = "r17"
+PR = "r18"
SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
file://tslib-input_raw-grab_events.patch;patch=1 \
diff --git a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
index 8c7ff5b94a..2610e16040 100644
--- a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
+++ b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>"
+AUTHOR = "Harald Welte <laforge@openmoko.org>, Openmoko <openmoko-kernel@lists.openmoko.org>"
LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
index d8a51ea824..502a62b6ea 100644
--- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
+++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>"
+AUTHOR = "Harald Welte <laforge@openmoko.org>, Openmoko <openmoko-kernel@lists.openmoko.org>"
LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8"
UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
-SRCREV_FORMAT = "+gitupstream+svnpatchset"
+SRCREV_FORMAT = "patchset"
-PV = "1.3.1${SRCREV}"
+PV = "1.3.1+svnr${SRCREV}+git${UBOOT_UPSTREAM_REV}"
PR = "r3"
PROVIDES = "virtual/bootloader"
@@ -18,8 +18,6 @@ SRC_URI = "\
git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV};name=upstream \
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patchset \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
-# file://makefile-no-dirafter.patch;patch=1 \
-# file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
"
EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
diff --git a/packages/u-boot/u-boot_1.3.2.bb b/packages/u-boot/u-boot_1.3.2.bb
new file mode 100644
index 0000000000..2886ddecc8
--- /dev/null
+++ b/packages/u-boot/u-boot_1.3.2.bb
@@ -0,0 +1,7 @@
+require u-boot.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/upnp/libupnp_1.4.2.bb b/packages/upnp/libupnp_1.6.5.bb
index a7a01597ac..a7a01597ac 100644
--- a/packages/upnp/libupnp_1.4.2.bb
+++ b/packages/upnp/libupnp_1.6.5.bb
diff --git a/packages/wordlist/.mtn2git_empty b/packages/wordlist/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wordlist/.mtn2git_empty
diff --git a/packages/wordlist/files/.mtn2git_empty b/packages/wordlist/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wordlist/files/.mtn2git_empty
diff --git a/packages/wordlist/files/rules b/packages/wordlist/files/rules
new file mode 100644
index 0000000000..6179711ba4
--- /dev/null
+++ b/packages/wordlist/files/rules
@@ -0,0 +1,218 @@
+#!/usr/bin/make -f
+# -*- Makefile -*- $Id: rules,v 1.18 2005/10/15 03:03:48 david Exp $
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+# Customized 27 Oct 1999 by David Coe for wenglish, later moved to scowl
+# This version is for packages that are architecture independent.
+
+# Copied & modified 20080409 from debian source package by John Lee
+# into OpenEmbedded.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# In addition to the scowl binary package, we create wamerican-small, wamerican, wamerican-large, wamerican-huge, and the
+# corresponding packages for wbritish and wcanadian.
+# The medium size packages have no -size part in their names
+# These are the scowl extensions (complexity numbers?) that contribute to each word list (i.e. each size);
+# the -size parts "-small", "", "-large", and "-huge" correspond to the end of the binary package name:
+export SIZE_EXTENSIONS-small:=10 20 35
+export SIZE_EXTENSIONS:=$(SIZE_EXTENSIONS-small) 40 50
+export SIZE_EXTENSIONS-large:=$(SIZE_EXTENSIONS) 55 60 70
+export SIZE_EXTENSIONS-huge:=$(SIZE_EXTENSIONS-large) 80
+
+# These are the scowl word list classes we use:
+CLASSES:=words proper-names upper contractions
+VARIANTS:=0 1
+
+build: build-stamp
+build-stamp:
+# dh_testdir
+
+ set -e;\
+ for SPELLING in american british canadian; do\
+ for SIZE in -small "" -large -huge; do\
+ echo "The following SCOWL word lists were concatenated and sorted (with duplicates" > w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ echo "removed) to create this word list (see README.Debian for more details):" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ for CLASS in $(CLASSES); do\
+ for EXT in $$(eval echo \\$$SIZE_EXTENSIONS$$SIZE); do\
+ if [ -f final/english-$$CLASS.$$EXT ]; then\
+ echo "cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+ cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+ echo " english-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ for VARIANT in $(VARIANTS); do\
+ if [ -f final/variant_$$VARIANT-$$CLASS.$$EXT ]; then\
+ echo "cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+ cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+ echo " variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ done;\
+ if [ -f final/$$SPELLING-$$CLASS.$$EXT ]; then\
+ echo "cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+ cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+ echo " $$SPELLING-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ fi;\
+ done;\
+ done;\
+ echo "sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted";\
+ sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+ done;\
+ done
+
+ touch build-stamp
+
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ set -e;\
+ for SIZE in -small "" -large -huge; do\
+ for SPELLING in american british canadian; do\
+ rm -f $$SPELLING-english$$SIZE.unsorted $$SPELLING-english$$SIZE $$SPELLING-english$$SIZE.5 w$$SPELLING$$SIZE.scowl-word-lists-used;\
+ done;\
+ done
+
+ dh_clean
+
+
+install: DH_OPTIONS=
+install: install-scowl install-wamerican install-wamerican-small install-wamerican-large install-wamerican-huge install-wbritish install-wbritish-small install-wbritish-large install-wbritish-huge install-wcanadian install-wcanadian-small install-wcanadian-large install-wcanadian-huge
+
+
+
+.PHONY: install-scowl
+install-scowl: PKG=scowl
+install-scowl:
+ dh_testdir
+ dh_testroot
+ dh_installdirs --package=$(PKG)
+
+ dh_install --package=$(PKG) final/*.[0-9][0-9] usr/share/dict/scowl
+ dh_installdocs --package=$(PKG) README debian/README.Debian
+
+
+.PHONY: install-wordlist
+install-wordlist:
+# PKG and WORDLIST must have been set to the binary package name and word list file name, respectively.
+ dh_testdir
+ dh_testroot
+ dh_installdirs --package=$(PKG)
+
+ dh_install --package=$(PKG) $(WORDLIST) usr/share/dict
+
+ dh_installdocs --package=$(PKG) $(PKG).scowl-word-lists-used debian/README.Debian
+
+ installdeb-wordlist --package=$(PKG) # This internally uses dh_installdebcon
+
+ sed "s/WORDLIST/$(WORDLIST)/g" < debian/wordlist_manpage_template > $(WORDLIST).5
+ dh_installman --package=$(PKG) $(WORDLIST).5
+
+
+.PHONY: install-wamerican
+install-wamerican: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican WORDLIST=american-english install-wordlist
+
+.PHONY: install-wamerican-small
+install-wamerican-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-small WORDLIST=american-english-small install-wordlist
+
+.PHONY: install-wamerican-large
+install-wamerican-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-large WORDLIST=american-english-large install-wordlist
+
+.PHONY: install-wamerican-huge
+install-wamerican-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wamerican-huge WORDLIST=american-english-huge install-wordlist
+
+
+.PHONY: install-wbritish
+install-wbritish: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish WORDLIST=british-english install-wordlist
+
+.PHONY: install-wbritish-small
+install-wbritish-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-small WORDLIST=british-english-small install-wordlist
+
+.PHONY: install-wbritish-large
+install-wbritish-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-large WORDLIST=british-english-large install-wordlist
+
+.PHONY: install-wbritish-huge
+install-wbritish-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wbritish-huge WORDLIST=british-english-huge install-wordlist
+
+
+.PHONY: install-wcanadian
+install-wcanadian: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian WORDLIST=canadian-english install-wordlist
+
+.PHONY: install-wcanadian-small
+install-wcanadian-small: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-small WORDLIST=canadian-english-small install-wordlist
+
+.PHONY: install-wcanadian-large
+install-wcanadian-large: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-large WORDLIST=canadian-english-large install-wordlist
+
+.PHONY: install-wcanadian-huge
+install-wcanadian-huge: build-stamp
+ $(MAKE) -f debian/rules PKG=wcanadian-huge WORDLIST=canadian-english-huge install-wordlist
+
+
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+# dh_installdocs # moved to the install targets, because it doesn't DWIM with "-A -p scowl README"
+# dh_installexamples
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installcatalogs
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installman
+# dh_installcron
+# dh_installinfo
+# dh_undocumented
+# dh_strip
+ dh_link
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build install
+# (Uncomment this next line if you have such packages.)
+# $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary-common binary install
diff --git a/packages/wordlist/scowl_6.bb b/packages/wordlist/scowl_6.bb
new file mode 100644
index 0000000000..46e312e059
--- /dev/null
+++ b/packages/wordlist/scowl_6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "SCOWL (Spell Checker Oriented Word Lists) is a collection of word lists split up in various sizes, and other categories, intended to be suitable for use in spell checkers. However, I am sure it will have numerous other uses as well."
+HOMEPAGE = "http://wordlist.sourceforge.net/"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wordlist/scowl-6.tar.gz \
+ file://rules"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_compile() {
+ cp -f ${WORKDIR}/rules ${S}
+ oe_runmake -f rules build
+}
+do_install() {
+ install -d ${D}/${datadir}/dict
+ install ${S}/american-english ${D}/${datadir}/dict
+ install ${S}/british-english ${D}/${datadir}/dict
+ install ${S}/canadian-english ${D}/${datadir}/dict
+}
+
+PACKAGE_ARCH = "all"
+PACKAGES = "wamerican wbritish wcanadian"
+
+FILES = "${datadir}/dict/${DICTNAME}"
+
+pkg_postinst() {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+cd ${datadir}/dict
+ln -sf ${DICTNAME} words
+}
+
+DICTNAME_wamerican = "american-english"
+DICTNAME_wbritish = "british-english"
+DICTNAME_wcanadian = "canadian-english"
diff --git a/packages/xorg-driver/xf86-video-geode_2.8.0.bb b/packages/xorg-driver/xf86-video-geode_2.8.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-geode_2.8.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"