summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/include/default-providers.inc
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-03-23 14:52:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-28 15:55:48 +0100
commit25a04eed02096076c25f6edd390b3d1a6daff51c (patch)
tree5503f103af54544b08d282bce0fd93d134b12a08 /meta/conf/distro/include/default-providers.inc
parentf3a92ff7d3cc772c7875e8fe1a88e51df974318c (diff)
downloadpoky-25a04eed02096076c25f6edd390b3d1a6daff51c.tar.gz
make, remake: make them properly exclude each other
Remake and make can't be installed at the same time as they're both installing a header file with the same name. (From OE-Core rev: e8747ff4c2b5830c5fa76f4c6b872da4a7d6a586) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include/default-providers.inc')
-rw-r--r--meta/conf/distro/include/default-providers.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index ba85c78906..5801b67f35 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -15,6 +15,8 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
15PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" 15PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
16PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" 16PREFERRED_PROVIDER_virtual/base-utils ?= "busybox"
17PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" 17PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
18PREFERRED_PROVIDER_virtual/make ?= "make"
19PREFERRED_PROVIDER_virtual/make-native ?= "make-native"
18 20
19# 21#
20# Default virtual runtime providers 22# Default virtual runtime providers
@@ -43,7 +45,6 @@ PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
43PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" 45PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
44PREFERRED_PROVIDER_console-tools ?= "kbd" 46PREFERRED_PROVIDER_console-tools ?= "kbd"
45PREFERRED_PROVIDER_gzip-native ?= "pigz-native" 47PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
46PREFERRED_PROVIDER_make ?= "make"
47PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" 48PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
48# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details 49# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
49# on this rather strange entry. 50# on this rather strange entry.