summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-08-01 18:10:38 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-08-01 18:10:38 +0000
commit3376d25beeaa1678251406e0bc759793403cc055 (patch)
tree5016450aede8d269218000d153a8ad012f9b5d94
parent56026f0f23ccd5b8f2f0b921f080af1e22aff66d (diff)
parentea183e07ed741bff4898ebf64cde9bc3393a1a50 (diff)
merge of '65810adbf4ff2f65fbd9977be64a8fad919e38f8'
and 'ebe549ec8cb67b1109f8e20a4d0f027c0e5dcb2f'
-rw-r--r--classes/base.bbclass7
-rw-r--r--classes/openmoko2.bbclass3
-rw-r--r--conf/bitbake.conf2
-rw-r--r--conf/distro/openmoko.conf9
-rwxr-xr-xcontrib/mtn2cl/mtn2cl.sh19
-rw-r--r--packages/e17/edje-editor_cvs.bb2
-rw-r--r--packages/e17/edje-viewer_cvs.bb2
-rw-r--r--packages/file/file-native_4.21.bb2
-rw-r--r--packages/gaim/pidgin_2.1.0.bb9
-rw-r--r--packages/gettext/gettext-native_0.14.1.bb1
-rw-r--r--packages/gtk-engines/gtk-sato-engine_0.1.bb26
-rw-r--r--packages/gtk-engines/gtk-sato-engine_svn.bb17
-rw-r--r--packages/gtkhtml2/gtkhtml2_svn.bb (renamed from packages/gtkhtml2/gtkhtml2_cvs.bb)0
-rw-r--r--packages/images/openmoko-image.bb2
-rw-r--r--packages/libowl/.mtn2git_empty0
-rw-r--r--packages/libowl/libowl_svn.bb48
-rw-r--r--packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb13
-rw-r--r--packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb7
-rw-r--r--packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb3
-rw-r--r--packages/matchbox-wm/matchbox-wm_1.2.bb3
-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.bb12
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb2
-rw-r--r--packages/openmoko2/libmokogsmd2_svn.bb2
-rw-r--r--packages/openmoko2/libmokojournal2_svn.bb2
-rw-r--r--packages/openmoko2/libmokopanelui2_svn.bb2
-rw-r--r--packages/openmoko2/libmokoui2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-calculator2_svn.bb7
-rw-r--r--packages/openmoko2/openmoko-contacts2_svn.bb4
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-feedreader2_svn.bb8
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2_svn.bb18
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard_svn.bb19
-rw-r--r--packages/openmoko2/openmoko-theme-standard2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-today2_svn.bb3
-rw-r--r--packages/puzzles/oh-puzzles_svn.bb43
-rw-r--r--packages/raw-tools/.mtn2git_empty0
-rw-r--r--packages/raw-tools/exiv2_0.15.bb14
-rw-r--r--packages/raw-tools/gtkimageview_1.3.0.bb19
-rw-r--r--packages/raw-tools/libopenraw.inc10
-rw-r--r--packages/raw-tools/libopenraw_0.0.2.bb4
-rw-r--r--packages/raw-tools/ufraw_0.12.bb16
-rw-r--r--packages/sato-icon-theme/.mtn2git_empty0
-rw-r--r--packages/sato-icon-theme/sato-icon-theme_0.1.bb20
-rw-r--r--packages/starling/starling_0.2.bb3
-rw-r--r--packages/starling/starling_svn.bb3
-rw-r--r--packages/tasks/task-openmoko.bb23
-rw-r--r--packages/uboot/u-boot-mkimage-gta01-native_oe.bb1
-rw-r--r--packages/uboot/uboot-gta01_svn.bb6
-rw-r--r--packages/webkit/webkit_svn.bb63
54 files changed, 372 insertions, 123 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index fec7622f18..5381d43e7b 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -892,6 +892,13 @@ python () {
base_after_parse(d)
}
+# Remove me when we switch to bitbake 1.8.8
+def base_get_srcrev(d):
+ import bb
+
+ if bb.fetch.get_srcrev:
+ return bb.fetch.get_srcrev(d)
+ return "NOT IMPLEMENTED"
# Patch handling
inherit patch
diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass
index 4675b6a10e..bf5e1da6b8 100644
--- a/classes/openmoko2.bbclass
+++ b/classes/openmoko2.bbclass
@@ -26,3 +26,6 @@ SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=$
S = "${WORKDIR}/${PN}"
FILES_${PN} += "${datadir}/icons"
+
+# until we have SRCREV computing
+SRCREV ?= "0${SRCDATE}"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 38a716af00..19910d32e7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -365,7 +365,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug"
UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
SRCDATE = "${DATE}"
-SRCREV = "${@bb.fetch.get_srcrev(d)}"
+SRCREV = "${@base_get_srcrev(d)}"
SRC_URI = "file://${FILE}"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index bd4e2076ca..5d63676343 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -15,3 +15,12 @@ DISTRO_NAME = "OpenMoko"
DISTRO_VERSION = ".dev-snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
+
+CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
+
+PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
+
+FEED_URIS = "\
+ all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \
+ armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \
+ fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01"
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index a6c042333f..f404def82d 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -1,9 +1,8 @@
#/bin/sh
-# This script takes the last 1000 revs and writes a ChangeLog
-
mkdir logs
+export LOGNAME=Changelog.`date -u "+%Y%m%d"`
export REV_NOW=`mtn automate heads |head -n1`
for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
@@ -17,9 +16,9 @@ done
cd logs
for i in * ; do \
- echo $i: >> ../ChangeLog
- cat $i >> ../ChangeLog
- echo >> ../ChangeLog
+ echo $i: >> ../${LOGNAME}
+ cat $i >> ../${LOGNAME}
+ echo >> ../${LOGNAME}
done
cd ..
@@ -30,13 +29,13 @@ wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=a
NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`"
RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`"
-echo -e "\n\nBugs fixed:" >> ChangeLog
-cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
+echo -e "\n\nBugs fixed:" >> ${LOGNAME}
+cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME}
-echo -e "\n\nBugs opened:" >> ChangeLog
-cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
+echo -e "\n\nBugs opened:" >> ${LOGNAME}
+cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME}
-echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ChangeLog
+echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ${LOGNAME}
rm -Rf logs
diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb
index 72c83dc56e..b2483f2bfb 100644
--- a/packages/e17/edje-editor_cvs.bb
+++ b/packages/e17/edje-editor_cvs.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Edje-Editor is just that."
LICENSE = "MIT"
DEPENDS = "etk"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb
index 9b21c042a0..1a15746ca4 100644
--- a/packages/e17/edje-viewer_cvs.bb
+++ b/packages/e17/edje-viewer_cvs.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Edje_Viewer is just that."
DEPENDS = "etk"
LICENSE = "MIT"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
diff --git a/packages/file/file-native_4.21.bb b/packages/file/file-native_4.21.bb
index 59535dd518..734891d18d 100644
--- a/packages/file/file-native_4.21.bb
+++ b/packages/file/file-native_4.21.bb
@@ -1,6 +1,6 @@
require file_${PV}.bb
inherit native
-DEPENDS = ""
+DEPENDS = "zlib-native"
PR = "r0"
SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/packages/gaim/pidgin_2.1.0.bb b/packages/gaim/pidgin_2.1.0.bb
new file mode 100644
index 0000000000..e0f865722e
--- /dev/null
+++ b/packages/gaim/pidgin_2.1.0.bb
@@ -0,0 +1,9 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ "
+
+PR = "r0"
diff --git a/packages/gettext/gettext-native_0.14.1.bb b/packages/gettext/gettext-native_0.14.1.bb
index efc43ac4d3..6203b1f9d7 100644
--- a/packages/gettext/gettext-native_0.14.1.bb
+++ b/packages/gettext/gettext-native_0.14.1.bb
@@ -2,7 +2,6 @@ require gettext_${PV}.bb
S = "${WORKDIR}/gettext-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
inherit native
-DEPENDS = "zlib-native"
PROVIDES = ""
M4 = "\
diff --git a/packages/gtk-engines/gtk-sato-engine_0.1.bb b/packages/gtk-engines/gtk-sato-engine_0.1.bb
new file mode 100644
index 0000000000..4429b21cc9
--- /dev/null
+++ b/packages/gtk-engines/gtk-sato-engine_0.1.bb
@@ -0,0 +1,26 @@
+SECTION = "x11/base"
+DESCRIPTION = "Sato theme engine for GTK"
+LICENSE = "LGPL"
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-0.1.tar.gz"
+S = "${WORKDIR}/sato-engine-0.1"
+
+inherit autotools pkgconfig
+
+do_configure_prepend() {
+ for i in `ls gtk-common`; do
+ ln -sf ../gtk-common/$i gtk2-engine/$i
+ done
+}
+
+PACKAGES += "gtk-theme-sato"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
+
+RDEPENDS_gtk-theme-sato = "${PN}"
+
+
diff --git a/packages/gtk-engines/gtk-sato-engine_svn.bb b/packages/gtk-engines/gtk-sato-engine_svn.bb
index 2a96cf2ef6..c3d760c829 100644
--- a/packages/gtk-engines/gtk-sato-engine_svn.bb
+++ b/packages/gtk-engines/gtk-sato-engine_svn.bb
@@ -3,16 +3,23 @@ SECTION = "x11/base"
DESCRIPTION = "GTK theme engine SATO from O-Hand"
DEPENDS = "gtk+"
-PV = "0.0.1+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.1+svn${SRCDATE}"
PR = "r0"
+S = "${WORKDIR}/gtk-engine"
+
+SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
+
+inherit autotools pkgconfig
+
PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
-S = "${WORKDIR}/gtk-engine"
+RDEPENDS_gtk-theme-sato = "${PN}"
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
-inherit autotools pkgconfig
diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_svn.bb
index 1f19550c90..1f19550c90 100644
--- a/packages/gtkhtml2/gtkhtml2_cvs.bb
+++ b/packages/gtkhtml2/gtkhtml2_svn.bb
diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 0f1359fb19..65158f679b 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -12,7 +12,7 @@ export PACKAGE_INSTALL = "\
task-openmoko-ui \
task-openmoko-base \
task-openmoko-phone \
- task-openmoko-finger \
+ task-openmoko-games \
task-openmoko-pim \
"
diff --git a/packages/libowl/.mtn2git_empty b/packages/libowl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libowl/.mtn2git_empty
diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb
new file mode 100644
index 0000000000..2126e3d4d0
--- /dev/null
+++ b/packages/libowl/libowl_svn.bb
@@ -0,0 +1,48 @@
+# This recipe builds libowl and then stages the header and static lib;
+# it intentionally does not stage the shared lib and create a package.
+#
+# Libowl is currently a 'cut and paste' library; this package makes our
+# life a touch easier by not having to patch the source directly into
+# applications; instead we add -lowl to the linker cmdline. Also, when
+# we eventually make libowl into a normal shared library, this package
+# will make that transition rather simple.
+
+DESCRIPTION = "OpenedHand Widget Library"
+HOMEPAGE = "http://www.o-hand.com"
+LICENSE = "LGPL"
+SECTION = "libs"
+PR = "r3"
+PV = "0.0+svn${SRCDATE}"
+
+DEPENDS = "gtk+ glib-2.0"
+PACKAGES = ""
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+ # have to unstage the library first so that the tests build
+ rm -f ${STAGING_LIBDIR}/libowl*
+ rm -f ${STAGING_INCDIR}/owl*
+}
+
+do_stage() {
+ headers=`eval ls libowl/owl*.h`
+ for header in $headers; do
+ hdr_base=`eval basename $header`
+ install -m 644 $header ${STAGING_INCDIR}/$hdr_base
+ done
+ install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
+}
+
+do_install() {
+}
+
+do_package() {
+}
+
+do_package_write() {
+}
diff --git a/packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb b/packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb
new file mode 100644
index 0000000000..9e4774efd7
--- /dev/null
+++ b/packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Matchbox window manager Sato themes"
+LICENSE = "CC-BY-SA3"
+DEPENDS = "matchbox-wm"
+SECTION = "x11/wm"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/themes"
+
diff --git a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
index 5d91a47984..39b035bc7a 100644
--- a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
+++ b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
@@ -3,13 +3,16 @@ LICENSE = "GPL"
DEPENDS = "matchbox-wm"
SECTION = "x11/wm"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1+svn${SRCDATE}"
PR = "r0"
+PACKAGE_ARCH = "all"
+
SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
S = "${WORKDIR}/matchbox-sato"
-FILES_${PN} = "${datadir}/themes/Sato"
inherit autotools pkgconfig
+FILES_${PN} = "${datadir}/themes/Sato"
+
diff --git a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index fb91f03b12..c695388780 100644
--- a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -6,6 +6,9 @@ SECTION = "x11/wm"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-themes-extra/${PV}/matchbox-themes-extra-${PV}.tar.bz2"
S = "${WORKDIR}/matchbox-themes-extra-${PV}"
+PR = "r1"
+PACKAGE_ARCH = "all"
+
inherit autotools pkgconfig
# split into several packages plus one meta package
diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb
index ad7c31d3ed..83eb403c5f 100644
--- a/packages/matchbox-wm/matchbox-wm_1.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.2.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native matchbox-common"
RDEPENDS = "matchbox-common"
-PR="r0"
+PR="r1"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
file://gconf-2.m4 \
@@ -16,6 +16,7 @@ inherit autotools pkgconfig update-alternatives
FILES_${PN} = "${bindir}/* \
${datadir}/matchbox \
${sysconfdir}/matchbox \
+ ${sysconfdir}/gconf/ \
${datadir}/themes/blondie/matchbox \
${datadir}/themes/Default/matchbox \
${datadir}/themes/MBOpus/matchbox"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
index c9dd8c4817..0ec2f1e448 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel"
DEPENDS = "apmd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
index 786c2de657..97667159b5 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel"
DEPENDS = "bluez-libs"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
index 389a6f2691..578c85d2a7 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Shows the current time in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
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 8002a05fc4..4ca9543424 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Shows the GPS status in the OpenMoko panel"
DEPENDS = "gpsd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
index 6170da7c0c..e6888ee39b 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -1,10 +1,6 @@
-DESCRIPTION = "Shows the GSM status in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
-
-DEPENDS_append = " libgsmd"
+DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
+DEPENDS = "libgsmd"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
inherit openmoko-panel-plugin
-
-FILES_${PN} += "${bindir}/${PN}"
-
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
index cc5d6c48d3..bc5c60a381 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Main menu applet for the OpenMoko panel"
DEPENDS += "pulseaudio startup-notification"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
index 8dc478c40b..cd7fbe1c46 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "USB applet for the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
index 8fe54f3348..8e547b3663 100644
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,6 +1,6 @@
SECTION = "openmoko/libs"
DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko2
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index e5a1fe74f8..90f93074ac 100644
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,6 +1,6 @@
SECTION = "openmok