[oe-commits] org.oe.dev merge of '6fedd04121b05719430c13ec266e45683ed3b7bf'

[jeremy_laine commit]

merge of '6fedd04121b05719430c13ec266e45683ed3b7bf'
     and 'cebd7c2df88a5188ea19393bb7e04a6d3c592956'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 3cbc7c235df8720637ca4f1cfe3886d015edcd18
ViewMTN: http://monotone.openembedded.org/revision/info/3cbc7c235df8720637ca4f1cfe3886d015edcd18
Files:
1
packages/libnet/libnet_1.1.2.1.bb
packages/freesmartphone/py-odeviced
packages/freesmartphone/py-odeviced/om-gta02
packages/freesmartphone/py-odeviced/odeviced
packages/freesmartphone/py-odeviced/odeviced.conf
packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf
conf/distro/include/sane-srcrevs.inc
packages/freesmartphone/py-odeviced_svn.bb
Diffs:

#
# mt diff -r6fedd04121b05719430c13ec266e45683ed3b7bf -r3cbc7c235df8720637ca4f1cfe3886d015edcd18
#
#
#
# patch "packages/libnet/libnet_1.1.2.1.bb"
#  from [8e2351d0f0d3b8a946d2fab436019beb2d14aafb]
#    to [da1af814f8cfa2eca73ae16153c3d6847df8561b]
#
============================================================
--- packages/libnet/libnet_1.1.2.1.bb	8e2351d0f0d3b8a946d2fab436019beb2d14aafb
+++ packages/libnet/libnet_1.1.2.1.bb	da1af814f8cfa2eca73ae16153c3d6847df8561b
@@ -6,7 +6,7 @@ PROVIDES = "libnet-1.1"
 DEPENDS = "libpcap"
 # There are major API changes beween libnet v1.0 and libnet v1.1
 PROVIDES = "libnet-1.1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet/libnet_${PV}.orig.tar.gz \
            file://support-uclibc.patch;patch=1 \
@@ -33,8 +33,7 @@ do_stage () {
 }
 
 #static build
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc"
-
+FILES_${PN} = ""
 FILES_${PN}-dev += "${bindir}/libnet-config"
 
 CPPFLAGS_prepend = "-I${S}/libnet/include "


#
# mt diff -rcebd7c2df88a5188ea19393bb7e04a6d3c592956 -r3cbc7c235df8720637ca4f1cfe3886d015edcd18
#
#
#
# add_dir "packages/freesmartphone/py-odeviced"
# 
# add_dir "packages/freesmartphone/py-odeviced/om-gta02"
# 
# add_file "packages/freesmartphone/py-odeviced/odeviced"
#  content [6c3b518309598784d2c6c164eb67db3f4b397384]
# 
# add_file "packages/freesmartphone/py-odeviced/odeviced.conf"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf"
#  content [179c3301212831f33f0c97e3e9c466096c39a089]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [077bda507fb3d6f90f3109998534f4439fbf0588]
#    to [afc429e39ba516ccd96480fbeae6acda4c879cf2]
# 
# patch "packages/freesmartphone/py-odeviced_svn.bb"
#  from [357fa2e5ba56a15fff85342eda1fb75ebba36c44]
#    to [6ef92b7c28dc3f0730750da1b7cfeed1cd7da960]
#
============================================================
--- packages/freesmartphone/py-odeviced/odeviced	6c3b518309598784d2c6c164eb67db3f4b397384
+++ packages/freesmartphone/py-odeviced/odeviced	6c3b518309598784d2c6c164eb67db3f4b397384
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# odeviced  This shell script starts and stops the open device daemon.
+#
+# chkconfig: 345 90 20
+# description: py-odeviced is the open device 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 device daemon: "
+        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/odeviced
+        if [ $? = 0 ]; then
+            echo "(ok)"
+        else
+            echo "(failed)"
+        fi
+        ;;
+    stop)
+        echo -n "Stopping open device 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/odeviced {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
============================================================
--- packages/freesmartphone/py-odeviced/odeviced.conf	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/freesmartphone/py-odeviced/odeviced.conf	da39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf	179c3301212831f33f0c97e3e9c466096c39a089
+++ packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf	179c3301212831f33f0c97e3e9c466096c39a089
@@ -0,0 +1,4 @@
+[idlenotifier]
+# don't read from accellerometers for now
+ignoreinput=2,3
+
============================================================
--- conf/distro/include/sane-srcrevs.inc	077bda507fb3d6f90f3109998534f4439fbf0588
+++ conf/distro/include/sane-srcrevs.inc	afc429e39ba516ccd96480fbeae6acda4c879cf2
@@ -142,7 +142,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-opkg-sdk ?= "4235"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-py-odeviced = "161"
+SRCREV_pn-py-odeviced ?= "190"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "88"
 SRCREV_pn-pyneog ?= "88"
============================================================
--- packages/freesmartphone/py-odeviced_svn.bb	357fa2e5ba56a15fff85342eda1fb75ebba36c44
+++ packages/freesmartphone/py-odeviced_svn.bb	6ef92b7c28dc3f0730750da1b7cfeed1cd7da960
@@ -2,21 +2,30 @@ SECTION = "console/network"
 HOMEPAGE = "http://www.freesmartphone.org"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "python"
+DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPLv2"
-PV = "0.0+svnr${SRCREV}"
+PV = "0.7.9+svnr${SRCREV}"
 PR = "r0"
 
-inherit distutils
+inherit distutils update-rc.d
 
-#inherit update-rc.d
-#INITSCRIPT_NAME = "py-odeviced"
-#INITSCRIPT_PARAMS = "defaults 20"
+INITSCRIPT_NAME = "odeviced"
+INITSCRIPT_PARAMS = "defaults 20"
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced"
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced \
+           file://odeviced \
+           file://odeviced.conf"
 S = "${WORKDIR}/py-odeviced"
 
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/odeviced ${D}${sysconfdir}/init.d/
+	install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir}
+}
+
 RDEPENDS_${PN} += "\
   python-dbus \
   python-pygobject \
 "
+
+FILES_${PN} += "${sysconfdir}"