mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
dbus: update 1.14.10 -> 1.16.0
Convert from autotools to meson. Drop tmpdir.patch (replaced by -Dtest_socket_dir=/tmp --Dsession_socket_dir=/tmp). License-Update: license texts split into separate files, SPDX ids added. (From OE-Core rev: b0241aa9b1ecc38be1ca016f36075552a2eba48a) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
Richard Purdie
parent
ad002798cc
commit
5b6c0bfbf5
|
|
@ -1,44 +0,0 @@
|
|||
From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Thu, 23 Jun 2011 13:52:09 +0200
|
||||
Subject: [PATCH] buildsys: hardcode socketdir to /tmp
|
||||
|
||||
the TMPDIR env var isn't always pointing to the right target path
|
||||
|
||||
Upstream-Status: Inappropriate [embedded]
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
|
||||
Original comment:
|
||||
|
||||
avoid to check tmp dir at build time. instead uses hard coded /tmp here
|
||||
comment added by Kevin Tian <kevin.tian@intel.com>
|
||||
---
|
||||
configure.ac | 11 +----------
|
||||
1 files changed, 1 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 408054b..6d26180 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY)
|
||||
AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY",
|
||||
[Full path to the launch helper test program in the builddir])
|
||||
|
||||
-#### Find socket directories
|
||||
-if ! test -z "$TMPDIR" ; then
|
||||
- DEFAULT_SOCKET_DIR=$TMPDIR
|
||||
-elif ! test -z "$TEMP" ; then
|
||||
- DEFAULT_SOCKET_DIR=$TEMP
|
||||
-elif ! test -z "$TMP" ; then
|
||||
- DEFAULT_SOCKET_DIR=$TMP
|
||||
-else
|
||||
- DEFAULT_SOCKET_DIR=/tmp
|
||||
-fi
|
||||
+DEFAULT_SOCKET_DIR=/tmp
|
||||
|
||||
DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'`
|
||||
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
|
|
@ -3,43 +3,44 @@ DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to t
|
|||
HOMEPAGE = "https://dbus.freedesktop.org"
|
||||
SECTION = "base"
|
||||
|
||||
inherit autotools pkgconfig gettext upstream-version-is-even ptest-gnome
|
||||
inherit meson pkgconfig gettext upstream-version-is-even ptest-gnome
|
||||
|
||||
LICENSE = "AFL-2.1 | GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6423dcd74d7be9715b0db247fd889da3 \
|
||||
file://dbus/dbus.h;beginline=6;endline=20;md5=866739837ccd835350af94dccd6457d8 \
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=eb0ffc69a965797a3d6686baa153ef05 \
|
||||
file://dbus/dbus.h;beginline=6;endline=22;md5=df4251a6c6e15e6a9e3c77b2ac30065d \
|
||||
"
|
||||
|
||||
SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \
|
||||
file://run-ptest \
|
||||
file://tmpdir.patch \
|
||||
file://dbus-1.init \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f"
|
||||
SRC_URI[sha256sum] = "9f8ca5eb51cbe09951aec8624b86c292990ae2428b41b856e2bed17ec65c8849"
|
||||
|
||||
EXTRA_OECONF = "--disable-xml-docs \
|
||||
--disable-doxygen-docs \
|
||||
--enable-largefile \
|
||||
--with-system-socket=/run/dbus/system_bus_socket \
|
||||
--enable-modular-tests \
|
||||
--enable-checks \
|
||||
--runstatedir=/run \
|
||||
EXTRA_OEMESON = "-Dxml_docs=disabled \
|
||||
-Ddoxygen_docs=disabled \
|
||||
-Dsystem_socket=/run/dbus/system_bus_socket \
|
||||
-Dmodular_tests=enabled \
|
||||
-Dchecks=true \
|
||||
-Druntime_dir=${runtimedir} \
|
||||
-Dtest_socket_dir=/tmp \
|
||||
-Dsession_socket_dir=/tmp \
|
||||
"
|
||||
EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
|
||||
user-session \
|
||||
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG:class-native = ""
|
||||
PACKAGECONFIG:class-nativesdk = ""
|
||||
|
||||
PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd"
|
||||
PACKAGECONFIG[x11] = "--enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
|
||||
PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session"
|
||||
PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,,"
|
||||
PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit"
|
||||
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
|
||||
PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd_system_unitdir=${systemd_system_unitdir},-Dsystemd=disabled,systemd"
|
||||
PACKAGECONFIG[x11] = "-Dx11_autolaunch=enabled,-Dx11_autolaunch=disabled, virtual/libx11 libsm"
|
||||
PACKAGECONFIG[user-session] = "-Duser_session=true -Dsystemd_user_unitdir=${systemd_user_unitdir},-Duser_session=false"
|
||||
PACKAGECONFIG[verbose-mode] = "-Dverbose_mode=true,-Dverbose_mode=false,,"
|
||||
PACKAGECONFIG[audit] = "-Dlibaudit=enabled,-Dlibaudit=disabled,audit"
|
||||
PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux"
|
||||
PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
|
||||
|
||||
DEPENDS = "expat virtual/libintl autoconf-archive-native glib-2.0"
|
||||
RDEPENDS:${PN} += "${PN}-common ${PN}-tools"
|
||||
|
|
@ -124,9 +125,7 @@ pkg_postinst:dbus() {
|
|||
}
|
||||
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
|
||||
do_install:append:class-target() {
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
sed 's:@bindir@:${bindir}:' < ${UNPACKDIR}/dbus-1.init > ${S}/dbus-1.init.sh
|
||||
|
|
@ -159,27 +158,23 @@ do_install() {
|
|||
# Remove empty testexec directory as we don't build tests
|
||||
rm -rf ${D}${libdir}/dbus-1.0/test
|
||||
|
||||
# Remove /var/run as it is created on startup
|
||||
rm -rf ${D}${localstatedir}/run
|
||||
# Remove /run as it is created on startup
|
||||
rm -rf ${D}${runtimedir}
|
||||
}
|
||||
|
||||
do_install:class-native() {
|
||||
autotools_do_install
|
||||
|
||||
do_install:append:class-native() {
|
||||
# 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
|
||||
}
|
||||
|
||||
do_install:class-nativesdk() {
|
||||
autotools_do_install
|
||||
|
||||
do_install:append:class-nativesdk() {
|
||||
# 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
|
||||
|
||||
# Remove /var/run to avoid QA error
|
||||
rm -rf ${D}${localstatedir}/run
|
||||
# Remove /run to avoid QA error
|
||||
rm -rf ${D}${runtimedir}
|
||||
}
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user