summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/dbus/dbus-1.0.3/cross.patch (renamed from meta/packages/dbus/dbus-1.0.2/cross.patch)0
-rw-r--r--meta/packages/dbus/dbus-1.0.3/dbus-1.init (renamed from meta/packages/dbus/dbus-1.0.2/dbus-1.init)0
-rw-r--r--meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch (renamed from meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch)0
-rw-r--r--meta/packages/dbus/dbus-1.0.3/tmpdir.patch (renamed from meta/packages/dbus/dbus-1.0.2/tmpdir.patch)0
-rw-r--r--meta/packages/dbus/dbus-native_1.0.3.bb (renamed from meta/packages/dbus/dbus-native_1.0.2.bb)2
-rw-r--r--meta/packages/dbus/dbus_1.0.3.bb (renamed from meta/packages/dbus/dbus_1.0.2.bb)0
7 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index e94e835d4..15d065ef9 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -206,8 +206,8 @@ PREFERRED_VERSION_cairo ?= "1.4.14"
PREFERRED_VERSION_pango ?= "1.18.3"
PREFERRED_VERSION_gtk+ ?= "2.12.7"
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-native ?= "1.0.2"
+PREFERRED_VERSION_dbus ?= "1.0.3"
+PREFERRED_VERSION_dbus-native ?= "1.0.3"
PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
PREFERRED_VERSION_gnome-vfs ?= "2.20.0"
diff --git a/meta/packages/dbus/dbus-1.0.2/cross.patch b/meta/packages/dbus/dbus-1.0.3/cross.patch
index 268a3ae3d..268a3ae3d 100644
--- a/meta/packages/dbus/dbus-1.0.2/cross.patch
+++ b/meta/packages/dbus/dbus-1.0.3/cross.patch
diff --git a/meta/packages/dbus/dbus-1.0.2/dbus-1.init b/meta/packages/dbus/dbus-1.0.3/dbus-1.init
index 0725083c6..0725083c6 100644
--- a/meta/packages/dbus/dbus-1.0.2/dbus-1.init
+++ b/meta/packages/dbus/dbus-1.0.3/dbus-1.init
diff --git a/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
index c31786357..c31786357 100644
--- a/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
+++ b/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
diff --git a/meta/packages/dbus/dbus-1.0.2/tmpdir.patch b/meta/packages/dbus/dbus-1.0.3/tmpdir.patch
index 838b903f0..838b903f0 100644
--- a/meta/packages/dbus/dbus-1.0.2/tmpdir.patch
+++ b/meta/packages/dbus/dbus-1.0.3/tmpdir.patch
diff --git a/meta/packages/dbus/dbus-native_1.0.2.bb b/meta/packages/dbus/dbus-native_1.0.3.bb
index 72e2190f7..55889a1a8 100644
--- a/meta/packages/dbus/dbus-native_1.0.2.bb
+++ b/meta/packages/dbus/dbus-native_1.0.3.bb
@@ -9,7 +9,7 @@ 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"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \
"
diff --git a/meta/packages/dbus/dbus_1.0.2.bb b/meta/packages/dbus/dbus_1.0.3.bb
index 4ccc80723..4ccc80723 100644
--- a/meta/packages/dbus/dbus_1.0.2.bb
+++ b/meta/packages/dbus/dbus_1.0.3.bb