As this recipe's ptest support is merely a shim to pull in dbus-test-ptest it
doesn't inherit ptest. This means that PTEST_ENABLED isn't ever set, so check
DISTRO_FEATURES directly.
(From OE-Core rev: 7ee1da8126f1d4957e533cc26696e85c5a6de4bb)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need use EXTRA_OECONF_append_class-native rather than
EXTRA_OECONF_class-native.
(From OE-Core rev: 5e1560b98680c79c979b8f9325f9f9997f9fd438)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Found this error on CentOS 5.10, other distros may also has this
problem, I think that we can disable the selinux for dbus-native:
bus/selinux.c:327: error: array type has incomplete element type
[YOCTO #6374]
(From OE-Core rev: 7a2d2d81d8694806060f7bccfbdba42dc356d477)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
on rebuilds, dbus-native can detect an already existing dbus-glib and
tries to link some tests against it. As files were unstaged and due
to libtool insanities this fails with:
| /usr/bin/grep: .../sysroots/x86_64-oe-linux/usr/lib/libdbus-1.la: No such file or directory
| sed: can't read .../sysroots/x86_64-oe-linux/usr/lib/libdbus-1.la: No such file or directory
| x86_64-oe-linux-libtool: link: `.../sysroots/x86_64-oe-linux/usr/lib/libdbus-1.la' is not a valid libtool archive
| make[3]: *** [libdbus-testutils.la] Error 1
| make[3]: Leaving directory `.../work/x86_64-oe-linux/dbus-native/1.8.2-r0/build/test'
Make builds predicatable (and working) by disabling usage of dbus-glib
explicitly.
(From OE-Core rev: 0eeeb40d2af99448c3b94047f26d33a9983a221b)
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade dbus to 1.8.2.
Modify ptest suite to make it enabled on new version.
If systemd in DISTRO_FEATURES, we expect to install dbus systemd
unit files.
Remove unneeded patches since it's included in new version.
Remove unrecognized option: "--with-xml"
[YOCTO #6092]
(From OE-Core rev: 596470547451084944082cbed50351ad0d912255)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some classes of recipe disable ptest even though its in DISTRO_FEATURES
(e.g. nativesdk). We shouldn't attempt to build ptest packages when
its disabled. This replaces some DISTRO_FEATURE checks with PTEST_ENABLED
checks instead.
(From OE-Core rev: 8b14fcc62f31bbbb231790136cdb984db96d9ba9)
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>
If image contains dbus and ptest is in DISTRO_FEATURES, dbus-ptest package
is installed, regardless of whether ptest-pkgs is in IMAGE_FEATURES. This
issue will increase size for most small images.
This patch fixes this problem.
[YOCTO #5702]
(From OE-Core rev: 0416583f014138656babdf78a574357ae5ff25bd)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
BitBake has the exact same code as oe.utils.contains so there's no
reason to duplicate it. We now rely on the bb.utils.contains code for
metadata.
(From OE-Core rev: 93499ebc46547f5bf6dcecd5a786ead9f726de28)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Once send_negotiate_unix_fd failed, this failure will happen, since
auth->guid_from_server has been set to some value before
send_negotiate_unix_fd. send_negotiate_unix_fd failure will lead to
this auth be handled by process_ok again, but this auth->guid_from_server
is not zero.
(From OE-Core rev: 6e844594e7dd901eb4742730ab010030c04e1c55)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
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>
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>
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>
/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>
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>
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>
Followed suggestions from Bugz 2261:
2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature.
This makes the build dependencies reflect the feature list.
3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency
is now back in dbus where is belongs.
4) make dbus provide dbus-x11, for compatibility.
Fixes [Yocto #2261]
(From OE-Core rev: c02364f36e228835ea5d7fd4e1d347fd451f8544)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This empty directory generates a QA warning of unshippped files/dirs.
(From OE-Core rev: d3573ae136c532d3cf537ef05c22f163275f4f41)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With current permissions of 4754 on systemd systems various services will fail to
activate with "helpful" error messages of the type:
2000-01-01T00:00:25+00:00 omap3-multi dbus[178]: [system] Activated service
'org.freedesktop.nm_dispatcher' failed: Failed to execute program
/usr/libexec/dbus-daemon-launch-helper: Success
(From OE-Core rev: 7b1e227bf28c9d4f3bb16af4d9ac21265e88a3f1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* 46e6c3fa8034b12d178d605f3f5d7efe69671a13 changed do_install
which now fails for nativesdk (chown messagebus leads to no
such user)
* tested by building meta-toolchain-qte and running the generated
sdk
(From OE-Core rev: 5818a885df489f4bc9579d17c6b0efa7777f5ccc)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need to do this as we don't want bitbake to expand the variable
but use the shell variable instead.
(From OE-Core rev: 509a8a9ea428debf3ff2115fcff0aa89d0239ced)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We already install an appropriate init script to /etc/init.d, we do not
need an additional one in /etc/init.d/rc.d as well.
(From OE-Core rev: 48dfa47b0e65ad1207c6ae81ba495ef2e39134aa)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move creation of required user/groups to useradd class thus allowing
use with read-only filesystems and booting the initial boot.
(From OE-Core rev: 46e6c3fa8034b12d178d605f3f5d7efe69671a13)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ross Burton
Robert Yang
Enrico Scholz
Chong Lu
Richard Purdie
Otavio Salvador
Jonathan Liu
Roy Li
Chen Qi
Phil Blundell
Dominik Holland
Paul Eggleton
Jackie Huang
Cristian Iorga
Martin Jansa
Björn Stenberg
Marko Lindqvist
Phil Blundell
Radu Moisan
Andreas Müller
Andrei Gherzan
Steve Sakoman
Eric Bénard
Saul Wold