dbus: upgrade to 1.6.18

Drop PR and INC_PR.

Move patches into a non-versioned directory, and update dbus-ptest to match.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

10 files changed, 5 insertions, 9 deletions

diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb
index 84ed287cb2..6dab75157a 100644
--- a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
+++ b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb
@@ -22,7 +22,7 @@ SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630"
 SRC_URI[sha256sum] = "1f3d6f4a53a7121328f6cd685fc14440d72e6c0006ecb3312cc779c495915e86"
 
 S="${WORKDIR}/dbus-${PV}"
-FILESPATH = "${FILE_DIRNAME}/dbus-${PV}"
+FILESPATH = "${FILE_DIRNAME}/dbus"
 
 inherit autotools pkgconfig gettext ptest
 
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5b99034bf4..343079ccdf 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -13,8 +13,6 @@ RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest'
 RDEPENDS_dbus_class-native = ""
 RDEPENDS_dbus_class-nativesdk = ""
 
-INC_PR = "r6"
-
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://tmpdir.patch; \
            file://dbus-1.init \
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init b/meta/recipes-core/dbus/dbus/dbus-1.init
index 42c86297c3..42c86297c3 100644
--- a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus/dbus-1.init
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/os-test.patch b/meta/recipes-core/dbus/dbus/os-test.patch
index 79554b1ee1..79554b1ee1 100644
--- a/meta/recipes-core/dbus/dbus-1.6.10/os-test.patch
+++ b/meta/recipes-core/dbus/dbus/os-test.patch
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/ptest.patch b/meta/recipes-core/dbus/dbus/ptest.patch
index 263d17eff7..263d17eff7 100644
--- a/meta/recipes-core/dbus/dbus-1.6.10/ptest.patch
+++ b/meta/recipes-core/dbus/dbus/ptest.patch
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch
index 294400247e..294400247e 100644
--- a/meta/recipes-core/dbus/dbus-1.6.10/python-config.patch
+++ b/meta/recipes-core/dbus/dbus/python-config.patch
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest
index e08ecb1a63..e08ecb1a63 100755
--- a/meta/recipes-core/dbus/dbus-1.6.10/run-ptest
+++ b/meta/recipes-core/dbus/dbus/run-ptest
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/tmpdir.patch b/meta/recipes-core/dbus/dbus/tmpdir.patch
index bf086e1788..bf086e1788 100644
--- a/meta/recipes-core/dbus/dbus-1.6.10/tmpdir.patch
+++ b/meta/recipes-core/dbus/dbus/tmpdir.patch
diff --git a/meta/recipes-core/dbus/dbus_1.6.10.bb b/meta/recipes-core/dbus/dbus_1.6.10.bb
deleted file mode 100644
index 5b8220c8ff..0000000000
--- a/meta/recipes-core/dbus/dbus_1.6.10.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include dbus.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630"
-SRC_URI[sha256sum] = "1f3d6f4a53a7121328f6cd685fc14440d72e6c0006ecb3312cc779c495915e86"
diff --git a/meta/recipes-core/dbus/dbus_1.6.18.bb b/meta/recipes-core/dbus/dbus_1.6.18.bb
new file mode 100644
index 0000000000..7270c36f95
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus_1.6.18.bb
@@ -0,0 +1,4 @@
+include dbus.inc
+
+SRC_URI[md5sum] = "b02e9c95027a416987b81f9893831061"
+SRC_URI[sha256sum] = "7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd"