familiar.conf, familiar-0.8.4.conf: use ?= for previous set of changes

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 0c63911a2ea8d5ac07482bdd8f409d8e82c43dd1..102ab34d69bdae6fab5b336547b7938493c66904 100644 (file)
--- a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
+++ b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
@@ -7,8 +7,8 @@ include conf/distro/familiar-feeds.inc
 
 #always try downloading from handhelds.org first
 INHERIT += "simplepremirror"
-SIMPLE_PREMIRROR = "http://familiar.handhelds.org/source/${DISTRO_VERSION}/sources/"
-CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/${DISTRO_VERSION}/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 6195b756779a79e8ea8521892d52fcedaf68ef88..deb21a257c7d830b2f62363a3c9919faf914d427 100644 (file)
--- a/org.handhelds.familiar/conf/distro/familiar.conf
+++ b/org.handhelds.familiar/conf/distro/familiar.conf
@@ -21,4 +21,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 include classes/multimachine.inc
 
 # be more verbose by default
-BBINCLUDELOGS = "yes"
+BBINCLUDELOGS ?= "yes"