diff options
Diffstat (limited to 'poky/meta/recipes-core/dbus')
| -rw-r--r-- | poky/meta/recipes-core/dbus/dbus-glib_0.108.bb | 4 | ||||
| -rw-r--r-- | poky/meta/recipes-core/dbus/dbus-glib_0.110.bb (renamed from poky/meta/recipes-core/dbus/dbus-glib.inc) | 6 | ||||
| -rw-r--r-- | poky/meta/recipes-core/dbus/dbus-test_1.12.10.bb (renamed from poky/meta/recipes-core/dbus/dbus-test_1.12.2.bb) | 5 | ||||
| -rwxr-xr-x | poky/meta/recipes-core/dbus/dbus/run-ptest | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-core/dbus/dbus_1.12.10.bb (renamed from poky/meta/recipes-core/dbus/dbus_1.12.2.bb) | 17 |
5 files changed, 13 insertions, 21 deletions
diff --git a/poky/meta/recipes-core/dbus/dbus-glib_0.108.bb b/poky/meta/recipes-core/dbus/dbus-glib_0.108.bb deleted file mode 100644 index 7a9a69e1e..000000000 --- a/poky/meta/recipes-core/dbus/dbus-glib_0.108.bb +++ /dev/null @@ -1,4 +0,0 @@ -require dbus-glib.inc - -SRC_URI[md5sum] = "a66a613705870752ca9786e0359aea97" -SRC_URI[sha256sum] = "9f340c7e2352e9cdf113893ca77ca9075d9f8d5e81476bf2bf361099383c602c" diff --git a/poky/meta/recipes-core/dbus/dbus-glib.inc b/poky/meta/recipes-core/dbus/dbus-glib_0.110.bb index 55f710f85..b7383bd2a 100644 --- a/poky/meta/recipes-core/dbus/dbus-glib.inc +++ b/poky/meta/recipes-core/dbus/dbus-glib_0.110.bb @@ -14,6 +14,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz file://no-examples.patch \ file://test-install-makefile.patch \ " +SRC_URI[md5sum] = "d7cebf1d69445cbd28b4983392145192" +SRC_URI[sha256sum] = "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" inherit autotools pkgconfig gettext bash-completion gtk-doc @@ -22,9 +24,7 @@ inherit autotools pkgconfig gettext bash-completion gtk-doc PACKAGECONFIG ??= "" PACKAGECONFIG[tests] = "--enable-tests,,," -EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \ - --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" -EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" +EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" PACKAGES += "${PN}-tests" diff --git a/poky/meta/recipes-core/dbus/dbus-test_1.12.2.bb b/poky/meta/recipes-core/dbus/dbus-test_1.12.10.bb index dce047a13..25b939512 100644 --- a/poky/meta/recipes-core/dbus/dbus-test_1.12.2.bb +++ b/poky/meta/recipes-core/dbus/dbus-test_1.12.10.bb @@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" -SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88" +SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef" +SRC_URI[sha256sum] = "4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" @@ -75,6 +75,7 @@ do_install_ptest() { sed -i \ -e 's:${B}:${PTEST_PATH}:g' \ {} + + sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest } RDEPENDS_${PN}-ptest += "bash" diff --git a/poky/meta/recipes-core/dbus/dbus/run-ptest b/poky/meta/recipes-core/dbus/dbus/run-ptest index 8a8970ee2..353ba1e90 100755 --- a/poky/meta/recipes-core/dbus/dbus/run-ptest +++ b/poky/meta/recipes-core/dbus/dbus/run-ptest @@ -12,7 +12,7 @@ output() { export DBUS_TEST_HOMEDIR=./test export XDG_RUNTIME_DIR=./test -export LD_LIBRARY_PATH=/usr/lib/dbus-test/ptest/test/.libs +export LD_LIBRARY_PATH=@PTEST_PATH@/test/.libs files=`ls test/test-*` diff --git a/poky/meta/recipes-core/dbus/dbus_1.12.2.bb b/poky/meta/recipes-core/dbus/dbus_1.12.10.bb index fb5b69aa4..d71f7f704 100644 --- a/poky/meta/recipes-core/dbus/dbus_1.12.2.bb +++ b/poky/meta/recipes-core/dbus/dbus_1.12.10.bb @@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" -SRC_URI[sha256sum] = "272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88" +SRC_URI[md5sum] = "c3e12b4206e2a7da39d7cc42567790ef" +SRC_URI[sha256sum] = "4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7" inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even @@ -102,7 +102,10 @@ EXTRA_OECONF = "--disable-tests \ EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" EXTRA_OECONF_append_class-native = " --disable-selinux" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ + user-session \ + " + PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" @@ -153,14 +156,6 @@ do_install() { do_install_class-native() { autotools_do_install - # for dbus-glib-native introspection generation - install -d ${D}${STAGING_DATADIR_NATIVE}/dbus/ - # N.B. is below install actually required? - install -m 0644 bus/session.conf ${D}${STAGING_DATADIR_NATIVE}/dbus/session.conf - - # dbus-glib-native and dbus-glib need this xml file - ./bus/dbus-daemon --introspect > ${D}${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml - # dbus-launch has no X support so lets not install it in case the host # has a more featured and useful version rm -f ${D}${bindir}/dbus-launch |
