[oe-commits] org.oe.dev merge of '416609d94012a3c6bcceb5665830fd720e6cbc0c'
rpurdie commit
openembedded-commits at lists.openembedded.org
Mon Jan 28 21:08:49 UTC 2008
merge of '416609d94012a3c6bcceb5665830fd720e6cbc0c'
and '88b6d0d5b0e5836a9bbf16311ac747bf25d751d6'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d13e860cc99eb6e7165589bb5b3efcdc273ae032
ViewMTN: http://monotone.openembedded.org/revision/info/d13e860cc99eb6e7165589bb5b3efcdc273ae032
Files:
1
conf/distro/maemo-1.0.conf
packages/dbus/dbus
packages/dbus/dbus/0.23.1.diff
packages/dbus/dbus/config.diff
packages/dbus/dbus/cross.patch
packages/dbus/dbus/dbus-1.init
packages/dbus/dbus/dbus-monitor.patch
packages/dbus/dbus/dbus-quiesce-startup-errors.patch
packages/dbus/dbus/dbussend.patch
packages/dbus/dbus/gettext.patch
packages/dbus/dbus/no-bindings.patch
packages/dbus/dbus/no-examples.patch
packages/dbus/dbus/no-introspect.patch
packages/dbus/dbus/no-static.patch
packages/dbus/dbus/spawn-priority.diff
packages/dbus/dbus/tmpdir.patch
packages/dbus/dbus/tools.diff
packages/dbus/dbus-1.0.1
packages/dbus/dbus-1.0.1/cross.patch
packages/dbus/dbus-1.0.1/dbus-1.init
packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
packages/dbus/dbus-1.0.1/fix-install-daemon.patch
packages/dbus/dbus-glib-native
packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch
packages/dbus/dbus_1.0.1.bb
packages/dbus/dbus-native_1.0.1.bb
packages/dbus/dbus-native_1.0.2.bb
packages/dbus/dbus-native_1.1.1.bb
packages/dbus/dbus-native_1.1.4.bb
packages/dbus/dbus-1.0.2/tmpdir.patch
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.2.bb
packages/dbus/dbus_1.1.4.bb
conf/distro/chinook-compat.conf
Diffs:
#
# mt diff -r416609d94012a3c6bcceb5665830fd720e6cbc0c -rd13e860cc99eb6e7165589bb5b3efcdc273ae032
#
#
#
# delete "conf/distro/maemo-1.0.conf"
#
# delete "packages/dbus/dbus"
#
# delete "packages/dbus/dbus/0.23.1.diff"
#
# delete "packages/dbus/dbus/config.diff"
#
# delete "packages/dbus/dbus/cross.patch"
#
# delete "packages/dbus/dbus/dbus-1.init"
#
# delete "packages/dbus/dbus/dbus-monitor.patch"
#
# delete "packages/dbus/dbus/dbus-quiesce-startup-errors.patch"
#
# delete "packages/dbus/dbus/dbussend.patch"
#
# delete "packages/dbus/dbus/gettext.patch"
#
# delete "packages/dbus/dbus/no-bindings.patch"
#
# delete "packages/dbus/dbus/no-examples.patch"
#
# delete "packages/dbus/dbus/no-introspect.patch"
#
# delete "packages/dbus/dbus/no-static.patch"
#
# delete "packages/dbus/dbus/spawn-priority.diff"
#
# delete "packages/dbus/dbus/tmpdir.patch"
#
# delete "packages/dbus/dbus/tools.diff"
#
# delete "packages/dbus/dbus-1.0.1"
#
# delete "packages/dbus/dbus-1.0.1/cross.patch"
#
# delete "packages/dbus/dbus-1.0.1/dbus-1.init"
#
# delete "packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch"
#
# delete "packages/dbus/dbus-1.0.1/fix-install-daemon.patch"
#
# delete "packages/dbus/dbus-glib-native"
#
# delete "packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch"
#
# delete "packages/dbus/dbus_1.0.1.bb"
#
# rename "packages/dbus/dbus-native_1.0.1.bb"
# to "packages/dbus/dbus-native_1.0.2.bb"
#
# rename "packages/dbus/dbus-native_1.1.1.bb"
# to "packages/dbus/dbus-native_1.1.4.bb"
#
# add_file "packages/dbus/dbus-1.0.2/tmpdir.patch"
# content [074f93acba96cb165a3d21cac74b5fdfaae98fc8]
#
# patch "packages/dbus/dbus-native_1.0.2.bb"
# from [9ed9b4ac98d99e64ae880b961efde6c208c66951]
# to [fbff414912569dc50e61b109e28f9f86ec259886]
#
# patch "packages/dbus/dbus-native_1.1.4.bb"
# from [6b8c402959c6434e289e34eae91e9e615a2ddf77]
# to [bbd25f9e7c9b77b2605b0107cbe8ef0396dee219]
#
# patch "packages/dbus/dbus.inc"
# from [fcd0cd4dfa3ffd03a9285bb1e358d9664c80653b]
# to [1717c90534e2933d03ed1b58cd4066b09bfef92d]
#
# patch "packages/dbus/dbus_1.0.2.bb"
# from [189ca0f0d84af77a57900ff46ff779ec64e27b24]
# to [ae8eb57b8c2a17376e8e93257afc69060cc6a3fd]
#
# patch "packages/dbus/dbus_1.1.4.bb"
# from [2620cb738271995a8ec1c4b28c0200f14fe16a34]
# to [a941688e3a8621769a37bb46e79d4f2d5764966a]
#
============================================================
--- packages/dbus/dbus-1.0.2/tmpdir.patch 074f93acba96cb165a3d21cac74b5fdfaae98fc8
+++ packages/dbus/dbus-1.0.2/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.0.1.bb 9ed9b4ac98d99e64ae880b961efde6c208c66951
+++ packages/dbus/dbus-native_1.0.2.bb fbff414912569dc50e61b109e28f9f86ec259886
@@ -1,27 +1,19 @@
-DESCRIPTION = "Message bus system for applications to talk to one another"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-SECTION = "base"
+require dbus.inc
+DEFAULT_PREFERENCE = "1"
-PR = "r0"
+inherit native
DEPENDS = "glib-2.0-native libxml2-native expat-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
+SRC_URI = "\
+ http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ file://tmpdir.patch;patch=1 \
+ file://dbus-1.init \
+"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.1"
-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-qt --disable-qt3 --disable-gtk --disable-tests \
- --disable-checks --disable-xml-docs --disable-doxygen-docs \
- --with-xml=expat --without-x"
-
-do_stage () {
+do_stage() {
oe_runmake install
autotools_stage_all
@@ -29,3 +21,8 @@ do_stage () {
install -d ${STAGING_DATADIR}/dbus
install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
}
+
+do_install() {
+ :
+}
+
============================================================
--- packages/dbus/dbus-native_1.1.1.bb 6b8c402959c6434e289e34eae91e9e615a2ddf77
+++ packages/dbus/dbus-native_1.1.4.bb bbd25f9e7c9b77b2605b0107cbe8ef0396dee219
@@ -1,27 +1,17 @@
-DESCRIPTION = "message bus system for applications to talk to one another"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-SECTION = "base"
+require dbus.inc
+inherit native
-PR = "r0"
-
DEPENDS = "glib-2.0-native libxml2-native expat-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
-DEFAULT_PREFERENCE = "-1"
+SRC_URI = "\
+ http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ file://tmpdir.patch;patch=1 \
+ file://dbus-1.init \
+"
-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 () {
+do_stage() {
oe_runmake install
autotools_stage_all
@@ -29,3 +19,7 @@ do_stage () {
install -d ${STAGING_DATADIR}/dbus
install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
}
+
+do_install() {
+ :
+}
============================================================
--- packages/dbus/dbus.inc fcd0cd4dfa3ffd03a9285bb1e358d9664c80653b
+++ packages/dbus/dbus.inc 1717c90534e2933d03ed1b58cd4066b09bfef92d
@@ -1,16 +1,18 @@
-SECTION = "base"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+HOMEPAGE = "http://dbus.freedesktop.org"
DESCRIPTION = "Message bus system for applications to talk to one another"
LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl"
DEFAULT_PREFERENCE = "-1"
-SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
- file://cross.patch;patch=1 \
- file://tmpdir.patch;patch=1 \
- file://dbus-1.init \
- "
+SRC_URI = "\
+ http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ file://tmpdir.patch;patch=1 \
+ file://fix-install-daemon.patch;patch=1 \
+ file://dbus-1.init \
+"
+S = "${WORKDIR}/dbus-${PV}"
inherit autotools pkgconfig update-rc.d gettext
@@ -51,7 +53,7 @@ EXTRA_OECONF = "--disable-qt --disable-q
--with-xml=expat --without-x"
-do_stage () {
+do_stage() {
oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
autotools_stage_includes
@@ -60,8 +62,7 @@ do_stage () {
install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
}
-do_install_append () {
+do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
}
-
============================================================
--- packages/dbus/dbus_1.0.2.bb 189ca0f0d84af77a57900ff46ff779ec64e27b24
+++ packages/dbus/dbus_1.0.2.bb ae8eb57b8c2a17376e8e93257afc69060cc6a3fd
@@ -1,14 +1,6 @@ require dbus.inc
require dbus.inc
-
DEFAULT_PREFERENCE = "1"
PR = "r9"
-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"
-
-
============================================================
--- packages/dbus/dbus_1.1.4.bb 2620cb738271995a8ec1c4b28c0200f14fe16a34
+++ packages/dbus/dbus_1.1.4.bb a941688e3a8621769a37bb46e79d4f2d5764966a
@@ -1,10 +1,3 @@ PR = "r0"
include dbus.inc
PR = "r0"
-
-SRC_URI += "file://fix-install-daemon.patch;patch=1"
-
-python populate_packages_prepend () {
- if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
- bb.data.setVar('PKG_dbus', 'dbus-1', d)
-}
#
# mt diff -r88b6d0d5b0e5836a9bbf16311ac747bf25d751d6 -rd13e860cc99eb6e7165589bb5b3efcdc273ae032
#
#
#
# add_file "conf/distro/chinook-compat.conf"
# content [7567172718a5b4eadcd1df5d2f7fa4b65943e7bc]
#
============================================================
--- conf/distro/chinook-compat.conf 7567172718a5b4eadcd1df5d2f7fa4b65943e7bc
+++ conf/distro/chinook-compat.conf 7567172718a5b4eadcd1df5d2f7fa4b65943e7bc
@@ -0,0 +1,166 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Chinook-compatible
+#@--------------------------------------------------------------------
+
+DISTRO = "chinook-compat"
+DISTRO_NAME = "Chinook-compat"
+DISTRO_VERSION = "test-${DATE}"
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+require conf/distro/include/angstrom-glibc.inc
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1"
+
+INHERIT += "package_deb debian"
+TARGET_OS = "linux-gnueabi"
+
+TARGET_FPU_nokia770 = "soft"
+TARGET_FPU_nokia800 = "hard"
+
+DPKG_ARCH_nokia770 = "armel"
+DPKG_ARCH_nokia800 = "armel"
+
+FEED_ARCH_nokia770 = "armv5te"
+
+# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
+# armv6 yet.
+FEED_ARCH_nokia800 = "armv5te"
+#FEED_ARCH_nokia800 = "armv6"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+
+# NPTL stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header"
+
+PREFERRED_VERSION_automake-native = "1.9.6"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+
+# Use recent enough version of the headers to let HAL build successfully.
+PREFERRED_VERSION_linux-libc-headers = "2.6.20"
+
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+PREFERRED_VERSION_glibc-initial = "2.5"
+
+PREFERRED_VERSION_libtool = "1.5.6"
+
+require conf/distro/include/sane-srcrevs.inc
+
+PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_VERSION_freetype = "2.2.1"
+PREFERRED_VERSION_freetype-native = "2.2.1"
+PREFERRED_VERSION_cairo = "1.4.10"
+PREFERRED_VERSION_glib-2.0 = "2.12.12"
+PREFERRED_VERSION_pango = "1.16.4"
+PREFERRED_VERSION_atk = "1.18.0"
+PREFERRED_VERSION_gtk+ = "2.10.14"
+
+PREFERRED_VERSION_gnome-vfs = "2.16"
+# 3.9.1 would be correct
+PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2"
+# 2.6.27 would be correct
+PREFERRED_VERSION_libxml = "2.6.29"
+# 2.16 would be correct
+PREFERRED_VERSION_gconf = "2.6.1"
+
+# gstreamer
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gstreamer = "0.10.14"
+PREFERRED_VERSION_gst-plugins-good = "0.10.6"
+# 0.10.13 would be correct (+ maemo patches)
+PREFERRED_VERSION_gst-plugins-base = "0.10.14"
+# 0.11.3 would be correct ( + maemo patches)
+PREFERRED_VERSION_gst-ffmpeg = "0.10.2"
+
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+# This is a hack to avoid building mesa which crashes the compiler
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
+PREFERRED_VERSION_libxrandr = "1.2.1"
+PREFERRED_VERSION_xrandr = "1.2.0"
+PREFERRED_VERSION_randrproto = "1.2.1"
+
+PREFERRED_VERSION_libgnomeui = "2.18.1"
+
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm = "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm = "gtk+"
+
+PREFERRED_PROVIDER_gconf = "gconf"
+
+PREFERRED_VERSION_pixman = "0.9.6"
+
+PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
+PREFERRED_PROVIDER_avahi = "avahi"
+
+# Prevent chosing jikes-native (until java bootstrap patch is merged).
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
+
+PREFERRED_VERSION_libsoup = "2.2.7"
+PREFERRED_VERSION_libglade = "2.4.2"
+PREFERRED_VERSION_gnutls = "1.4.5"
+PREFERRED_VERSION_libgpg-error = "1.0"
+PREFERRED_VERSION_libgcrypt = "1.2.3"
+
+PREFERRED_VERSION_gpe-scap = "1.3"
+
+# Does not compile with the CodeSourcery compiler .. :(
+PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
+PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
+
+# WARNING: If you change these values after the respective package has
+# been built the change will have no effect. Edit the package's file in
+# ${STAGING}/pkgdata/runtime then.
+PKG_ncurses = "libncurses5"
+PKG_ncurses-tools = "ncurses-bin"
+PKG_ncurses-terminfo = "ncurses-base"
+
+PKG_gtk+ = "libgtk2.0-0"
+PKG_pango = "libpango1.0-0"
+PKG_atk = "libatk1.0-0"
+PKG_glib-2.0 = "libglib2.0-0"
+PKG_gconf = "libgconf2-6"
+DEBIANNAME_dbus_pn-dbus = "dbus"
+PKG_hildon-1 = "libhildon1"
+
+PKG_zlib = "zlib1g"
+PKG_libglade = "libglade2-0"
+PKG_libsoup = "libsoup2.2-8"
More information about the Openembedded-commits
mailing list