From 03096e2c88ca11481e12531cffcd03d5ec5360b3 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 Oct 2007 08:54:22 +0000
Subject: moko-autorev.inc: add entries for openmoko-browser2 and
 openmoko-mediaplayer2

---
 conf/distro/include/moko-autorev.inc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'conf')

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 6695dd0d97..ace08bc07c 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -9,7 +9,9 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 
 SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
+SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common ?= "${AUTOREV}"
-- 
cgit v1.2.3


From f2166278762bb9696ce24d659c81ffc2c77153f2 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 Oct 2007 09:24:20 +0000
Subject: moko-autorev.inc: add neod

---
 conf/distro/include/moko-autorev.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index ace08bc07c..d557c77e9a 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -7,6 +7,7 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
+SRCREV_pn-neod ?= "${AUTOREV}"
 
 SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
-- 
cgit v1.2.3


From 85ca40bd98d458989c41c3bd6d4b2b13981a5fd0 Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Tue, 23 Oct 2007 09:39:30 +0000
Subject: conf/distro/angstrom-2007.1.conf : Set atk version to 1.20.0

---
 conf/distro/angstrom-2007.1.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 00fa645c5e..1f2961f3a1 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -71,7 +71,7 @@ PREFERRED_VERSION_freetype-native  = "2.2.1"
 PREFERRED_VERSION_cairo            = "1.4.10"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
-PREFERRED_VERSION_atk              = "1.10.3"
+PREFERRED_VERSION_atk              = "1.20.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
 
 # newer poppler cvs breaks some apps, fix until popper 6 and apps
-- 
cgit v1.2.3


From 027e69437efaa0d4740136e5f3b1be554e5998a8 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 23 Oct 2007 10:47:02 +0000
Subject: bitbake.conf: Add -pn bit to alternative OVERRIDES definition and
 update descriptions.

---
 conf/bitbake.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 046b107936..43e45bd87d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -460,9 +460,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
 #
 # This works for  functions as well, they are really just environment variables.
-#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
-# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
 OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+# Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains.
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}"
 
 ##################################################################
 # Include the rest of the config files.
-- 
cgit v1.2.3