If the image is built with both systemd and sysvinit there'll be a dbus-1 init
script and a dbus service. This means systemd can try and launch both, which
won't work.
There's a systemctl mask to stop this in systemd-compat-units, but the logical
place for it to be is in the dbus recipe so it can't be left out of an image.
(From OE-Core rev: c910aa17689077362a25938aeebee7fb24057e30)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of manually adding initscripts to RDEPENDS of each package,
we should make it automatically handled by the update-rc.d.bbclass.
This solution would have the benefit of backward compatibility. In
other words, users need not modify their recipes.
This reverts commit 16080a3485.
(From OE-Core rev: f9f193219bd510160b6b09bae652a9dc8ea01e7b)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Explicitly disable systemd support so that it isn't a floating dependency and
libsystemd-login doesn't become a runtime dependency on non-systemd images.
Also don't bother setting the systemd unit directory as we're not installing
anything.
(From OE-Core rev: 4f5d00b551e2ee6056ebfc8365a05a5ca8e5d651)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Now that the initscripts-functions has been packaged separately,
packages which may use the functions script should have a runtime
dependency on it.
(From OE-Core rev: 6690c12cb1977f6bf93f3eb6d471dbd7db81bf28)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We were disabling API entry point sanity checking which should only be done if
the performance gain is prefereable to correctness. Instead don't disable
checks explicitly as the default is enabled, allowing distributions to append
--disable-checks if required.
(From OE-Core rev: 079975e456abe9e76bde3f2866ffe50f2610345f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of several variables and overrides, use PACKAGECONFIG to respect X11 and
systemd DISTRO_FEATURES.
(From OE-Core rev: 963da99c77ad28bd184a4de59af9cbcfaef62358)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.
(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The upgrade changed the checksums for dbus but not dbus-ptest. This
patch corrects that.
(From OE-Core rev: 9e56856a15d80bf57b8a4fe54508141da46581f2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop PR and INC_PR.
Move patches into a non-versioned directory, and update dbus-ptest to match.
(From OE-Core rev: 0289a1c325eea881ce3d68def5262f9e763d4fd2)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using the contains function results in more optimal sstate checksums
resulting in better cache reuse as we as more consistent code.
(From OE-Core rev: 9c93526756e7cbbff027c88eb972f877bcb1f057)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I also changed RDEPENDS_class-native to RDEPENDS_dbus_class-native now
(From OE-Core rev: 2678e2ee7ec4de75a9e50a6a0d5f2b7f1b95aee8)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove all PR = "r0" from all .bb files in oe-core. This was done
with the command sed -e '/^PR.*=.*r0\"/d' recipes*/*/*.bb -i
We've switching to the PR server, PR bumps are no longer needed and
this saves people either accidentally bumping them or forgetting to
remove the lines (r0 is the default anyway).
(From OE-Core rev: 58ae94f1b06d0e6234413dbf9869bde85f154c85)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
/etc/init.d/dbus-1 use "set -e" to let the script exit when any command failes.
This will cause "/etc/init.d/dbus-1 status" command can't display messages when dbus is stopped.
(From OE-Core rev: 9844b5e2a544b2c2f76aac497c3a2cdfcc46577c)
Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes the following QA error:
ERROR: QA Issue: nativesdk-dbus: Files/directories were installed but not shipped
/run
/run/dbus
(From OE-Core rev: 796b7510853e71f158ad18dcea4cd1a10c7ef294)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When we enable "ptest", populate_sdk fails with the following error:
# bitbake core-image-minimal -c populate_sdk
..
Collected errors:
* satisfy_dependencies_for: Cannot satisfy the following dependencies
for dbus-ptest-dev:
* dbus-ptest (= 1.6.10-r0) *
* opkg_install_cmd: Cannot install package dbus-ptest-dev.
Disable that dependency.
(From OE-Core rev: a59b7341d136bf8ee4a22c2968ca95dc17be3947)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dbus build tests the build host to detect what initscript
environment it expects. Remove the test and set it to "redhat"
unconditionally as the oe-core initscript has a redhat-style pid file
path.
(From OE-Core rev: 25dc927009252151cc976b13c3f5bd19131cc4e8)
Signed-off-by: Andy Ross <andy.ross@windriver.com
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
/etc/init.d/dbus-1 use "set -e" to let the script exit when any command failes.
This will cause "dbus-1 restart" command can't start dbus when dbus is stopped.
so add --oknodo option to let start-stop-daemon exit with friendly return value.
Then commands will work well.
(From OE-Core rev: 03e745f18f9da22cfba53bb0057bdb0af4a49fca)
Signed-off-by: Song.Li <Song.Li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disable the python module check, as the host python modules are
not needed for generating the target tests.
(From OE-Core rev: 1395a2364aefbe1d19af155e132b6885ec095771)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Install files from EXTRA_DIST needed for some tests.
Add configure parameter with-dbus-test-dir to specify where the test
tools are located.
(From OE-Core rev: 330d594af9f14faf0e5770b6056f4457a033fedd)
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix warnings in multilib build:
WARNING: For recipe lib32-dbus-glib, the following files/directories were installed but not shipped in any package:
WARNING: /usr/share/dbus-glib
WARNING: /usr/share/dbus-glib/tests
(From OE-Core rev: 66224a0fbd4056d954cbf1db3a8b91d06a638b80)
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
/var/run is a tmpfs that is created on startup.
For sysvinit, /var/run/dbus is created by populate-volatiles.sh.
For systemd, /var/run/dbus is created implicitly by dbus.socket when
creating a listen stream socket at /var/run/dbus/system_bus_socket.
(From OE-Core rev: c11ba731fb245683148d0a8485b8c4d73bf94c28)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fixes udev configure in run-postinsts failing with:
update-rc.d: /etc/init.d/dbus-1: file does not exist
because dbus-udev is installed only with sysvinit in features
but update-rc.d was always called from PN postinst
(From OE-Core rev: f15192a65e02026308253e6723b990b24780be5b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dbus-ptest recipe doesn't produce an output package called
dbus-ptest. What we are interested in is actually the dbus-ptest-ptest
package.
(From OE-Core rev: f3c75400d93ab7f22f6de41db4e456d47af2e13b)
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If systemd isn't a distro feature, explicitly disable the systemd unit path
check as otherwise it will search the sysroot.
(From OE-Core rev: 7c39f21cbde23ad678ddf54cb54b7f01e971a325)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This avoid a libx11 dependency for nativesdk as it is not intended to
be run in the toolchain. We also remove the dbus-launch as without x11
support it might case trouble for user
(From OE-Core rev: 2dcb6bf9205a5b2144ccb7f2912bf3e13211ae88)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
dbus-launch from dbus-native has no X support so lets not install it in
case the host has a more featured and useful version. It can interfere
with running X utils with STAGING_BINDIR_NATIVE is in PATH and we don'
use it anywhere.
(From OE-Core rev: adfa83bfa1ccb52b1a5d086aff36fe27271d0e59)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Only configure for systemd if we are using systemd, and remove the dbus-systemd
package by putting the service files into PN itself.
(From OE-Core rev: 06e262c9b4c406b886db6ca8eee55ab441599151)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Replaced incorrect "firstline" with correct "beginline" for telling
where license segment in file begins. Old md5sum was calculated from
the beginning of the file, not from beginning of the license segment.
(From OE-Core rev: 1eb8f569fa084f7f5d284f0bb1110721b9674d9a)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
(From OE-Core rev: 3f5e1d92a53015b44fa4eaf5325ba742a9a854e6)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch adds a new recipe dbus-test to build and package the dbus test
suite. The reason for a separate recipe is that the dbus test suite depends
on dbus-glib, so it cannot be compiled at the same time as dbus.
(From OE-Core rev: 280e79adea4536b264a526072406d605d0822e7d)
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
(From OE-Core rev: 5193485a42dfb3396d0f12aaa7732c5db29d7338)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without --without-x the X11 detection would still go ahead and find the host X11
headers, which seems to cause problems at link time.
(From OE-Core rev: d35d19b6d0844daf8ca8aa059c0aa6077c2f573a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use ${bindir} to locate the binary instead.
(From OE-Core rev: 8cf6f87bd753e1c84a018ddb92a97eed7bd79a28)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.
By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.
(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The PIDFILE (/var/run/dbus/pid) referenced by /etc/init.d/dbus-1 did
not match the path (/var/run/messagebus.pid) configured in
/etc/dbus-1/system.conf, so the initscript could start the daemon, but
not stop it. Also remove needless directory ownership logic
(dbus-daemon drops its pid file as root before calling setuid).
(From OE-Core rev: 23cfbff5611c2ed52eedfaa99b1d6eccd326f035)
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses
builds. This fixes the nativesdk case.
(From OE-Core rev: 09e3ebdb77c090ddc45fed7c6acc1591cd4b3595)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
