From bee8ba766b16d2a7ac7885747b51f08d34bd633d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 29 Jul 2015 11:33:45 +0800 Subject: dbus: upgrade to 1.8.20 Signed-off-by: Chen Qi Signed-off-by: Ross Burton --- meta/recipes-core/dbus/dbus-test_1.8.18.bb | 61 ------------------------------ meta/recipes-core/dbus/dbus-test_1.8.20.bb | 61 ++++++++++++++++++++++++++++++ meta/recipes-core/dbus/dbus_1.8.18.bb | 4 -- meta/recipes-core/dbus/dbus_1.8.20.bb | 4 ++ 4 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus-test_1.8.18.bb create mode 100644 meta/recipes-core/dbus/dbus-test_1.8.20.bb delete mode 100644 meta/recipes-core/dbus/dbus_1.8.18.bb create mode 100644 meta/recipes-core/dbus/dbus_1.8.20.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/dbus/dbus-test_1.8.18.bb b/meta/recipes-core/dbus/dbus-test_1.8.18.bb deleted file mode 100644 index e138f6e594..0000000000 --- a/meta/recipes-core/dbus/dbus-test_1.8.18.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "D-Bus test package (for D-bus functionality testing only)" -HOMEPAGE = "http://dbus.freedesktop.org" -SECTION = "base" -LICENSE = "AFL-2 | GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ - file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" - -DEPENDS = "python-pygobject dbus dbus-glib" - -RDEPENDS_${PN} += "make" -RDEPENDS_${PN}-dev = "" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ - file://tmpdir.patch \ - file://dbus-1.init \ - file://run-ptest \ - file://python-config.patch \ - file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ - " - -SRC_URI[md5sum] = "83e607e9ccb1c921d5b6bbea2376a36c" -SRC_URI[sha256sum] = "36f2eb9c777a3c71562573da36a147e900a642afcd44d2b0470d992a4898c4f2" - -S="${WORKDIR}/dbus-${PV}" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" - -inherit autotools pkgconfig gettext ptest - -EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" -EXTRA_OECONF_X_class-native = "--without-x" - -EXTRA_OECONF = "--enable-tests \ - --enable-modular-tests \ - --enable-installed-tests \ - --enable-checks \ - --enable-asserts \ - --enable-verbose-mode \ - --disable-xml-docs \ - --disable-doxygen-docs \ - --disable-libaudit \ - --disable-systemd \ - --without-systemdsystemunitdir \ - --with-dbus-test-dir=${PTEST_PATH} \ - ${EXTRA_OECONF_X}" - -do_install() { - : -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - case1="shell printf refs syslog" - for i in ${case1}; do install ${B}/test/test-$i ${D}${PTEST_PATH}/test; done - case2="marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay" - for i in ${case2}; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done - case3="bus bus-system bus-launch-helper" - for i in ${case3}; do install ${B}/bus/test-$i ${D}${PTEST_PATH}/test; done - install ${B}/dbus/test-dbus ${D}${PTEST_PATH}/test - cp -r ${B}/test/data ${D}${PTEST_PATH}/test -} -RDEPENDS_${PN}-ptest += "bash" diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.8.20.bb new file mode 100644 index 0000000000..704070bf20 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-test_1.8.20.bb @@ -0,0 +1,61 @@ +SUMMARY = "D-Bus test package (for D-bus functionality testing only)" +HOMEPAGE = "http://dbus.freedesktop.org" +SECTION = "base" +LICENSE = "AFL-2 | GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ + file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" + +DEPENDS = "python-pygobject dbus dbus-glib" + +RDEPENDS_${PN} += "make" +RDEPENDS_${PN}-dev = "" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://tmpdir.patch \ + file://dbus-1.init \ + file://run-ptest \ + file://python-config.patch \ + file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ + " + +SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" +SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" + +S="${WORKDIR}/dbus-${PV}" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" + +inherit autotools pkgconfig gettext ptest + +EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" +EXTRA_OECONF_X_class-native = "--without-x" + +EXTRA_OECONF = "--enable-tests \ + --enable-modular-tests \ + --enable-installed-tests \ + --enable-checks \ + --enable-asserts \ + --enable-verbose-mode \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --disable-libaudit \ + --disable-systemd \ + --without-systemdsystemunitdir \ + --with-dbus-test-dir=${PTEST_PATH} \ + ${EXTRA_OECONF_X}" + +do_install() { + : +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + case1="shell printf refs syslog" + for i in ${case1}; do install ${B}/test/test-$i ${D}${PTEST_PATH}/test; done + case2="marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay" + for i in ${case2}; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done + case3="bus bus-system bus-launch-helper" + for i in ${case3}; do install ${B}/bus/test-$i ${D}${PTEST_PATH}/test; done + install ${B}/dbus/test-dbus ${D}${PTEST_PATH}/test + cp -r ${B}/test/data ${D}${PTEST_PATH}/test +} +RDEPENDS_${PN}-ptest += "bash" diff --git a/meta/recipes-core/dbus/dbus_1.8.18.bb b/meta/recipes-core/dbus/dbus_1.8.18.bb deleted file mode 100644 index 2932b7a099..0000000000 --- a/meta/recipes-core/dbus/dbus_1.8.18.bb +++ /dev/null @@ -1,4 +0,0 @@ -include dbus.inc - -SRC_URI[md5sum] = "83e607e9ccb1c921d5b6bbea2376a36c" -SRC_URI[sha256sum] = "36f2eb9c777a3c71562573da36a147e900a642afcd44d2b0470d992a4898c4f2" diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.8.20.bb new file mode 100644 index 0000000000..a8f2094ea6 --- /dev/null +++ b/meta/recipes-core/dbus/dbus_1.8.20.bb @@ -0,0 +1,4 @@ +include dbus.inc + +SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" +SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" -- cgit v1.2.3