Commit Graph

44 Commits

Author SHA1 Message Date
Paul Eggleton 56ea7aca3e dbus: fix QA error building nativesdk-dbus
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>
2013-10-04 18:26:51 +01:00
Jackie Huang c313d60aed dbus: remove build host test in configure script
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>
2013-07-31 06:59:58 +01:00
Cristian Iorga a6c5549ac3 dbus: upgrade to 1.6.10
dbus-ptest also upgraded to 1.6.10
systemd-address.patch removed; included in upstream.

(From OE-Core rev: e516f18d663447954082b5d2df6c1033cb9b4e65)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:37 +01:00
Jonathan Liu 45bf114340 dbus: remove /var/run from package as it is created on startup
/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>
2013-05-24 14:14:47 +01:00
Martin Jansa cb4bba8fb0 dbus: set INHIBIT_UPDATERCD_BBCLASS without sysvinit in features
* 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>
2013-04-04 23:57:20 +01:00
Björn Stenberg 741b8d764c dbus: Depend on dbus-ptest-ptest
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>
2013-03-29 10:40:55 +00:00
Ross Burton c5b6125292 dbus: explicitly disable systemd when no systemd
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>
2013-03-26 22:43:04 +00:00
Ross Burton 9f1c471ed4 dbus: set correct address when using --address=systemd:
Patch taken from upstream 1.7 branch.

(From OE-Core rev: d7b8ae19464a3fe87822376b541b3d6865fe6115)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-28 23:15:48 +00:00
Otavio Salvador 0f8d6f8143 dbus: Drop x11 support from nativesdk
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>
2013-02-19 08:47:36 -08:00
Richard Purdie 20b4dcace2 dbus-native: Don't install dbus-launch
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>
2013-02-08 14:50:38 +00:00
Ross Burton b18886d9b7 dbus: respect systemd distro feature
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>
2013-01-20 12:58:54 +00:00
Marko Lindqvist 06a0d4a025 dbus: fix license segment md5sum boundary
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>
2013-01-16 11:57:37 +00:00
Björn Stenberg 0c7da2f146 Add ptest for dbus.
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>
2012-12-26 11:34:05 +00:00
Robert Yang 5d94d29f55 recipes-core: replace virtclass-native(sdk) with class-native(sdk)
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>
2012-11-02 16:18:27 +00:00
Ross Burton 30b0c3c6f4 dbus: disable all X11 when native
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>
2012-09-27 16:05:09 +01:00
Phil Blundell 6f32c9ce08 dbus: Remove hardcoded reference to /usr in System V startup script
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>
2012-09-24 11:30:33 +01:00
Richard Purdie ad23395cd1 nativesdk: Switch to using nativesdk as a prefix, not a suffix
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>
2012-09-02 05:52:06 -07:00
Richard Purdie 0125438b85 dbus: Ensure dbus-nativesdk doesn't RPROVIDE dbus-x11
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>
2012-08-02 15:28:39 +01:00
Radu Moisan f8d40ab395 dbus: include dbus-launch in the main dbus package
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>
2012-07-31 11:59:06 +01:00
Andreas Müller 4a781306d8 dbus: use systemd_unitdir
(From OE-Core rev: f014feb73cd96c35735811737a80ee8cd1528f61)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-22 16:47:08 +00:00
Andrei Gherzan 762966eaae dbus: Remove empty ${lindir}dbus-1.0/test directory as we don't build tests
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>
2012-02-23 23:59:37 +00:00
Steve Sakoman 2a9e6f32c5 dbus: change permissions of dbus-daemon-launch-helper to 4755
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>
2012-01-10 17:28:44 +00:00
Eric Bénard a9091c9466 dbus: fix install for virtclass-nativesdk
* 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>
2011-11-08 14:13:24 +00:00
Saul Wold 013198b725 dbus: ensure that the useradd shell is set to /bin/false
(From OE-Core rev: 899efe6bf17a31d842ff2f65704d4858892496d4)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-02 08:58:02 +00:00
Richard Purdie 18ab6c98e4 dbus: Ensure localstatedir is added to the package
(From OE-Core rev: dc0d004fd23f686591281eb1d700327ea15d1c54)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-01 17:43:57 +00:00
Richard Purdie ec20f0ed5d dbus: Use $D not ${D} in the postinstall
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>
2011-11-01 17:43:57 +00:00
Paul Eggleton 2113fdf82b dbus: remove unused initscript
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>
2011-10-31 22:03:25 +00:00
Otavio Salvador dbf48baf90 dbus: use useradd class to allow use in read-only filesystems
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>
2011-10-24 17:27:15 +01:00
Phil Blundell 98d201f860 dbus: only use x11 if DISTRO_FEATURES has selected it
This makes it possible to include dbus in a non-X11-equipped DISTRO.

(From OE-Core rev: abf2ab7b4d6e9f615f86ba84e684ae0753c602a8)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:20 +01:00
Richard Purdie c18aa8d065 multilib: Add support for compiling recipes against multiple ABIs
This patch adds the core multilib class which can be used along with a
parameter specifying the mutlilib to use in BBCLASSEXTEND.

The MLPREFIX variable is added and can be used in cases where its too
difficult to dynmaically work out where a mutltilib prefix is needed
to be added to a variable.

This includes:
  * SHLIBSDIR and PACKAGE_ARCH fixes from Lianhao Lu.
  * PACKAGE_DYNAMIC mapping from Yu Ke
  * PACKAGE_INSTALL mapping from Yu Ke
  * RPROVIDES mapping from Yu Ke
  * TARGET_VENDOR fix from Mark Hatle
  * Ignorning *-native-runtime dependnecies as well as *-native from Yu Ke
  * Map PKG and ALLOW_EMPTY from Dongxiao Xu
  * Ensure RCONFLICTS and PKG field dependencies are remapped (from Dongxiao Xu)
  * Ensure PN and MLPREFIX are set at the same time to ensure consistent BPN values (Yu Ke)

(From OE-Core rev: 5d9453049915db48ec4b5972e12287417ebb61a2)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com>
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-27 16:18:40 +01:00
Phil Blundell b3ca61b45f dbus: avoid dependency on x11 for -native build
The native variant already configures --without-x so the X11 libs are
redundant.  Adjust the DEPENDS to match.

(From OE-Core rev: ec49721cb01cef56c9275841bd69b74ac9d5ed73)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-02 14:55:57 +01:00
Koen Kooi 01cfae0d8a dbus 1.4.1: disable sysv script properly when using systemd
OE-core uses 'dbus-1' as initscript name, which no other distribution(-buildsys) does, so we have to take special measures.

(From OE-Core rev: 42ee84c9a8be494943488ebb0bf2048f3abd7abc)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-01 18:34:36 +01:00
Beth Flanagan 62e3f0ff7b License Field Cleanup: Non-standard field names
I've cleaned up some odd license fields, fixed some license
names and corrected some incorrect licenses. LICENSE really needs
a pass through by the maintainers as some of the licensing is
incorrect.

Also, every license with Artistic should be gone through and noted as
which version of Artistic.

(From OE-Core rev: 4786ecdf7cd427089464dcb62579110d494e7cd7)

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 18:27:22 +01:00
Koen Kooi 3faabbf1e8 dbus 1.4.1: create UUIDDIR in postinst
This fixes dbus usage in non-sysV init systems. Volatiles aren't needed in systemd land, since /run is tmpfs and the dbus units take care of all this.

(From OE-Core rev: 4c3490922c3bea5f9c9810bb40dc5f5d8783de5a)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 16:38:52 +01:00
Richard Purdie a57a1db35d dbus: Fix commit typo, I mixed the patch versions up
(From OE-Core rev: b193e2fb163ad697ca136b240b682382f54f1d87)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 00:29:33 +01:00
Koen Kooi eed619c6d3 dbus: clean up dbus-x11 packaging
Martin Jansa spotted some differences with OE dev, which this commit fixes:

 * dbus-launch is mentioned twice in FILES
 * dbus-x11 should drag in dbus-1

(From OE-Core rev: eef8f869dd908e4dbca68b7a20e017c4ee40d626)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 00:27:25 +01:00
Koen Kooi 5168b14018 dbus 1.4.1: enable systemd support, but package systemd files seperately
Systemd support in dbus only affects 'make install', so no changes for sysvinit based systems

(From OE-Core rev: 9281ac4c98d4287a5492f13f94e1bd0eea4791c6)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-26 16:52:00 +01:00
Koen Kooi 8dc48993f3 dbus: split X11 dependant dbus-launch into its own subpackage
This makes dbus usable in non-X enviroments like QT/e

>From the original commit in OE .dev:

commit 8e25448fb01b6fa6ea3a86f9327f080cd753dfbc
Author: John Lee <john_lee@openmoko.org>
Date:   Fri Sep 5 11:37:39 2008 +0000

    dbus: enable x support and put dbus-launch into new package dbus-x11
    * Enable x support only add rdepends to dbus-launch.  Make it a
      seperate package so other packages like dbus does not rdepend on
      libx11.

(From OE-Core rev: aebb9d6599aac683456adf56dc11f8b9f10f25c3)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-26 16:52:00 +01:00
Dongxiao Xu f87603f2b1 dbus: change owner and mode for dbus-daemon-launch-helper in postinst
Add code in dbus postinst to change owner and mode for
dbus-daemon-launch-helper.

[BUGID #603]

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
2011-02-14 12:20:53 +00:00
Paul Eggleton 0e6608ba88 dbus: extend to nativesdk
BBCLASSEXTEND dbus to nativesdk for meta-toolchain-qte, and disable the
dependency on libsm when building in this context (thus avoiding a number of
sub-dependencies).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:19:44 +00:00
Richard Purdie 6702c43f87 dbus: Drop now unneeded DEPENDS on glib-2.0
Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
2011-01-21 13:37:15 +00:00
Qing He 9c0cecbf6a dbus: upgrade to version 1.4.0
from 1.2.24

 - fix-install-daemon is removed since two binaries can be handled
   correctly by Makefile

Signed-off-by: Qing He <qing.he@intel.com>
2010-11-18 13:30:26 -08:00
Mark Hatle fa647b9176 recipes-core: Cleanup package descriptions and summaries
[BUGID #281]

Evaluate and update each package in recipes-core to ensure they have a
consistent summary and description.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-10-11 22:15:10 +01:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00