familiar-0.8.4.conf: this is Familiar v0.8.4.

[familiar-h63xx-build.git] / org.handhelds.familiar / conf / distro / familiar-0.8.4.conf

diff --git a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
index 8c3cf9667e0eaeecd919c65fd19afcc7afdb61d1..39375c8702afbd7eac8ff234d7f13a3506380fbe 100644 (file)
--- a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
+++ b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
@@ -1,12 +1,14 @@
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "v0.8.4-rc2"
+DISTRO_VERSION = "v0.8.4"
 
 include conf/distro/familiar.conf
 include conf/distro/familiar-feeds.inc
 
+#always try downloading from handhelds.org first
 INHERIT += "simplepremirror"
-SIMPLE_PREMIRROR = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/"
+SIMPLE_PREMIRROR ?= "http://familiar.handhelds.org/source/${DISTRO_VERSION}/sources/"
+CVS_TARBALL_STASH ?= "http://familiar.handhelds.org/source/${DISTRO_VERSION}/sources/"
 
 
 DISTRO_TYPE = "release"
@@ -14,10 +16,6 @@ DISTRO_TYPE = "release"
 
 CVSDATE = 20051212
 
-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"
-
 PREFERRED_PROVIDER_virtual/libiconv=glibc
 PREFERRED_PROVIDER_virtual/libintl=glibc
 PREFERRED_PROVIDER_x11=diet-x11
@@ -34,7 +32,7 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
 
 #prefer a newer hh.org cvs kernel
 CVSDATE_handhelds-pxa-2.6 = "20051221"
-CVSDATE_LAB-kernel = "20051221"
+CVSDATE_LAB-kernel = "20060421"
 
 CVSDATE_gomunicator = "20060518"
 
@@ -66,10 +64,9 @@ ZKERNEL_VERSION_tosa   = "2.4"
 # Opie
 #
 
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte = "2.3.10"
-
+QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.1"
+
 include conf/distro/preferred-opie-versions.inc
 
 #