From: Rene Wagner <rw@handhelds.org>
Date: Tue, 27 Jun 2006 21:39:20 +0000 (+0200)
Subject: familiar.conf, familiar-0.8.4.conf, local.conf.sample: tweak defaults for CVS_TARBALL... 
X-Git-Tag: familiar-v0.8.4-rc3~50
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=56b545fc87a90b435606088f25d181e65e5f30ed;p=familiar-h63xx-build.git

familiar.conf, familiar-0.8.4.conf, local.conf.sample: tweak defaults for CVS_TARBALL_STASH, BBINCLUDELOGS

Signed-off-by: Rene Wagner <rw@handhelds.org>
---

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 8c3cf96..0c63911 100644
--- a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
+++ b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
@@ -5,8 +5,10 @@ DISTRO_VERSION = "v0.8.4-rc2"
 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"
diff --git a/org.handhelds.familiar/conf/distro/familiar.conf b/org.handhelds.familiar/conf/distro/familiar.conf
index daae63c..6195b75 100644
--- a/org.handhelds.familiar/conf/distro/familiar.conf
+++ b/org.handhelds.familiar/conf/distro/familiar.conf
@@ -19,3 +19,6 @@ UDEV_DEVFS_RULES = "1"
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
 
 include classes/multimachine.inc
+
+# be more verbose by default
+BBINCLUDELOGS = "yes"
diff --git a/org.handhelds.familiar/conf/local.conf.sample b/org.handhelds.familiar/conf/local.conf.sample
index 76bf1ed..474cc55 100644
--- a/org.handhelds.familiar/conf/local.conf.sample
+++ b/org.handhelds.familiar/conf/local.conf.sample
@@ -118,7 +118,7 @@ BBINCLUDELOGS = "yes"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/"
+#CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/"
 
 # EDIT THIS FILE and then remove the line below before using!
 REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"