freesmartphone: add a fso-image and fix bb-files

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 07340dc..df53515 100644 (file)
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -5,5 +5,6 @@ SRCREV_pn-pyneod = "${AUTOREV}"
 SRCREV_pn-pynoeg = "${AUTOREV}"
 SRCREV_pn-python-odeviced = "${AUTOREV}"
 SRCREV_pn-python-ophoned = "${AUTOREV}"
+SRCREV_pn-python-ousaged = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 0e21798..293340c 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -159,8 +159,9 @@ SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
-SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965"
-SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391"
+SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"
+SRCREV_pn-python-ophoned ?= "8bb89a912163c8a846be7a14b2a6e2f832f91bd6"
+SRCREV_pn-python-ousaged ?= "c7f83c3f696b6e72f3cab244af4e88dc4851018e"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
@@ -184,4 +185,4 @@ SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4"
+SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b"

diff --git a/packages/freesmartphone/python-ophoned/ophoned b/packages/freesmartphone/python-ophoned/ophoned
new file mode 100644 (file)
index 0000000..edc8007
--- /dev/null
+++ b/packages/freesmartphone/python-ophoned/ophoned
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# ophoned  This shell script starts and stops the open phone daemon.
+#
+# chkconfig: 345 90 20
+# description: py-ophoned is the open phone daemon
+# processname: python
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=ophoned
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+    start)
+        echo -n "Starting open phone daemon: "
+        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ophoned
+        if [ $? = 0 ]; then
+            echo "(ok)"
+        else
+            echo "(failed)"
+        fi
+        ;;
+    stop)
+        echo -n "Stopping open phone daemon: "
+        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+        rm -f /var/run/${NAME}.pid
+        echo "(done)"
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/ophoned {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0

diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb
index e494719..0a1c802 100644 (file)
--- a/packages/freesmartphone/python-ophoned_git.bb
+++ b/packages/freesmartphone/python-ophoned_git.bb
@@ -19,9 +19,9 @@ S = "${WORKDIR}/git"
 do_install_append() {
        install -d ${D}${sysconfdir}/init.d/
        install -m 0755 ${WORKDIR}/ophoned ${D}${sysconfdir}/init.d/
-#      install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir}
+#      install -m 0644 ${WORKDIR}/ophoned.conf ${D}${sysconfdir}
        install -d ${D}${sysconfdir}/dbus-1/system.d/
-#      mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/
+       mv -f ${D}${datadir}/etc/dbus-1/system.d/ophoned.conf ${D}${sysconfdir}/dbus-1/system.d/
 }
 
 RDEPENDS_${PN} += "\

diff --git a/packages/freesmartphone/python-ousaged/.mtn2git_empty b/packages/freesmartphone/python-ousaged/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/freesmartphone/python-ousaged/ousaged b/packages/freesmartphone/python-ousaged/ousaged
new file mode 100644 (file)
index 0000000..7b62d7f
--- /dev/null
+++ b/packages/freesmartphone/python-ousaged/ousaged
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# odeviced  This shell script starts and stops the open device daemon.
+#
+# chkconfig: 345 90 20
+# description: py-ousaged is the open usage daemon
+# processname: python
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=odeviced
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+    start)
+        echo -n "Starting open usage daemon: "
+        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ousaged
+        if [ $? = 0 ]; then
+            echo "(ok)"
+        else
+            echo "(failed)"
+        fi
+        ;;
+    stop)
+        echo -n "Stopping open usage daemon: "
+        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+        rm -f /var/run/${NAME}.pid
+        echo "(done)"
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/ousaged {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0

diff --git a/packages/freesmartphone/python-ousaged_git.bb b/packages/freesmartphone/python-ousaged_git.bb
new file mode 100644 (file)
index 0000000..f9ba285
--- /dev/null
+++ b/packages/freesmartphone/python-ousaged_git.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "The Open Usage Daemon Prototype in Python"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenUsageDaemon"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPLv2"
+PV = "0.7.9+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils update-rc.d
+
+INITSCRIPT_NAME = "ousaged"
+INITSCRIPT_PARAMS = "defaults 20"
+
+SRC_URI = "\
+  ${FREESMARTPHONE_GIT}/usaged.git;protocol=git;branch=master \
+  file://ousaged \
+"
+S = "${WORKDIR}/git"
+
+do_install_append() {
+       install -d ${D}${sysconfdir}/init.d/
+       install -m 0755 ${WORKDIR}/ousaged ${D}${sysconfdir}/init.d/
+       install -d ${D}${sysconfdir}/dbus-1/system.d/
+       mv -f ${D}${datadir}/etc/dbus-1/system.d/ousaged.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
+
+RDEPENDS_${PN} += "\
+  python-dbus \
+  python-pygobject \
+  python-pyrtc \
+  python-syslog \
+  python-odeviced \
+"
+
+FILES_${PN} += "${sysconfdir}"

diff --git a/packages/freesmartphone/zhone/.mtn2git_empty b/packages/freesmartphone/zhone/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/freesmartphone/zhone/80zhone b/packages/freesmartphone/zhone/80zhone
new file mode 100644 (file)
index 0000000..4a69800
--- /dev/null
+++ b/packages/freesmartphone/zhone/80zhone
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+zhone --fullscreen > /dev/null 2>&1 &
+renice -3 $!
+exit 0

diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 7fe6742..419ee7a 100644 (file)
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -4,10 +4,26 @@ SECTION = "x11"
 DEPENDS = "edje-native"
 RDEPENDS = "task-python-efl python-textutils"
 PV = "0.0.0+gitr${SRCREV}"
+PR = "r3"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master"
+SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
+           file://80zhone"
 S = "${WORKDIR}/git"
 
 inherit autotools
 
-FILES_${PN} += "${datadir}"
+RDEPENDS_${PN} += "\
+  python-dbus \
+"
+
+do_install_append() {
+       install -d ${D}${sysconfdir}/X11/Xsession.d/
+       install -m 0755 ${WORKDIR}/80zhone ${D}${sysconfdir}/X11/Xsession.d/
+}
+
+FILES_${PN} += "${datadir} ${sysconfdir}"
+
+RCONFLICTS = "openmoko-session2"
+RREPLACES = "openmoko-session2"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+

diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
new file mode 100644 (file)
index 0000000..72cbfd7
--- /dev/null
+++ b/packages/images/fso-image.bb
@@ -0,0 +1,61 @@
+#------------------------------------------------------
+# freesmartphone.org Image Recipe
+#------------------------------------------------------
+
+IMAGE_LINGUAS = ""
+ 
+ADD_INSTALL = "\
+  fontconfig-utils \
+  \
+  ttf-dejavu-common \
+  ttf-dejavu-sans \
+  ttf-dejavu-serif \
+  \
+"
+ 
+MICKEY_INSTALL = "\
+  htop \
+  mickeyterm \
+  nano \
+  powertop \
+  s3c24xx-gpio \
+"
+ 
+ZHONE_INSTALL = "\
+  gsm0710muxd \
+  python-odeviced \
+  python-ophoned \
+  python-ousaged \
+  zhone \
+"
+ 
+IMAGE_INSTALL = "\
+  ${MACHINE_TASK_PROVIDER} \
+  netbase \
+  sysfsutils \
+  module-init-tools-depmod \
+  rsync \
+  screen \
+  fbset \
+  fbset-modes \
+  \
+  matchbox-wm \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  \
+  python-codecs \
+  \
+  ${ADD_INSTALL} \
+  ${MICKEY_INSTALL} \
+  ${ZHONE_INSTALL} \
+"
+ 
+inherit image
+ 
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
+