From 0289a1c325eea881ce3d68def5262f9e763d4fd2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 18 Dec 2013 16:20:04 +0000 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- .../dbus/{dbus-ptest_1.6.10.bb => dbus-ptest_1.6.18.bb} | 2 +- meta/recipes-core/dbus/dbus.inc | 2 -- meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/dbus-1.init | 0 meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/os-test.patch | 0 meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/ptest.patch | 0 .../dbus/{dbus-1.6.10 => dbus}/python-config.patch | 0 meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/run-ptest | 0 meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/tmpdir.patch | 0 meta/recipes-core/dbus/dbus_1.6.10.bb | 6 ------ meta/recipes-core/dbus/dbus_1.6.18.bb | 4 ++++ 10 files changed, 5 insertions(+), 9 deletions(-) rename meta/recipes-core/dbus/{dbus-ptest_1.6.10.bb => dbus-ptest_1.6.18.bb} (97%) rename meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/dbus-1.init (100%) rename meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/os-test.patch (100%) rename meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/ptest.patch (100%) rename meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/python-config.patch (100%) rename meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/run-ptest (100%) rename meta/recipes-core/dbus/{dbus-1.6.10 => dbus}/tmpdir.patch (100%) delete mode 100644 meta/recipes-core/dbus/dbus_1.6.10.bb create mode 100644 meta/recipes-core/dbus/dbus_1.6.18.bb diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb similarity index 97% rename from meta/recipes-core/dbus/dbus-ptest_1.6.10.bb rename to 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 similarity index 100% rename from meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init rename to 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 similarity index 100% rename from meta/recipes-core/dbus/dbus-1.6.10/os-test.patch rename to 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 similarity index 100% rename from meta/recipes-core/dbus/dbus-1.6.10/ptest.patch rename to 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 similarity index 100% rename from meta/recipes-core/dbus/dbus-1.6.10/python-config.patch rename to 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 similarity index 100% rename from meta/recipes-core/dbus/dbus-1.6.10/run-ptest rename to 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 similarity index 100% rename from meta/recipes-core/dbus/dbus-1.6.10/tmpdir.patch rename to 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" -- 2.40.1