[oe-commits] org.oe.dev make DISTRO = "sharprom-compatible" (sort of) work again

[mickeyl commit]

make DISTRO = "sharprom-compatible" (sort of) work again
no, I don't know why I am doing this... probably being too nice...

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: dd230f1511e357183e0d179a16d60af7265a8cf1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dd230f1511e357183e0d179a16d60af7265a8cf1
Files:
1
conf/distro/sharprom-compatible.conf
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
Diffs:

#
# mt diff -r250d4a39926b718ca465f2b7a332c92952b6a591 -rdd230f1511e357183e0d179a16d60af7265a8cf1
#
# 
# 
# patch "conf/distro/sharprom-compatible.conf"
#  from [cde510bf3cfa541d60146f1257d1fb796814a006]
#    to [c8405d4a0cf5a0f35a606622eaad2b54c9303290]
# 
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
#  from [b52c75f7521294f05c457e70691cd8a3a4199f8a]
#    to [b417bc1f779cea7455b571ada79a452dc8219ce2]
# 
============================================================
--- conf/distro/sharprom-compatible.conf	cde510bf3cfa541d60146f1257d1fb796814a006
+++ conf/distro/sharprom-compatible.conf	c8405d4a0cf5a0f35a606622eaad2b54c9303290
@@ -1,11 +1,11 @@
 #@TYPE: Distribution
 #@NAME: SharpROM
 #@DESCRIPTION: Distribution configuration for SharpROM (Zaurus) compatible packages
-#@MENTOR: Michael 'Mickey' Lauer <mickey at 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,18 +23,18 @@ 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"
+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"
 
-DEPENDS =+ "sharprom-toolchain-native"
-
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 #INHIBIT_PACKAGE_STRIP = "1"
 
============================================================
--- packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb	b52c75f7521294f05c457e70691cd8a3a4199f8a
+++ packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb	b417bc1f779cea7455b571ada79a452dc8219ce2
@@ -1,11 +1,21 @@ SECTION = "base"
 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'