From 25a04eed02096076c25f6edd390b3d1a6daff51c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 23 Mar 2016 14:52:04 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-providers.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/conf') 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" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" +PREFERRED_PROVIDER_virtual/make ?= "make" +PREFERRED_PROVIDER_virtual/make-native ?= "make-native" # # Default virtual runtime providers @@ -43,7 +45,6 @@ PREFERRED_PROVIDER_opkg-native ?= "opkg-native" PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" -PREFERRED_PROVIDER_make ?= "make" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details # on this rather strange entry. -- cgit v1.2.3-54-g00ecf