From 3a0e1b7d3c986647e2eb6cb4d2bb1f92610673a1 Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Sun, 19 Dec 2010 12:35:35 +0200 Subject: [PATCH] jlime-2010.1.conf: Fix bluez issues, slight restructuring. Added bluez-libs and bluez-utils to ANGSTROM_BLACKLIST as per the angstrom-2010 distro file. Added DISTRO_BLUETOOTH_MANAGER, copied from the angstom-2010 distro file. This should fix all issues related to bluez when compiling images for jlime. Moved some definitions from Binutils & Compiler to General Userspace as its supposed to be. Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- conf/distro/jlime-2010.1.conf | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 28c1ddadcf..f6dfc33850 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -55,15 +55,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_virtual/libusb0 = "libusb" -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" -PREFERRED_PROVIDER_virtual/gtk+ = "gtk+" -PREFERRED_PROVIDER_gconf = "gconf" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static" -PREFERRED_PROVIDER_bluez-libs = "bluez-libs" # # Target OS & FPU system @@ -104,4 +95,17 @@ XSERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse # General Userspace # PREFERRED_PROVIDER_virtual/psplash = "psplash" +PREFERRED_PROVIDER_virtual/libusb0 = "libusb" +PREFERRED_PROVIDER_virtual/db = "db" +PREFERRED_PROVIDER_virtual/db-native = "db-native" +PREFERRED_PROVIDER_virtual/gtk+ = "gtk+" +PREFERRED_PROVIDER_gconf = "gconf" +PREFERRED_PROVIDER_avahi = "avahi" +PREFERRED_PROVIDER_gtk+ = "gtk+" +PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static" + +ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" +ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" +DISTRO_BLUETOOTH_MANAGER = "blueprobe bluez4" + require conf/distro/include/preferred-opie-versions-1.2.4.inc -- 2.39.5