diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-23 14:52:04 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:55:48 +0100 |
| commit | 25a04eed02096076c25f6edd390b3d1a6daff51c (patch) | |
| tree | 5503f103af54544b08d282bce0fd93d134b12a08 /meta/conf | |
| parent | f3a92ff7d3cc772c7875e8fe1a88e51df974318c (diff) | |
| download | poky-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')
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 3 |
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" | |||
| 15 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" | 15 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" |
| 16 | PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" | 16 | PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" |
| 17 | PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" | 17 | PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" |
| 18 | PREFERRED_PROVIDER_virtual/make ?= "make" | ||
| 19 | PREFERRED_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" | |||
| 43 | PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" | 45 | PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" |
| 44 | PREFERRED_PROVIDER_console-tools ?= "kbd" | 46 | PREFERRED_PROVIDER_console-tools ?= "kbd" |
| 45 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" | 47 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" |
| 46 | PREFERRED_PROVIDER_make ?= "make" | ||
| 47 | PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" | 48 | PREFERRED_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. |