dbus: merge .bb and .inc
The split is no longer necessary, and only makes it more complicated to do changes in external layers. (From OE-Core rev: aea82066eb3ba67c1d3a170112ff3bb324b43dfb) Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk> Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d99958a909
commit
e0b6d0c1d6
|
@ -1,170 +0,0 @@
|
|||
SUMMARY = "D-Bus message bus"
|
||||
DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed."
|
||||
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 = "expat virtual/libintl"
|
||||
RDEPENDS_dbus_class-native = ""
|
||||
RDEPENDS_dbus_class-nativesdk = ""
|
||||
PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}"
|
||||
ALLOW_EMPTY_dbus-ptest = "1"
|
||||
RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest"
|
||||
|
||||
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
|
||||
file://tmpdir.patch \
|
||||
file://dbus-1.init \
|
||||
file://os-test.patch \
|
||||
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
|
||||
"
|
||||
|
||||
inherit useradd autotools pkgconfig gettext update-rc.d
|
||||
|
||||
INITSCRIPT_NAME = "dbus-1"
|
||||
INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
|
||||
|
||||
python __anonymous() {
|
||||
if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
|
||||
d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
|
||||
}
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM_${PN} = "-r netdev"
|
||||
USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
|
||||
--no-create-home --shell /bin/false \
|
||||
--user-group messagebus"
|
||||
|
||||
CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
|
||||
|
||||
DEBIANNAME_${PN} = "dbus-1"
|
||||
|
||||
PACKAGES =+ "${PN}-lib"
|
||||
|
||||
OLDPKGNAME = "dbus-x11"
|
||||
OLDPKGNAME_class-nativesdk = ""
|
||||
|
||||
# for compatibility
|
||||
RPROVIDES_${PN} = "${OLDPKGNAME}"
|
||||
RREPLACES_${PN} += "${OLDPKGNAME}"
|
||||
|
||||
FILES_${PN} = "${bindir}/dbus-daemon* \
|
||||
${bindir}/dbus-uuidgen \
|
||||
${bindir}/dbus-cleanup-sockets \
|
||||
${bindir}/dbus-send \
|
||||
${bindir}/dbus-monitor \
|
||||
${bindir}/dbus-launch \
|
||||
${bindir}/dbus-run-session \
|
||||
${libexecdir}/dbus* \
|
||||
${sysconfdir} \
|
||||
${localstatedir} \
|
||||
${datadir}/dbus-1/services \
|
||||
${datadir}/dbus-1/system-services \
|
||||
${systemd_unitdir}/system/"
|
||||
FILES_${PN}-lib = "${libdir}/lib*.so.*"
|
||||
RRECOMMENDS_${PN}-lib = "${PN}"
|
||||
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
|
||||
|
||||
pkg_postinst_dbus() {
|
||||
# If both systemd and sysvinit are enabled, mask the dbus-1 init script
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then
|
||||
if [ -n "$D" ]; then
|
||||
OPTS="--root=$D"
|
||||
fi
|
||||
systemctl $OPTS mask dbus-1.service
|
||||
fi
|
||||
|
||||
if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
|
||||
/etc/init.d/populate-volatile.sh update
|
||||
fi
|
||||
}
|
||||
|
||||
EXTRA_OECONF = "--disable-tests \
|
||||
--disable-xml-docs \
|
||||
--disable-doxygen-docs \
|
||||
--disable-libaudit \
|
||||
--disable-systemd \
|
||||
--without-dbus-glib"
|
||||
|
||||
EXTRA_OECONF_append_class-native = " --disable-selinux"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
|
||||
PACKAGECONFIG_class-native = ""
|
||||
PACKAGECONFIG_class-nativesdk = ""
|
||||
|
||||
# Would like to --enable-systemd but that's a circular build-dependency between
|
||||
# systemd<->dbus
|
||||
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
|
||||
PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh
|
||||
install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1
|
||||
fi
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \
|
||||
install -d ${D}${systemd_unitdir}/system/$i; done
|
||||
install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/
|
||||
cd ${D}${systemd_unitdir}/system/dbus.target.wants/
|
||||
ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket
|
||||
ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket
|
||||
ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service
|
||||
fi
|
||||
|
||||
install -d ${D}${sysconfdir}/default/volatiles
|
||||
echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \
|
||||
> ${D}${sysconfdir}/default/volatiles/99_dbus
|
||||
|
||||
|
||||
mkdir -p ${D}${localstatedir}/lib/dbus
|
||||
|
||||
chown messagebus:messagebus ${D}${localstatedir}/lib/dbus
|
||||
|
||||
chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
|
||||
chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper
|
||||
|
||||
# Remove Red Hat initscript
|
||||
rm -rf ${D}${sysconfdir}/rc.d
|
||||
|
||||
# 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
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
do_install_class-nativesdk() {
|
||||
autotools_do_install
|
||||
|
||||
# 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
|
||||
}
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
INSANE_SKIP_${PN}-ptest += "build-deps"
|
|
@ -1,4 +1,173 @@
|
|||
include dbus.inc
|
||||
SUMMARY = "D-Bus message bus"
|
||||
DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed."
|
||||
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 = "expat virtual/libintl"
|
||||
RDEPENDS_dbus_class-native = ""
|
||||
RDEPENDS_dbus_class-nativesdk = ""
|
||||
PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}"
|
||||
ALLOW_EMPTY_dbus-ptest = "1"
|
||||
RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest"
|
||||
|
||||
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
|
||||
file://tmpdir.patch \
|
||||
file://dbus-1.init \
|
||||
file://os-test.patch \
|
||||
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
|
||||
SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
|
||||
|
||||
inherit useradd autotools pkgconfig gettext update-rc.d
|
||||
|
||||
INITSCRIPT_NAME = "dbus-1"
|
||||
INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
|
||||
|
||||
python __anonymous() {
|
||||
if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
|
||||
d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
|
||||
}
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM_${PN} = "-r netdev"
|
||||
USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
|
||||
--no-create-home --shell /bin/false \
|
||||
--user-group messagebus"
|
||||
|
||||
CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
|
||||
|
||||
DEBIANNAME_${PN} = "dbus-1"
|
||||
|
||||
PACKAGES =+ "${PN}-lib"
|
||||
|
||||
OLDPKGNAME = "dbus-x11"
|
||||
OLDPKGNAME_class-nativesdk = ""
|
||||
|
||||
# for compatibility
|
||||
RPROVIDES_${PN} = "${OLDPKGNAME}"
|
||||
RREPLACES_${PN} += "${OLDPKGNAME}"
|
||||
|
||||
FILES_${PN} = "${bindir}/dbus-daemon* \
|
||||
${bindir}/dbus-uuidgen \
|
||||
${bindir}/dbus-cleanup-sockets \
|
||||
${bindir}/dbus-send \
|
||||
${bindir}/dbus-monitor \
|
||||
${bindir}/dbus-launch \
|
||||
${bindir}/dbus-run-session \
|
||||
${libexecdir}/dbus* \
|
||||
${sysconfdir} \
|
||||
${localstatedir} \
|
||||
${datadir}/dbus-1/services \
|
||||
${datadir}/dbus-1/system-services \
|
||||
${systemd_unitdir}/system/"
|
||||
FILES_${PN}-lib = "${libdir}/lib*.so.*"
|
||||
RRECOMMENDS_${PN}-lib = "${PN}"
|
||||
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
|
||||
|
||||
pkg_postinst_dbus() {
|
||||
# If both systemd and sysvinit are enabled, mask the dbus-1 init script
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then
|
||||
if [ -n "$D" ]; then
|
||||
OPTS="--root=$D"
|
||||
fi
|
||||
systemctl $OPTS mask dbus-1.service
|
||||
fi
|
||||
|
||||
if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
|
||||
/etc/init.d/populate-volatile.sh update
|
||||
fi
|
||||
}
|
||||
|
||||
EXTRA_OECONF = "--disable-tests \
|
||||
--disable-xml-docs \
|
||||
--disable-doxygen-docs \
|
||||
--disable-libaudit \
|
||||
--disable-systemd \
|
||||
--without-dbus-glib"
|
||||
|
||||
EXTRA_OECONF_append_class-native = " --disable-selinux"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
|
||||
PACKAGECONFIG_class-native = ""
|
||||
PACKAGECONFIG_class-nativesdk = ""
|
||||
|
||||
# Would like to --enable-systemd but that's a circular build-dependency between
|
||||
# systemd<->dbus
|
||||
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
|
||||
PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh
|
||||
install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1
|
||||
fi
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \
|
||||
install -d ${D}${systemd_unitdir}/system/$i; done
|
||||
install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/
|
||||
cd ${D}${systemd_unitdir}/system/dbus.target.wants/
|
||||
ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket
|
||||
ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket
|
||||
ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service
|
||||
fi
|
||||
|
||||
install -d ${D}${sysconfdir}/default/volatiles
|
||||
echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \
|
||||
> ${D}${sysconfdir}/default/volatiles/99_dbus
|
||||
|
||||
|
||||
mkdir -p ${D}${localstatedir}/lib/dbus
|
||||
|
||||
chown messagebus:messagebus ${D}${localstatedir}/lib/dbus
|
||||
|
||||
chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
|
||||
chmod 4755 ${D}${libexecdir}/dbus-daemon-launch-helper
|
||||
|
||||
# Remove Red Hat initscript
|
||||
rm -rf ${D}${sysconfdir}/rc.d
|
||||
|
||||
# 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
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
do_install_class-nativesdk() {
|
||||
autotools_do_install
|
||||
|
||||
# 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
|
||||
}
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
INSANE_SKIP_${PN}-ptest += "build-deps"
|
||||
|
|
Loading…
Reference in New Issue