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

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 8c3cf9667e0eaeecd919c65fd19afcc7afdb61d1..0c63911a2ea8d5ac07482bdd8f409d8e82c43dd1 100644 (file)
--- 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 daae63cfc9ab7d26715e3ea8b3b643cb7d3040d6..6195b756779a79e8ea8521892d52fcedaf68ef88 100644 (file)
--- 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 76bf1eda9b8c87574b9282f7b48c3375dd02484e..474cc5548d8229af7fbab62587ee6e23b921cf33 100644 (file)
--- 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')}"