make DISTRO = "sharprom-compatible" (sort of) work again

no, I don't know why I am doing this... probably being too nice...

diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 1395f09..cc5a8e7 100644 (file)
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -1,11 +1,11 @@
 #@TYPE: Distribution
 #@NAME: SharpROM
 #@DESCRIPTION: Distribution configuration for SharpROM (Zaurus) compatible packages
-#@MENTOR: Michael 'Mickey' Lauer <mickey@Vanille.de>
-#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in your PATH.
+#@MENTOR: None
+#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in /usr/local/arm/2.95.3
 #@REQUIREMENTS: Rename arm-linux-gcc|g++ to arm-linux-gcc-2.95 and rename arm-linux-ld to arm-linux-ld-2.11.2.
 
-INHERIT += " package_ipk debian sharprom"
+INHERIT += " package_ipk debian"
 
 #
 # Zaurus
@@ -23,17 +23,17 @@ KERNEL_CONSOLE = "tty1"
 #
 # Base
 #
-DISTRO = "sharprom"
 DISTRO_NAME = "SharpROM"
 DISTRO_VERSION = "3.1 compatible"
 DISTRO_TYPE = "debug"
 
-ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95 binutils-cross gcc-cross-initial gcc-cross"
-ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils virtual/arm-linux-gcc"
-ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial
-ASSUME_PROVIDED += "virtual/libc linux-libc-headers"
-
-DEPENDS =+ "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native" 
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" 
+PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 #INHIBIT_PACKAGE_STRIP = "1"

diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index e60180e..3692f44 100644 (file)
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -1,11 +1,21 @@
 DESCRIPTION = "Precompiled SharpROM toolchain glue package"
 LICENSE = "GPL"
 SECTION = "base"
+PROVIDES = "\
+virtual/arm-linux-gcc-2.95 \
+virtual/arm-linux-libc-for-gcc \
+virtual/arm-linux-binutils \
+virtual/libc \
+virtual/arm-linux-gcc \
+virtual/linux-libc-headers \
+virtual/arm-linux-gcc-initial "
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_sharprom-compatible = "1"
+
 # This needs to be extracted to /usr/local/arm :
 # SRC_URI = "http://handhelds.org/download/projects/toolchain/archive/cross-2.95.3.tar.bz2"
 
 inherit native
-DEPENDS = ""
 
 COMPATIBLE_HOST = 'i.86.*-linux'