Commit Graph

25 Commits

Author SHA1 Message Date
Martin Jansa 7f070ca4f1 ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
* ltp installs 2 different runtests_noltp.sh files from different
  directories into /opt/ltp/testcases/bin/runtests_noltp.sh
  last one installed wins and causes unexpected changes in
  buildhistory's files-in-image.txt report, rename them to have
  unique name as other ltp scripts have.

* also define PREFERRED_PROVIDER to resolve note shown when
  building with meta-oe layer:
  NOTE: multiple providers are available for ltp (ltp, ltp-ddt)
  NOTE: consider defining a PREFERRED_PROVIDER entry to match ltp

* use patch generated without -M
  in my builds both versions worked, but Saul reported that it fails to
  apply with:
  Applying patch
  0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
  patch: **** Only garbage was found in the patch input.

  Now I've see the same issue on different builder (with Ubuntu 12.04).

  (From OE-Core master rev: ec3bb2c2203b2e8bafc1a631f623f858779e20b7)

(From OE-Core rev: 198623d80d31f19c963e61d03cbcb12dd318dfdf)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-24 12:48:39 +00:00
Ross Burton 442be3ef60 mesa: add virtual/mesa provider
As there are two alternative mesa recipes (mesa and mesa-gl), there needs to be
a virtual provider that recipes that explicitly need Mesa (such as xserver-xorg)
can depend on.

(From OE-Core rev: 4a407568472d3c87cd2ce11baf199568249640b6)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17 20:48:09 +01:00
Cristian Iorga 747f5bee1b default-providers: Set the preferred provider for bluez
There is a need for a default provider for bluez
now that bluez5 recipe is also present.

After the introduction of bluez5 recipe,
the following warnings are displayed:

"NOTE: multiple providers are available for runtime libasound-module-bluez (bluez4, bluez5)
 NOTE: consider defining a PREFERRED_PROVIDER entry to match libasound-module-bluez"

Upon debug, bitbake shows:
DEBUG: checking PREFERRED_PROVIDER_bluez4 (value None) against ['bluez4', 'bluez5']
DEBUG: checking PREFERRED_PROVIDER_bluez4-4.101 (value None) against ['bluez4', 'bluez5']
DEBUG: checking PREFERRED_PROVIDER_bluez4-4.101-r5 (value None) against ['bluez4', 'bluez5']
DEBUG: checking PREFERRED_PROVIDER_bluez5 (value None) against ['bluez4', 'bluez5']
DEBUG: checking PREFERRED_PROVIDER_bluez5-5.7 (value None) against ['bluez4', 'bluez5']
DEBUG: checking PREFERRED_PROVIDER_bluez5-5.7-r0 (value None) against ['bluez4', 'bluez5']

Bitbake is faced with the question "what should provide libasound-module-bluez?"
which is a runtime name. It needs to try and find a PREFERRED_PROVIDER entry
which matches this but those use *build time* naming. So it converts "libasound-module-bluez"
into the canonical ${PN} of bluez4 and bluez5 and then tries to look those up.
What it actually should do is go one step further of mapping bluez4/bluez5
into the virtual/bluez but that does not happen.

Bug opened on this issue: YB5044
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5044

[YOCTO #5030]

(From OE-Core rev: 6f07d066074b1e01ff3c16408812e6b6d5e531ac)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-23 16:20:14 +01:00
Martin Jansa 969f4edcf9 qemu, default-providers: Add mesa as default virtual/egl
* it's safer to select it consistently with virtual/libgl* providers

(From OE-Core rev: d9321da1bf01175a9e3721607df31055e3765bc6)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-16 11:14:33 +01:00
Andreas Müller 69aaafe5ef remove gtk-update-icon-cache-native virtuals
gtk-update-icon-cache-native is the only provider now

(From OE-Core rev: 7e437aa3e0ec862aac69a4434be0b2b652d26972)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-02 18:11:06 +01:00
Ross Burton e92dfa1157 default-providers: change udev selection logic
Change the logic so that the udev provider is the standalone udev, unless the
systemd DISTRO_FEATURE is set.  The previous logic was designed to fail if both
sysvinit and systemd were enabled, which we're supporting now.

(From OE-Core rev: f5d018a769fa297efa629cbbf6e42a49173faa8b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-26 22:43:03 +00:00
Laurentiu Palcu e66deb0156 mesa: rename mesa-dri recipe to just mesa
Rename mesa-dri recipes to just mesa. Also, replace all references to
mesa-dri in all recipes/configs.

The reason for this renaming (quote from bugzilla):

"mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore.
mesa-dri should be renamed to mesa."

[YOCTO #3385]

(From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22 17:07:16 +00:00
Ross Burton f07515096e default-providers: add default virtual provider for gtk-update-icon-cache
Use a virtual provider instead of a hard dependency so that if gtk+-native is
required in some configuration, this provider can be changed and then
gtk+-native and gtk-update-icon-cache-native won't be both built and conflict in
the sysroot.

(From OE-Core rev: 73c5458c7f041157832123696814b02df2b55090)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-05 13:14:54 +00:00
Mark Hatle 59e15f6712 update-alternatives: Add a build-time dependency
We need to add a build time dependency on virtual/update-alternatives,
however we can't just do DEPENDS +=, or we end up with various problems.  To
work around this, in the anonymous python space we ensure we only do the
addition when the package does not provide virtual/update-alternatives and
it is a target package.

Also the system wide PREFERRED_PROVIDER was incorrect.  It references a
runtime package, and not the recipe it should have.  This has been corrected.

[YOCTO #3691]

(From OE-Core rev: 56a59ef12936dcc6464cf1d43dda6957a5aa8c65)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Tested-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20 13:06:43 +00:00
Radu Moisan b1add7cd1e default-providers: Add systemd option to PREFERRED_PROVIDER_udev
(From OE-Core rev: fb8e5285bbc6d5aac5d4103c0a983b7b6c54d73d)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20 12:58:55 +00:00
Radu Moisan 4c8b2ddbec default-providers: Automatically set PREFERRED_PROVIDER_udev
This is a more generic way to set preferred provider for udev.
We expect to have multiple choices once we integrate other init
managers, and this way we can automatically set it considering
distro settings.

(From OE-Core rev: da13562af73d144b5782ee8d755e2249cd9d2d8c)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
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
Ross Burton 2d234fbe3f default-providers: add default provider for make
remake PROVIDES make, so we need a default provider.

(From OE-Core rev: 9af884d433d18582b14977eb340cfdfa4801e7fe)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:09 +00:00
Ross Burton 003c45755d default-providers: default to libx11, not -trim
(From OE-Core rev: 8b0a1ce417feea5f58fc08f54025343c7c7ff892)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:49 +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
Damien Lespiau 3ea5c742c8 core: Prefer mesa-dri as virtual/libopengles1/2 provider
Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's
prefer the accelerated version.

(From OE-Core rev: 9f83d93c65942f9ed1b25a24976f92ae06c425c8)

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>
2012-08-19 10:45:57 +01:00
Richard Purdie 99b1c63964 default-providers: Set pigz-native as the default provider for gzip-native
(From OE-Core rev: 56cbae8500284af309759099a75b35379a5f962c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19 14:37:46 +00:00
Saul Wold 0de413782e default-providers: add kbd as PREFERRED_PROVIDER for console-tools
kbd is used a primary provider for console-tools

(From OE-Core rev: 9a88125c546e6bcbec683eb736e232236c38a4f9)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-01 15:07:44 +00:00
Martin Jansa adb3ed29db task-base: rename VIRTUAL-RUNTIME-alsa-state to use underscore
* in http://lists.linuxtogo.org/pipermail/openembedded-core/2012-January/016226.html
  we talked about
  VIRTUAL-RUNTIME_alsa-state, but
  VIRTUAL-RUNTIME-alsa-state was used instead, which is inconsistent with other VIRTUAL-RUNTIME vars

(From OE-Core rev: d5b892467023d77d219ae05170c875f7b423aa78)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-19 14:34:34 +00:00
Joshua Lock b6b909abd8 task-base: add VIRTUAL-RUNTIME_alsa-state to task-base-alsa
Define this to be the alsa-state package by default. This enables automatic
configuration setting and restoration on systems with alsa.

(From OE-Core rev: a70cc15b4b053ff01229010e55b37ed4487b8f3a)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-17 14:53:25 +00:00
Joshua Lock 79b6192d21 task-base: move default definition of VIRTUAL-RUNTIME_apm
This belongs in default-providers.conf

(From OE-Core rev: afff4e6130e835048d81f65f703e118d5944629a)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-17 14:53:24 +00:00
Joshua Lock d4d29f7e58 gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
The D-Bus backend has been integrated into upstream GConf so we can
switch to upstream and drop gconf-dbus.

I've gone for a release in the 3.2 series as we disable Gtk+, and
therefore are not impacted by the gtk+3 changes, and the D-Bus backend
was unstable before this release.

(From OE-Core rev: f952b1bc8a4f307e2e2f3941f50becd72d88421d)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:37:11 +00:00
Martin Jansa d1e278e080 default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
* to match default virtual/xserver

(From OE-Core rev: 55904c8a4f84e6ef9c51735e3a0139c45c1dc8d1)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-24 17:27:18 +01:00
Dmitry Eremin-Solenikov f60b6507e0 default-provider: also define a default provider for gconf-native
(From OE-Core rev: 1fdd82124834245f58680a44bdaacd1a264230b0)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-17 14:10:41 +01:00
Martin Jansa c09f0eb561 xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
* xserver-xorg is closer to upstream naming and
  that's how it's named in OE-classic and meta-oe? It would make meta-oe
  transition easier and better to do it now then convert meta-oe to
  xserver-xf86 and then rename it back later.

(From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:31 +01:00
Richard Purdie bc367526f8 Add files missing from previous change
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-11 23:47:06 +01:00