summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session2
-rw-r--r--packages/tasks/task-openmoko.bb3
-rw-r--r--packages/uboot/uboot-openmoko_svn.bb8
3 files changed, 8 insertions, 5 deletions
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 9e1c0a2aad..4f2f8ae110 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -8,7 +8,7 @@ openmoko-dialer &
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
-matchbox-panel-2 --start-applets startup \
+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-clock,keyboard --titlebar &
exec neod
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 0ddf590c9d..e47f5b22cf 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r60"
+PR = "r61"
inherit task
@@ -98,6 +98,7 @@ RDEPENDS_task-openmoko-base = "\
# openmoko-appmanager \
matchbox-keyboard-inputmethod \
matchbox-keyboard-im \
+ matchbox-keyboard-applet \
matchbox-stroke \
openmoko-terminal2 \
openmoko-keyboard \
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb
index 9b5dbb509b..e1575884c2 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/uboot-openmoko_svn.bb
@@ -4,16 +4,18 @@ LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
PROVIDES = "virtual/bootloader"
-PV = "1.2.0+git${SRCDATE}+svn${SRCDATE}"
+PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}"
PR = "r0"
+SRCREV_FORMAT = "patches"
+
UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "\
- git://www.denx.de/git/u-boot.git/;protocol=git \
- svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
+ git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \
+ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
file://uboot-eabi-fix-HACK.patch \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
"