From 9d2eaa5da879cc873ddd6f0ea3d26f9419b69395 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 17 Apr 2011 12:41:41 +0200
Subject: [PATCH] angstrom-core-tweaks: prefer libx11 over libx11-trim

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 conf/distro/include/angstrom-core-tweaks.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conf/distro/include/angstrom-core-tweaks.inc b/conf/distro/include/angstrom-core-tweaks.inc
index f788390..701eadc 100644
--- a/conf/distro/include/angstrom-core-tweaks.inc
+++ b/conf/distro/include/angstrom-core-tweaks.inc
@@ -1,5 +1,10 @@
 # This include is to import changes from OE that are hard to overlay into core
 
+# Providers
+
+# Prefer the one from meta-oe over the one in oe-core
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+
 # bitbake.conf stuff:
 
 TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/bin/${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"