[oe-commits] org.oe.dev merge of '53cc62f49c8608e5ffa07ac066958e28d5113f8e'

[mickeyl commit]

merge of '53cc62f49c8608e5ffa07ac066958e28d5113f8e'
     and '61fa8bae987fbc94312beed01805ad1e118a1638'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f
ViewMTN: http://monotone.openembedded.org/revision/info/d9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f
Files:
1
conf/bitbake.conf
packages/openmoko2/openmoko-today2_svn.bb
Diffs:

#
# mt diff -r53cc62f49c8608e5ffa07ac066958e28d5113f8e -rd9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f
#
# 
# 
# patch "conf/bitbake.conf"
#  from [f410a6b3af115612f2bd104814d1035583d3518a]
#    to [7223700020e755692ec209b6de23efdf0d5960cd]
# 
============================================================
--- conf/bitbake.conf	f410a6b3af115612f2bd104814d1035583d3518a
+++ conf/bitbake.conf	7223700020e755692ec209b6de23efdf0d5960cd
@@ -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.


#
# mt diff -r61fa8bae987fbc94312beed01805ad1e118a1638 -rd9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f
#
# 
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [55ff756ef8b39d10085d43cd190a0695963fd78a]
#    to [f2ad7fa44fe0572781fdaf052a2dcaa318940c3a]
# 
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	55ff756ef8b39d10085d43cd190a0695963fd78a
+++ packages/openmoko2/openmoko-today2_svn.bb	f2ad7fa44fe0572781fdaf052a2dcaa318940c3a
@@ -1,6 +1,6 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+DEPENDS = "openmoko-dates2 libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"