[oe-commits] org.oe.dev merge of '128beb53ed0092647984a87f2a86eaec9d1f3510'
jluebbe commit
openembedded-commits at lists.openembedded.org
Thu Jan 3 16:04:10 UTC 2008
merge of '128beb53ed0092647984a87f2a86eaec9d1f3510'
and '2a1403c40d81aff7aa7bbe8236c502336c5b9a09'
Author: jluebbe at openembedded.org
Branch: org.openembedded.dev
Revision: 0df24d50b2a3e2b52a0f5072b0e7ad8716db582e
ViewMTN: http://monotone.openembedded.org/revision/info/0df24d50b2a3e2b52a0f5072b0e7ad8716db582e
Files:
1
packages/dbus/dbus-1.1.1
conf/distro/include/preferred-om-2008-versions.inc
packages/dbus/dbus-1.1.1/cross.patch
packages/dbus/dbus-1.1.1/dbus-1.init
packages/dbus/dbus-1.1.1/fix-install-daemon.patch
packages/dbus/dbus-1.1.1/tmpdir.patch
packages/dbus/dbus-native_1.1.1.bb
packages/dbus/dbus_1.1.1.bb
classes/base.bbclass
classes/sanity.bbclass
packages/qemu/qemu-gcc3-check.inc
packages/qpegps/qpegps_svn.bb
Diffs:
#
# mt diff -r128beb53ed0092647984a87f2a86eaec9d1f3510 -r0df24d50b2a3e2b52a0f5072b0e7ad8716db582e
#
#
#
# add_dir "packages/dbus/dbus-1.1.1"
#
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
# content [f09fc00fcb956472364428627b653deb21fa27ae]
#
# add_file "packages/dbus/dbus-1.1.1/cross.patch"
# content [8893afa8766367ecce4e78b1bbede8c7e4781336]
#
# add_file "packages/dbus/dbus-1.1.1/dbus-1.init"
# content [9bdceca2b1986db6ec905e8b53e6402be0b88e9a]
#
# add_file "packages/dbus/dbus-1.1.1/fix-install-daemon.patch"
# content [a130a0f9e1442b0848f09d45516d4c1fae678502]
#
# add_file "packages/dbus/dbus-1.1.1/tmpdir.patch"
# content [074f93acba96cb165a3d21cac74b5fdfaae98fc8]
#
# add_file "packages/dbus/dbus-native_1.1.1.bb"
# content [6b8c402959c6434e289e34eae91e9e615a2ddf77]
#
# add_file "packages/dbus/dbus_1.1.1.bb"
# content [8067523daef0e32a078d9ed9d83ac3254616dcc5]
#
# patch "classes/base.bbclass"
# from [5efb30de935081fe56703b6432d636a3668d4823]
# to [d034cdab57388cbe9087fb1c8dfd47a162e139de]
#
# patch "classes/sanity.bbclass"
# from [a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5]
# to [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
#
# patch "packages/qemu/qemu-gcc3-check.inc"
# from [ab9405e1e7f0697d39ad932818e4d113c0fbd3ea]
# to [d7b22bce39e0bfb99c296b0873ef8d1dea0d0aff]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc f09fc00fcb956472364428627b653deb21fa27ae
+++ conf/distro/include/preferred-om-2008-versions.inc f09fc00fcb956472364428627b653deb21fa27ae
@@ -0,0 +1 @@
+PREFERRED_VERSION_vte = "0.16.10"
============================================================
--- packages/dbus/dbus-1.1.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
+++ packages/dbus/dbus-1.1.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
@@ -0,0 +1,10 @@
+--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+ exit (0);
+ ]])],
+ [ac_cv_have_abstract_sockets=yes],
++ [ac_cv_have_abstract_sockets=no],
+ [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
============================================================
--- packages/dbus/dbus-1.1.1/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
+++ packages/dbus/dbus-1.1.1/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
@@ -0,0 +1,110 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters at debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+ . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ echo "$DESC already started; not starting."
+ else
+ echo "Removing stale PID file $PIDFILE."
+ rm -f $PIDFILE
+ fi
+ fi
+
+ if [ ! -d $UUIDDIR ]; then
+ mkdir -p $UUIDDIR
+ chown $DAEMONUSER $UUIDDIR
+ chgrp $DAEMONUSER $UUIDDIR
+ fi
+
+ dbus-uuidgen --ensure
+
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ if [ -d $EVENTDIR ]; then
+ run-parts --arg=start $EVENTDIR
+ fi
+}
+
+shut_it_down()
+{
+ if [ -d $EVENTDIR ]; then
+ # TODO: --reverse when busybox supports it
+ run-parts --arg=stop $EVENTDIR
+ fi
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ # We no longer include these arguments so that start-stop-daemon
+ # can do its job even given that we may have been upgraded.
+ # We rely on the pidfile being sanely managed
+ # --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ rm -f $PIDFILE
+}
+
+reload_it()
+{
+ echo -n "Reloading $DESC config: "
+ dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+ # hopefully this is enough time for dbus to reload it's config file.
+ echo "done."
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ reload|force-reload)
+ reload_it
+ ;;
+ restart)
+ shut_it_down
+ sleep 1
+ start_it_up
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/dbus/dbus-1.1.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
+++ packages/dbus/dbus-1.1.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ fi
+- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
============================================================
--- packages/dbus/dbus-1.1.1/tmpdir.patch 074f93acba96cb165a3d21cac74b5fdfaae98fc8
+++ packages/dbus/dbus-1.1.1/tmpdir.patch 074f93acba96cb165a3d21cac74b5fdfaae98fc8
@@ -0,0 +1,30 @@
+--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+- DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+- DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+- DEFAULT_SOCKET_DIR=$TMP
+-else
+- DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++# DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++# DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++# DEFAULT_SOCKET_DIR=$TMP
++#else
++# DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+
+ if ! test -z "$with_test_socket_dir" ; then
+ TEST_SOCKET_DIR="$with_test_socket_dir"
============================================================
--- packages/dbus/dbus-native_1.1.1.bb 6b8c402959c6434e289e34eae91e9e615a2ddf77
+++ packages/dbus/dbus-native_1.1.1.bb 6b8c402959c6434e289e34eae91e9e615a2ddf77
@@ -0,0 +1,31 @@
+DESCRIPTION = "message bus system for applications to talk to one another"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "GPL"
+SECTION = "base"
+
+PR = "r0"
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ "
+
+inherit autotools pkgconfig gettext native
+
+S = "${WORKDIR}/dbus-${PV}"
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+ --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+ oe_runmake install
+ autotools_stage_all
+
+ # for dbus-glib-native introspection generation
+ install -d ${STAGING_DATADIR}/dbus
+ install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
============================================================
--- packages/dbus/dbus_1.1.1.bb 8067523daef0e32a078d9ed9d83ac3254616dcc5
+++ packages/dbus/dbus_1.1.1.bb 8067523daef0e32a078d9ed9d83ac3254616dcc5
@@ -0,0 +1,63 @@
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "base"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+
+PR = "r3"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://tmpdir.patch;patch=1 \
+ file://dbus-1.init \
+ file://cross.patch;patch=1 \
+ file://fix-install-daemon.patch;patch=1"
+
+inherit autotools pkgconfig update-rc.d gettext
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+ --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+ oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+
+ autotools_stage_includes
+
+ mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+ install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+}
+
+python populate_packages_prepend () {
+ if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+ bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
============================================================
--- classes/base.bbclass 5efb30de935081fe56703b6432d636a3668d4823
+++ classes/base.bbclass d034cdab57388cbe9087fb1c8dfd47a162e139de
@@ -902,6 +902,23 @@ python () {
base_after_parse(d)
}
+def check_app_exists(app, d):
+ from bb import which, data
+
+ app = data.expand(app, d)
+ path = data.getVar('PATH', d)
+ return len(which(path, app)) != 0
+
+def check_gcc3(data):
+
+ gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32'
+
+ for gcc3 in gcc3_versions.split():
+ if check_app_exists(gcc3, data):
+ return gcc3
+
+ return False
+
# Patch handling
inherit patch
============================================================
--- classes/sanity.bbclass a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5
+++ classes/sanity.bbclass ebf6cc13d544c4d677c13e3ea8dd18655c21e172
@@ -24,14 +24,6 @@ def check_conf_exists(fn, data):
return True
return False
-def check_app_exists(app, d):
- from bb import which, data
-
- app = data.expand(app, d)
- path = data.getVar('PATH', d)
- return len(which(path, app)) != 0
-
-
def check_sanity(e):
from bb import note, error, data, __version__
from bb.event import Handled, NotHandled, getName
============================================================
--- packages/qemu/qemu-gcc3-check.inc ab9405e1e7f0697d39ad932818e4d113c0fbd3ea
+++ packages/qemu/qemu-gcc3-check.inc d7b22bce39e0bfb99c296b0873ef8d1dea0d0aff
@@ -1,22 +1,11 @@ python __anonymous() {
python __anonymous() {
from bb import which, data
path = data.getVar('PATH', d, 1)
oldOeConf = data.getVar('EXTRA_OECONF', d, 1)
if not oldOeConf: oldOeConf = ""
- if len(which(path, 'gcc-3.4.4')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.4", d)
- elif len(which(path, 'gcc-3.4')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d)
- elif len(which(path, 'gcc34')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d)
- elif len(which(path, 'gcc33')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d)
- elif len(which(path, 'gcc-3.3')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d)
- elif len(which(path, 'gcc-3.3.6')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d)
- elif len(which(path, 'gcc-3.4.6')) != 0:
- data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d)
+ gcc3 = check_gcc3(d)
+ if gcc3:
+ data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d)
}
#
# mt diff -r2a1403c40d81aff7aa7bbe8236c502336c5b9a09 -r0df24d50b2a3e2b52a0f5072b0e7ad8716db582e
#
#
#
# add_file "packages/qpegps/qpegps_svn.bb"
# content [33113854f73f3efe09ce78ca8f3ff118170d1365]
#
============================================================
--- packages/qpegps/qpegps_svn.bb 33113854f73f3efe09ce78ca8f3ff118170d1365
+++ packages/qpegps/qpegps_svn.bb 33113854f73f3efe09ce78ca8f3ff118170d1365
@@ -0,0 +1,15 @@
+require qpegps.inc
+
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://qpegps.svn.sourceforge.net/svnroot/;module=qpegps/trunk/qpegps;proto=https \
+ file://qpegps.desktop \
+ file://qpegps.png "
+
+S = "${WORKDIR}/qpegps/trunk/qpegps"
+
+do_configure_prepend() {
+ mv ${S}/Place.cpp ${S}/place.cpp
+ mv ${S}/Place.h ${S}/place.h
+}
More information about the Openembedded-commits
mailing list