remove PREFERRED_PROVIDER for libsdl since this is not a distro thing but rather an image thing

BKrev: 41f3b16dtzB3rl9XXDwlociaf-0B-Q

5 files changed, 22 insertions, 14 deletions

diff --git a/conf/distro/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index 77eed446b8..1ddd0d2a69 100644
--- a/conf/distro/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
@@ -1,7 +1,7 @@
 include conf/distro/familiar.conf
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "0.8.0-rc1"
+DISTRO_VERSION = "0.8.0"
 
 FEED_URIS += " \
         base##http:///familiar.handhelds.org/releases/v0.8/base/	\
@@ -13,7 +13,6 @@ CVSDATE_minimo = 20040828
 
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/libsdl:libsdl-x11"
 PREFERRED_PROVIDERS += "gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/grant.conf b/conf/distro/grant.conf
index e69de29bb2..0ffd6d5652 100644
--- a/conf/distro/grant.conf
+++ b/conf/distro/grant.conf
@@ -0,0 +1,19 @@
+INHERIT += " package_ipk debian"
+DISTRO = "grant-openzaurus"
+
+FEED_URIS_openzaurus = "OZ-3.5.2##http://openzaurus.org/official/unstable/3.5.2/feed/ \
+              OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/"
+
+ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "tty1"
+TARGET_FPU = "soft"
+
+
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index 48671d9114..49638d8693 100644
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -8,7 +8,6 @@ CVSDATE = 20040915
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index c67156f03f..b9c83c353d 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -11,7 +11,6 @@ CVSDATE = 20041127
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 3701704268..b168f804ae 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -11,11 +11,10 @@ FEED_URIS += " \
 	console##http://openzaurus.org/official/unstable/3.5.2/feed/console     \
 	devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
 
-CVSDATE = "20050107"
+CVSDATE = "20050122"
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
@@ -32,14 +31,7 @@ TARGET_FPU = "soft"
 # Base
 #
 
-CVSDATE_ipkg-utils-native = "20041215"
-PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
-PREFERRED_VERSION_libtool-native = "1.5.6"
-PREFERRED_VERSION_libtool-cross= "1.5.6"
-# PREFERRED_VERSION_orinoco-modules = "0.13e"
-PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
-PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
-PREFERRED_VERSION_bluez-utils-dbus = "2.11"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
 
 #
 # Opie