diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-09-05 17:28:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-09-05 17:28:01 +0000 |
| commit | d4c9f9259b04169de83f9528026d8921c5127b79 (patch) | |
| tree | ce42643c37f7b4283a3f34e12d7d9c124bae8622 | |
| parent | ea8c70b53b4ce9fea288bc7c255cd16d29a1ac18 (diff) | |
| parent | 8c9b796622e3705746615f88e52a52b1c90f6ed2 (diff) | |
merge of '110c6ec488c63036fe1cb9a1e304bfb935b57bca'
and '60181dbea7f819472034ab00db51dac31fd65723'
| -rw-r--r-- | conf/distro/openmoko.conf | 2 | ||||
| -rwxr-xr-x | packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko.bb | 3 | ||||
| -rw-r--r-- | packages/uboot/uboot-openmoko_svn.bb | 8 |
4 files changed, 9 insertions, 6 deletions
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 7061ef2c63..0748b8cb7f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -11,7 +11,7 @@ require conf/distro/angstrom-2007.1.conf # DISTRO = "openmoko" DISTRO_NAME = "OpenMoko" -DISTRO_VERSION = "P1-August-Snapshot-${DATE}" +DISTRO_VERSION = "P1-September-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" 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 \ " |