summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/dbus/dbus-1.0.2/cross.patch (renamed from meta/packages/dbus/dbus-1.0.1/cross.patch)0
-rw-r--r--meta/packages/dbus/dbus-1.0.2/dbus-1.init (renamed from meta/packages/dbus/dbus-1.0.1/dbus-1.init)0
-rw-r--r--meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch (renamed from meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch)0
-rw-r--r--meta/packages/dbus/dbus-native_1.0.2.bb (renamed from meta/packages/dbus/dbus-native_1.0.1.bb)2
-rw-r--r--meta/packages/dbus/dbus_1.0.2.bb (renamed from meta/packages/dbus/dbus_1.0.1.bb)0
6 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index b8af874b05..d12565b7bc 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -143,8 +143,8 @@ PREFERRED_VERSION_cairo ?= "1.2.4"
143PREFERRED_VERSION_pango ?= "1.10.2" 143PREFERRED_VERSION_pango ?= "1.10.2"
144PREFERRED_VERSION_gtk+ ?= "2.6.10" 144PREFERRED_VERSION_gtk+ ?= "2.6.10"
145 145
146PREFERRED_VERSION_dbus ?= "1.0.1" 146PREFERRED_VERSION_dbus ?= "1.0.2"
147PREFERRED_VERSION_dbus-native ?= "1.0.1" 147PREFERRED_VERSION_dbus-native ?= "1.0.2"
148PREFERRED_VERSION_dbus-glib ?= "0.72" 148PREFERRED_VERSION_dbus-glib ?= "0.72"
149PREFERRED_VERSION_dbus-glib-native ?= "0.72" 149PREFERRED_VERSION_dbus-glib-native ?= "0.72"
150PREFERRED_VERSION_gnome-vfs ?= "2.16.3" 150PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
diff --git a/meta/packages/dbus/dbus-1.0.1/cross.patch b/meta/packages/dbus/dbus-1.0.2/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/meta/packages/dbus/dbus-1.0.1/cross.patch
+++ b/meta/packages/dbus/dbus-1.0.2/cross.patch
diff --git a/meta/packages/dbus/dbus-1.0.1/dbus-1.init b/meta/packages/dbus/dbus-1.0.2/dbus-1.init
index 38e7574ad5..38e7574ad5 100644
--- a/meta/packages/dbus/dbus-1.0.1/dbus-1.init
+++ b/meta/packages/dbus/dbus-1.0.2/dbus-1.init
diff --git a/meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
index c31786357d..c31786357d 100644
--- a/meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch
+++ b/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
diff --git a/meta/packages/dbus/dbus-native_1.0.1.bb b/meta/packages/dbus/dbus-native_1.0.2.bb
index 1176a56ef6..72e2190f78 100644
--- a/meta/packages/dbus/dbus-native_1.0.1.bb
+++ b/meta/packages/dbus/dbus-native_1.0.2.bb
@@ -9,7 +9,7 @@ DEPENDS = "glib-2.0-native libxml2-native expat-native"
9 9
10DEFAULT_PREFERENCE = "-1" 10DEFAULT_PREFERENCE = "-1"
11 11
12FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.1" 12FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
14 file://cross.patch;patch=1 \ 14 file://cross.patch;patch=1 \
15 " 15 "
diff --git a/meta/packages/dbus/dbus_1.0.1.bb b/meta/packages/dbus/dbus_1.0.2.bb
index 0fafa28d12..0fafa28d12 100644
--- a/meta/packages/dbus/dbus_1.0.1.bb
+++ b/meta/packages/dbus/dbus_1.0.2.bb