summaryrefslogtreecommitdiffstats
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-26 22:49:37 +0000
commite8747ff4c2b5830c5fa76f4c6b872da4a7d6a586 (patch)
treeb8b5fa2a2d8053640acbdb6c33309b6312ea1f19
parent826bc56e77bd9a53f6bc19548549f6d92de09911 (diff)
downloadopenembedded-core-contrib-e8747ff4c2b5830c5fa76f4c6b872da4a7d6a586.tar.gz
openembedded-core-contrib-e8747ff4c2b5830c5fa76f4c6b872da4a7d6a586.tar.bz2
openembedded-core-contrib-e8747ff4c2b5830c5fa76f4c6b872da4a7d6a586.zip
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. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/default-providers.inc3
-rw-r--r--meta/recipes-devtools/make/make.inc2
-rw-r--r--meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb2
3 files changed, 5 insertions, 2 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"
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.
diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc
index 57ea605b97..849b74299c 100644
--- a/meta/recipes-devtools/make/make.inc
+++ b/meta/recipes-devtools/make/make.inc
@@ -8,3 +8,5 @@ SECTION = "devel"
SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2"
inherit autotools gettext pkgconfig texinfo
+
+PROVIDES = "virtual/make"
diff --git a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
index 30f29e04ea..8eab7e3a0d 100644
--- a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
+++ b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
@@ -15,7 +15,7 @@ DEPENDS += "readline guile"
# By default only "gettext-minimal-native" is added
# when inherit gettext.
DEPENDS_class-native += "gettext-native"
-PROVIDES += "make"
+PROVIDES += "virtual/make"
do_configure_prepend() {
# remove the default LINGUAS since we are not going to generate languages