[oe-commits] org.oe.dev merge of 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'
mickeyl commit
oe at amethyst.openembedded.net
Sat Apr 12 22:41:46 UTC 2008
merge of 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'
and 'a6bf1374bee35f1cd9cae388f5137b3d0647f2af'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6fedd04121b05719430c13ec266e45683ed3b7bf
ViewMTN: http://monotone.openembedded.org/revision/info/6fedd04121b05719430c13ec266e45683ed3b7bf
Files:
1
packages/angstrom/angstrom-zeroconf-audio.bb
packages/images/base-image.bb
packages/images/console-image.bb
packages/images/minimal-image.bb
packages/images/sdr-image.bb
packages/images/x11-gpe-image.bb
packages/images/x11-gpe-java-image.bb
packages/images/x11-image.bb
packages/images/x11-office-image.bb
packages/images/x11-pimlico-image.bb
packages/images/x11-sato-image.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 -ra5ee0a152a133bdeb1576bb7a08fa9f1336e969d -r6fedd04121b05719430c13ec266e45683ed3b7bf
#
#
#
# add_file "packages/angstrom/angstrom-zeroconf-audio.bb"
# content [50db19a73a9273559ae52986499b7311325c7f57]
#
# patch "packages/images/base-image.bb"
# from [9c81aebd2963f50d6b9de4476bda3726a21b502b]
# to [353b1ae077e684dd31db37a52f6b77f60b357409]
#
# patch "packages/images/console-image.bb"
# from [935450894690e109439d4565572d813671a85699]
# to [90cd1891f48a20fba23e4809eb2b9be8a27e2485]
#
# patch "packages/images/minimal-image.bb"
# from [c74056146aaed6f3e2cd64879f504ea6920efb59]
# to [91a6a41eaf6c6ff482e66ba0ec4c22f817b22ca5]
#
# patch "packages/images/sdr-image.bb"
# from [db27bb62624a5de1caa94815b9c06c7895d9f094]
# to [241b2b3b56e218b3bf887378f5eab66ef049a4b9]
#
# patch "packages/images/x11-gpe-image.bb"
# from [ab32818d2bb2d3dcd3afc919674ccae2374f8aeb]
# to [36952a14d34686b2020013a286e193f4647320a8]
#
# patch "packages/images/x11-gpe-java-image.bb"
# from [8964f66e4a4db91f939e8a0fa51801339db49a49]
# to [8ff3ac481e5ae5b7d0c3ff43772158f18f67cdee]
#
# patch "packages/images/x11-image.bb"
# from [b547dd688f1df673379bc757fc7e946cf641e8b5]
# to [c50bc8ea54e85722cda417b1ff1b29c2a93a1c62]
#
# patch "packages/images/x11-office-image.bb"
# from [2a123551bfda9c0a23e167c4de291f03c3a55c25]
# to [c583f527811256bb0c6138a338a80ab8557c3269]
#
# patch "packages/images/x11-pimlico-image.bb"
# from [4ad6e8166469987b0938a0cd742e5c888c402bfc]
# to [cda199b961c44257e607d891a4b1386f6b1a4b1c]
#
# patch "packages/images/x11-sato-image.bb"
# from [76520f9e00c507510d5a16b2ccc373b6a66e34a2]
# to [ba6ee9b7eb840b773a10d6d81c1e5a3b78b04c68]
#
============================================================
--- packages/angstrom/angstrom-zeroconf-audio.bb 50db19a73a9273559ae52986499b7311325c7f57
+++ packages/angstrom/angstrom-zeroconf-audio.bb 50db19a73a9273559ae52986499b7311325c7f57
@@ -0,0 +1,26 @@
+DESCRIPTION = "Meta package to enable zeroconf audio with pulseaudio"
+DEPENDS = "avahi pulseaudio"
+RDEPENDS = "pulseaudio-module-zeroconf-publish avahi-daemon"
+
+do_compile() {
+ :
+}
+
+PACKAGE_ARCH = "all"
+ALLOW_EMPTY_${PN} = "1"
+
+pkg_postinst_${PN} () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+mkdir -p /etc/pulse || true
+# Remove existing entries
+if [ -e /etc/pulse/session ] ; then
+ sed -i -e /load-module\ module-native-protocol-tcp/d -e /load-module\ module-zeroconf-publish/d /etc/pulse/session
+fi
+# Enable network and zeroconf plugins, allow localhost and usbnet access (where available)
+echo "load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1;192.168.0.0/16" >> /etc/pulse/session
+echo "load-module module-zeroconf-publish" >> /etc/pulse/session
+}
============================================================
--- packages/images/base-image.bb 9c81aebd2963f50d6b9de4476bda3726a21b502b
+++ packages/images/base-image.bb 353b1ae077e684dd31db37a52f6b77f60b357409
@@ -16,6 +16,8 @@
# Although it is only fully tested with the Angstrom distro, this
# image is intended to be distro-agnostic.
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
DISTRO_SSH_DAEMON ?= "dropbear"
DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
============================================================
--- packages/images/console-image.bb 935450894690e109439d4565572d813671a85699
+++ packages/images/console-image.bb 90cd1891f48a20fba23e4809eb2b9be8a27e2485
@@ -1,5 +1,7 @@
#Angstrom bootstrap image
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
ANGSTROM_EXTRA_INSTALL ?= ""
DEPENDS = "task-base-extended \
============================================================
--- packages/images/minimal-image.bb c74056146aaed6f3e2cd64879f504ea6920efb59
+++ packages/images/minimal-image.bb 91a6a41eaf6c6ff482e66ba0ec4c22f817b22ca5
@@ -4,6 +4,8 @@ DISTRO_SSH_DAEMON ?= "dropbear"
ANGSTROM_EXTRA_INSTALL ?= ""
DISTRO_SSH_DAEMON ?= "dropbear"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
IMAGE_INSTALL = "task-boot \
util-linux-mount util-linux-umount \
${DISTRO_SSH_DAEMON} \
============================================================
--- packages/images/sdr-image.bb db27bb62624a5de1caa94815b9c06c7895d9f094
+++ packages/images/sdr-image.bb 241b2b3b56e218b3bf887378f5eab66ef049a4b9
@@ -6,24 +6,34 @@
# X demo
# xorg.conf
+PR = "r2"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+# Also generate tar.bz2 images for use on e.g. SD or nfsroot
+IMAGE_FSTYPES += "tar.bz2"
+
ANGSTROM_EXTRA_INSTALL ?= ""
DISTRO_SSH_DAEMON ?= "dropbear"
+# Install "big" X if the target has a screen
+GUIPACKAGES = " \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-video-dummy \
+ xf86-video-fbdev \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "xf86-video-sisusb", "",d)} \
+ xf86-video-vesa \
+"
+
IMAGE_INSTALL = " task-base-extended \
kernel-modules \
- task-proper-tools \
gnuradio gnuradio-usrp \
gnuplot \
- xf86-input-keyboard \
- xf86-input-evdev \
- xf86-input-mouse \
- xf86-video-dummy \
- xf86-video-fbdev \
- xf86-video-sisusb \
- xf86-video-vesa \
+ ${@base_contains("MACHINE_FEATURES", "screen", "${GUIPACKAGES}", "",d)} \
python-core perl \
uucp picocom \
- pulseaudio pulseaudio-module-zeroconf-publish avahi-utils \
+ angstrom-zeroconf-audio avahi-utils \
"
inherit image
============================================================
--- packages/images/x11-gpe-image.bb ab32818d2bb2d3dcd3afc919674ccae2374f8aeb
+++ packages/images/x11-gpe-image.bb 36952a14d34686b2020013a286e193f4647320a8
@@ -20,6 +20,8 @@ IMAGE_INSTALL = "\
${ANGSTROM_EXTRA_INSTALL}"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
#zap root password for release images
ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
============================================================
--- packages/images/x11-gpe-java-image.bb 8964f66e4a4db91f939e8a0fa51801339db49a49
+++ packages/images/x11-gpe-java-image.bb 8ff3ac481e5ae5b7d0c3ff43772158f18f67cdee
@@ -21,6 +21,7 @@ IMAGE_INSTALL = "\
angstrom-gpe-task-pim \
${ANGSTROM_EXTRA_INSTALL}"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
#zap root password for release images
ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
============================================================
--- packages/images/x11-image.bb b547dd688f1df673379bc757fc7e946cf641e8b5
+++ packages/images/x11-image.bb c50bc8ea54e85722cda417b1ff1b29c2a93a1c62
@@ -16,6 +16,8 @@ IMAGE_INSTALL = "\
angstrom-gpe-task-settings \
${ANGSTROM_EXTRA_INSTALL}"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
#zap root password for release images
ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
============================================================
--- packages/images/x11-office-image.bb 2a123551bfda9c0a23e167c4de291f03c3a55c25
+++ packages/images/x11-office-image.bb c583f527811256bb0c6138a338a80ab8557c3269
@@ -24,6 +24,8 @@ IMAGE_INSTALL = "\
gphoto2 \
${ANGSTROM_EXTRA_INSTALL}"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
#zap root password for release images
ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
============================================================
--- packages/images/x11-pimlico-image.bb 4ad6e8166469987b0938a0cd742e5c888c402bfc
+++ packages/images/x11-pimlico-image.bb cda199b961c44257e607d891a4b1386f6b1a4b1c
@@ -19,6 +19,7 @@ IMAGE_INSTALL = "\
angstrom-ohand-task-pim \
${ANGSTROM_EXTRA_INSTALL}"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
#zap root password for release images
ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
============================================================
--- packages/images/x11-sato-image.bb 76520f9e00c507510d5a16b2ccc373b6a66e34a2
+++ packages/images/x11-sato-image.bb ba6ee9b7eb840b773a10d6d81c1e5a3b78b04c68
@@ -1,6 +1,8 @@ DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-col
DISTRO_SSH_DAEMON ?= "dropbear"
DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
IMAGE_INSTALL = "\
task-base-extended \
${DISTRO_SSH_DAEMON} \
#
# mt diff -ra6bf1374bee35f1cd9cae388f5137b3d0647f2af -r6fedd04121b05719430c13ec266e45683ed3b7bf
#
#
#
# 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}"
More information about the Openembedded-commits
mailing list