Merge branch 'holger/openmoko-merges' into org.openembedded.dev

25 files changed, 279 insertions, 41 deletions

diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb
new file mode 100644
index 0000000000..2a8896c592
--- /dev/null
+++ b/packages/images/openmoko-asu-image.bb
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# Openmoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-asu"
diff --git a/packages/openmoko-projects/assassin-thumbnail.bb b/packages/openmoko-projects/assassin-thumbnail.bb
new file mode 100644
index 0000000000..ece6662b91
--- /dev/null
+++ b/packages/openmoko-projects/assassin-thumbnail.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Assassin Packages Thumbnails"
+HOMEPAGE = "http://assassin.projects.openmoko.org/"
+PKG_TAGS_${PN} = "group::unknown"
+LICENSE = "GPL"
+RDEPENDS = "assassin"
+PV = "0.1+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https"
+
+do_install() {
+        install -d ${D}${THUMBNAIL_DIR}
+        cp -f ${WORKDIR}/result/${THUMBNAIL_FN} ${D}${THUMBNAIL_DIR}
+}
+
+FILES_${PN} = "${THUMBNAIL_DIR}/${THUMBNAIL_FN}"
+
+THUMBNAIL_DIR = "${datadir}/assassin/"
+THUMBNAIL_FN = "thumbnail.eet"
diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb
index 32c976df7a..c2ab9579a3 100644
--- a/packages/openmoko-projects/assassin_svn.bb
+++ b/packages/openmoko-projects/assassin_svn.bb
@@ -2,12 +2,13 @@ DESCRIPTION = "Action GUI for Installer"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
 LICENSE = "GPL"
 DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet"
+RDEPENDS = "etk-theme-ninja"
 PV = "0.2+svnr${SRCREV}"
-PR = "r6"
+PR = "r6.04"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
+SRC_URI = "svn://om-assassin.googlecode.com/svn/;module=trunk;proto=http"
 
-S = "${WORKDIR}/assassin"
+S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
 
diff --git a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb
deleted file mode 100644
index c882963fb2..0000000000
--- a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-PR = "r0"
-
-require diversity-maps.inc
-
-MAP_NAME = "Taipei"
-MAP_FN = "taipei.eet"
-MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/diversity-maps.inc b/packages/openmoko-projects/diversity-maps.inc
deleted file mode 100644
index 9af5e95d95..0000000000
--- a/packages/openmoko-projects/diversity-maps.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Diversity Maps - ${MAP_NAME}"
-HOMEPAGE = "http://diversity.projects.openmoko.org/"
-SECTION = "network/misc"
-LICENSE = "Creative Commons Attribution-ShareAlike 2.0"
-
-SRC_URI = "http://people.openmoko.org/olv/diversity/${MAP_VER}/${MAP_FN}"
-
-MAP_DIR = "${datadir}/diversity-nav/maps"
-FILES_${PN} = "${MAP_DIR}/${MAP_FN}"
-
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "all"
-PKG_TAGS_${PN} = "group::maps"
-
-do_install() {
-        install -d ${D}${MAP_DIR}
-        cp -f ${WORKDIR}/${MAP_FN} ${D}${MAP_DIR}
-}
diff --git a/packages/openmoko-projects/diversity-radar_svn.bb b/packages/openmoko-projects/diversity-radar_svn.bb
new file mode 100644
index 0000000000..d7163f1f21
--- /dev/null
+++ b/packages/openmoko-projects/diversity-radar_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Diversity_radar - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "python-evas python-edje python-ecore python-edbus python-dbus python-etk"
+RDEPENDS_${PN} = "diversity-daemon"
+PV = "0.0.4+svnr${SRCREV}"
+PR = "r0.01"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/toys;module=diversity-radar;proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit setuptools
+
+FILES_${PN} += "${prefix}/share/*"
+
+PKG_TAGS_${PN} = "group::communication"
diff --git a/packages/openmoko-projects/exposure/setup-r62.diff b/packages/openmoko-projects/exposure/setup-r62.diff
new file mode 100644
index 0000000000..694787bdec
--- /dev/null
+++ b/packages/openmoko-projects/exposure/setup-r62.diff
@@ -0,0 +1,12 @@
+Index: setup.py
+===================================================================
+--- setup.py	(Revision 62)
++++ setup.py	(Arbeitskopie)
+@@ -27,7 +27,6 @@
+     setup_requires=['python-evas>=0.2.1'],
+     data_files=[('applications', 'src/exposure.desktop']),
+ 	('exposure', ['data/themes/exposure.edj']),
+-	('images', ['data/image/exposure.jpg']),
+ 	('/etc/X11/Xsession.d/', ['src/80app-launcher-bootup']),
+         ]
+ )
diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
new file mode 100644
index 0000000000..a25a3e21ba
--- /dev/null
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Locations - a GPS location based communicative application"
+HOMEPAGE = "http://wiki.openmoko.org/wiki/Om2008.8_Locations"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "eet evas edje ecore edbus etk"
+RDEPENDS_${PN} = "diversity-daemon"
+PV = "0.2+gitr${SRCREV}"
+PR = "r1.03"
+
+SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+do_configure_prepend() {
+       autopoint --force
+}
+
+PKG_TAGS_${PN} = "group::communication"
diff --git a/packages/openmoko-projects/om-maps-berlin_20080430.bb b/packages/openmoko-projects/om-maps-berlin_20080430.bb
new file mode 100644
index 0000000000..aaf6e5332c
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-berlin_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "Berlin"
+MAP_FN = "om-maps-berlin-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
new file mode 100644
index 0000000000..81f734f27a
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "Buenos Aires"
+MAP_FN = "om-maps-buenos-aires-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
new file mode 100644
index 0000000000..9aecf64816
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "Hong Kong"
+MAP_FN = "om-maps-hong-kong-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-london_20080430.bb b/packages/openmoko-projects/om-maps-london_20080430.bb
new file mode 100644
index 0000000000..d07add5032
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-london_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "London"
+MAP_FN = "om-maps-london-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-low-levels_20080430.bb b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
new file mode 100644
index 0000000000..7f94c903b5
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r0"
+
+require om-maps.inc
+
+MAP_NAME = "low levels"
+MAP_FN = "om-maps-low-levels-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-new-york_20080430.bb b/packages/openmoko-projects/om-maps-new-york_20080430.bb
new file mode 100644
index 0000000000..2fffda62c3
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-new-york_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "New York"
+MAP_FN = "om-maps-new-york-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-paris_20080430.bb b/packages/openmoko-projects/om-maps-paris_20080430.bb
new file mode 100644
index 0000000000..663656a673
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-paris_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "Paris"
+MAP_FN = "om-maps-paris-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-providence_20080430.bb b/packages/openmoko-projects/om-maps-providence_20080430.bb
new file mode 100644
index 0000000000..919e030e17
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-providence_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "Providence"
+MAP_FN = "om-maps-providence-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-san-francisco_20080430.bb b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
new file mode 100644
index 0000000000..6b5f77981a
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-san-francisco_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "San Francisco"
+MAP_FN = "om-maps-san-francisco-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-sydney_20080430.bb b/packages/openmoko-projects/om-maps-sydney_20080430.bb
new file mode 100644
index 0000000000..267b6a1724
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-sydney_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "Sydney"
+MAP_FN = "om-maps-sydney-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-taipei_20080430.bb b/packages/openmoko-projects/om-maps-taipei_20080430.bb
new file mode 100644
index 0000000000..bb017f59fb
--- /dev/null
+++ b/packages/openmoko-projects/om-maps-taipei_20080430.bb
@@ -0,0 +1,7 @@
+PR = "r1"
+
+require om-maps.inc
+
+MAP_NAME = "Taipei"
+MAP_FN = "om-maps-taipei-${PV}.eet"
+MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps.inc b/packages/openmoko-projects/om-maps.inc
new file mode 100644
index 0000000000..f2ef1dbbec
--- /dev/null
+++ b/packages/openmoko-projects/om-maps.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Map of ${MAP_NAME}, for use with Locations application. \
+               Data from OpenStreetMap.org, licenced CC-by-SA."
+HOMEPAGE = "http://wiki.openmoko.org/wiki/Om_2008.8_Locations"
+SECTION = "network/misc"
+LICENSE = "Creative Commons Attribution-ShareAlike 2.0"
+
+SRC_URI = "http://people.openmoko.org/olv/om-maps/${MAP_VER}/${MAP_FN}"
+
+MAP_DIR = "${datadir}/om-maps"
+FILES_${PN} = "${MAP_DIR}/${MAP_FN}"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "all"
+PKG_TAGS_${PN} = "group::maps"
+
+do_install() {
+        install -d ${D}${MAP_DIR}
+        cp -f ${WORKDIR}/${MAP_FN} ${D}${MAP_DIR}
+}
diff --git a/packages/openmoko-projects/om-settings_svn.bb b/packages/openmoko-projects/om-settings_svn.bb
new file mode 100644
index 0000000000..56b8e1d017
--- /dev/null
+++ b/packages/openmoko-projects/om-settings_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Exposure all devices on neo1973"
+DEPENDS = "python-etk python-edbus"
+RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r2.05"
+PE = "1"
+
+S = "${WORKDIR}/trunk"
+
+inherit setuptools
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=http \
+           "
+
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${prefix}/share/* ${sysconfdir}/X11/Xsession.d/*"
diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
new file mode 100644
index 0000000000..d866558fb3
--- /dev/null
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Configuration files for online package repositories of Openmoko community repository feeds"
+PR = "r0.02"
+
+do_compile() {
+    mkdir -p ${S}/${sysconfdir}/opkg
+    for feed in Multiverse; 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/Multiverse-feed.conf"
+
+PKG_TAGS_${PN} = "group::repos"
+
+OPENMOKO_URI = "http://downloads.openmoko.org/repository"
diff --git a/packages/openmoko-projects/tichy_svn.bb b/packages/openmoko-projects/tichy_svn.bb
index 4b8fe5eeb3..5c54dbad3e 100644
--- a/packages/openmoko-projects/tichy_svn.bb
+++ b/packages/openmoko-projects/tichy_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Python applets manager"
 SECTION = "x11"
 LICENSE = "GPL"
-DEPENDS = "python-pygame"
+DEPENDS += "python-pygame virtual/libsdl libsdl-image python-dbus python-pygobject"                                   
 PV = "0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r0.01"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=tichy;proto=http"
 S = "${WORKDIR}/tichy"
@@ -12,3 +12,5 @@ inherit distutils
 
 FILES_${PN} += "${datadir}"
 RDEPENDS_${PN} += "python-pygame"
+# This is because pkg-config --libs --cflags sdl doesn't return the correct path (bug in libsdl recipe ?)
+CFLAGS += -I${STAGING_INCDIR}/SDL
diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb
new file mode 100644
index 0000000000..0cdb6aee7b
--- /dev/null
+++ b/packages/tasks/task-openmoko-asu.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "Openmoko: Om 2008.8 August Software Update"
+
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r2.02"
+
+inherit task
+
+PACKAGES = "task-openmoko-asu"
+RDEPENDS_task-openmoko-asu = "\
+  bluez-hcidump \
+  readline \
+  connman \
+  connman-plugin-connman-resolvconf \
+  connman-plugin-connman-dhclient \
+  connman-plugin-connman-80211 \
+  connman-script-dhclient \
+  e-wm \
+  illume \
+  illume-theme \
+  assassin \
+  diversity-daemon \
+  om-locations \
+  om-maps-low-levels \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  libnotify \
+  om-settings \
+  etk-theme-ninja \
+  openmoko-community-repository \
+  assassin-thumbnail \
+  pyefl-sudoku \
+  \
+# For supporting the om2007.2 stack
+  openmoko-icon-theme-standard2 \
+  moko-gtk-engine \
+  settings-daemon \
+  openmoko-asu-om20072-support \
+"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 40e97585ea..921f4d7edd 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r42"
+PR = "r45"
 
 inherit task
 
@@ -49,16 +49,19 @@ RDEPENDS_task-openmoko-feed = "\
   mono \
 #  diversity-daemon \
 #  diversity-maps-taipei \
-#  om-maps-berlin \
-#  om-maps-buenos-aires \
-#  om-maps-london \
-#  om-maps-new-york \
-#  om-maps-paris \
-#  om-maps-providence \
-#  om-maps-san-francisco \
-#  om-maps-sydney \
-#  om-maps-taipei \
-#  om-settings \
+  om-maps-berlin \
+  om-maps-buenos-aires \
+  om-maps-hong-kong \
+  om-maps-london \
+  om-maps-low-levels \
+  om-maps-new-york \
+  om-maps-paris \
+  om-maps-providence \
+  om-maps-san-francisco \
+  om-maps-sydney \
+  om-maps-taipei \
+  om-locations \
+  om-settings \
   assassin \
 #  assassin-thumbnail \
   tangogps \